diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
index aadb445c..db0752e4
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,5 @@
-.DS_Store
-*.devhelper
-xenforo/library/bdApi/DevHelper/Generated/*
-xenforo/library/bdApi/DevHelper/XFCP/*
-xenforo_consumer/library/bdApiConsumer/DevHelper/Generated/*
-
-xenforo/library/bdApi/FileSums.php
-xenforo_consumer/library/bdApiConsumer/FileSums.php
-xenforo/js/bdApi/*.min.js
-google-services.json
-xenforo_consumer/library/bdApiConsumer/DevHelper/XFCP
-xenforo_consumer/js/bdApiConsumer/*.js
+/DevHelper/autogen.json
+/_build/
+/_data/
+/_releases/
+/vendor/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..8a9d79f3
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,40 @@
+variables:
+  ADDONS_PATH: /var/www/html/src/addons
+  MYSQL_DATABASE: xenforo2
+  MYSQL_ROOT_PASSWORD: root
+
+build:
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - _releases
+  image: registry.gitlab.com/xfrocks/xenforo2/master-devhelper
+  script:
+    - mysqlrestore.sh
+    - composer install --no-dev
+    - mkdir $ADDONS_PATH/Xfrocks
+    - cp -R . $ADDONS_PATH/Xfrocks/Api
+    - cd /var/www/html
+    - php cmd.php xf-addon:install Xfrocks/Api
+    - php cmd.php devhelper:autogen Xfrocks/Api
+    - php cmd.php xf-addon:build-release Xfrocks/Api
+    - cp -R $ADDONS_PATH/Xfrocks/Api/_releases $CI_PROJECT_DIR/_releases
+  services:
+    - mysql:5.7.23
+  stage: build
+
+test:
+  image: registry.gitlab.com/xfrocks/xenforo2/master
+  script:
+    - mysqlrestore.sh
+    - unzip -qq _releases/*.zip 2>/dev/null || true
+    - cp -R upload/* /var/www/html
+    - cd /var/www/html
+    - php cmd.php xf-addon:install Xfrocks/Api
+    - php cmd.php xfrocks-api:pre-test
+    - apache2ctl start
+    - cd $CI_PROJECT_DIR/_files/tests
+    - composer install
+    - composer test
+  services:
+    - mysql:5.7.23
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 36970ef3..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "xenforo/library/bdApi/Lib/oauth2-server-php"]
-	path = xenforo/library/bdApi/Lib/oauth2-server-php
-	url = https://github.com/bshaffer/oauth2-server-php.git
-
diff --git a/Admin/Controller/AuthCode.php b/Admin/Controller/AuthCode.php
new file mode 100644
index 00000000..8c54b41e
--- /dev/null
+++ b/Admin/Controller/AuthCode.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use Xfrocks\Api\Entity\AuthCode as EntityAuthCode;
+
+class AuthCode extends Entity
+{
+    public function getEntityExplain($entity)
+    {
+        return $this->getEntityClientAndUser($entity);
+    }
+
+    public function getEntityHint($entity)
+    {
+        /** @var EntityAuthCode $authCode */
+        $authCode = $entity;
+        return $authCode->scope;
+    }
+
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:AuthCode';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_auth_code';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-auth-codes';
+    }
+}
diff --git a/Admin/Controller/Client.php b/Admin/Controller/Client.php
new file mode 100644
index 00000000..7d6e7d41
--- /dev/null
+++ b/Admin/Controller/Client.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use Xfrocks\Api\Entity\Client as EntityClient;
+
+class Client extends Entity
+{
+    public function getEntityExplain($entity)
+    {
+        /** @var EntityClient $client */
+        $client = $entity;
+        $user = $client->User;
+        return $user !== null ? $user->username : '';
+    }
+
+    public function getEntityHint($entity)
+    {
+        /** @var EntityClient $client */
+        $client = $entity;
+        return $client->redirect_uri;
+    }
+
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:Client';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_client';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-clients';
+    }
+
+    protected function supportsAdding()
+    {
+        return false;
+    }
+}
diff --git a/Admin/Controller/Entity.php b/Admin/Controller/Entity.php
new file mode 100644
index 00000000..d0677be3
--- /dev/null
+++ b/Admin/Controller/Entity.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use XF\Mvc\ParameterBag;
+
+abstract class Entity extends \Xfrocks\Api\DevHelper\Admin\Controller\Entity
+{
+    /**
+     * @param \XF\Mvc\Entity\Entity $entity
+     * @return string
+     */
+    protected function getEntityClientAndUser($entity)
+    {
+        /** @var \Xfrocks\Api\Entity\Client|null $client */
+        $client = $entity->getRelation('Client');
+        if ($client === null) {
+            return '';
+        }
+
+        /** @var \XF\Entity\User|null $user */
+        $user = $entity->getRelation('User');
+        return $user !== null ? sprintf('%s / %s', $client->name, $user->username) : $client->name;
+    }
+
+    protected function getPrefixForClasses()
+    {
+        return 'Xfrocks\Api';
+    }
+
+    protected function getPrefixForTemplates()
+    {
+        return 'bdapi';
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @return void
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function preDispatchType($action, ParameterBag $params)
+    {
+        parent::preDispatchType($action, $params);
+
+        $this->assertAdminPermission('bdApi');
+    }
+}
diff --git a/Admin/Controller/Log.php b/Admin/Controller/Log.php
new file mode 100644
index 00000000..34268858
--- /dev/null
+++ b/Admin/Controller/Log.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use XF\Mvc\ParameterBag;
+
+class Log extends Entity
+{
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:Log';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_log';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-logs';
+    }
+
+    protected function supportsAdding()
+    {
+        return false;
+    }
+
+    protected function supportsEditing()
+    {
+        return false;
+    }
+
+    protected function supportsViewing()
+    {
+        return true;
+    }
+
+    public function getEntityExplain($entity)
+    {
+        if (!$entity instanceof \Xfrocks\Api\Entity\Log) {
+            return parent::getEntityExplain($entity);
+        }
+
+        return sprintf('%s - %s', $entity->client_id, $entity->ip_address);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionView(ParameterBag $paramBag)
+    {
+        $log = $this->assertRecordExists('Xfrocks\Api:Log', $paramBag->log_id);
+
+        return $this->view('Xfrocks\Api:Logs\View', 'bdapi_log_view', [
+            'log' => $log
+        ]);
+    }
+}
diff --git a/Admin/Controller/RefreshToken.php b/Admin/Controller/RefreshToken.php
new file mode 100644
index 00000000..973a96ee
--- /dev/null
+++ b/Admin/Controller/RefreshToken.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use Xfrocks\Api\Entity\RefreshToken as EntityRefreshToken;
+
+class RefreshToken extends Entity
+{
+    public function getEntityExplain($entity)
+    {
+        return $this->getEntityClientAndUser($entity);
+    }
+
+    public function getEntityHint($entity)
+    {
+        /** @var EntityRefreshToken $refreshToken */
+        $refreshToken = $entity;
+        return $refreshToken->scope;
+    }
+
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:RefreshToken';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_refresh_token';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-refresh-tokens';
+    }
+}
diff --git a/Admin/Controller/Subscription.php b/Admin/Controller/Subscription.php
new file mode 100644
index 00000000..401690a5
--- /dev/null
+++ b/Admin/Controller/Subscription.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use Xfrocks\Api\Entity\Subscription as EntitySubscription;
+
+class Subscription extends Entity
+{
+    public function getEntityExplain($entity)
+    {
+        /** @var \Xfrocks\Api\Entity\Client|null $client */
+        $client = $entity->getRelation('Client');
+        return $client !== null ? $client->name : '';
+    }
+
+    public function getEntityHint($entity)
+    {
+        /** @var EntitySubscription $subscription */
+        $subscription = $entity;
+        return $subscription->callback;
+    }
+
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:Subscription';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_subscription';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-subscriptions';
+    }
+}
diff --git a/Admin/Controller/Token.php b/Admin/Controller/Token.php
new file mode 100644
index 00000000..54cb59d8
--- /dev/null
+++ b/Admin/Controller/Token.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Xfrocks\Api\Admin\Controller;
+
+use Xfrocks\Api\Entity\Token as EntityToken;
+
+class Token extends Entity
+{
+    public function getEntityExplain($entity)
+    {
+        return $this->getEntityClientAndUser($entity);
+    }
+
+    public function getEntityHint($entity)
+    {
+        /** @var EntityToken $token */
+        $token = $entity;
+        return $token->scope;
+    }
+
+    protected function getShortName()
+    {
+        return 'Xfrocks\Api:Token';
+    }
+
+    protected function getPrefixForPhrases()
+    {
+        return 'bdapi_token';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'api-tokens';
+    }
+}
diff --git a/App.php b/App.php
new file mode 100644
index 00000000..bd5700fa
--- /dev/null
+++ b/App.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Xfrocks\Api;
+
+use Xfrocks\Api\OAuth2\Server;
+
+class App extends \XF\Pub\App
+{
+    /**
+     * @param mixed $action
+     * @param array $params
+     * @param mixed $responseType
+     * @return \XF\Mvc\RouteMatch
+     */
+    public function getErrorRoute($action, array $params = [], $responseType = 'html')
+    {
+        return new \XF\Mvc\RouteMatch('Xfrocks:Error', $action, $params, $responseType);
+    }
+
+    /**
+     * @param \XF\Mvc\Reply\AbstractReply|null $reply
+     * @return array
+     */
+    public function getGlobalTemplateData(\XF\Mvc\Reply\AbstractReply $reply = null)
+    {
+        $data = parent::getGlobalTemplateData($reply);
+
+        $data['isApi'] = true;
+        $data['apiRouterType'] = Listener::$routerType;
+
+        return $data;
+    }
+
+    /**
+     * @return void
+     */
+    public function initializeExtra()
+    {
+        parent::initializeExtra();
+
+        $container = $this->container;
+
+        // initialize this early for high availability
+        $container['api.server'] = Listener::apiServer($this);
+
+        $container['app.classType'] = 'Api';
+
+        $container->extend('extension', function (\XF\Extension $extension) {
+            $extension->addListener('dispatcher_match', ['Xfrocks\Api\Listener', 'apiOnlyDispatcherMatch']);
+
+            return $extension;
+        });
+
+        $container->extend('extension.classExtensions', function (array $classExtensions) {
+            $xfClasses = [
+                'BbCode\Renderer\Html',
+                'ControllerPlugin\Error',
+                'Entity\User',
+                'Image\Gd',
+                'Image\Imagick',
+                'Mvc\Dispatcher',
+                'Mvc\Renderer\Json',
+                'Session\Session',
+                'Template\Templater',
+            ];
+
+            foreach ($xfClasses as $xfClass) {
+                $extendBase = 'XF\\' . $xfClass;
+                if (!isset($classExtensions[$extendBase])) {
+                    $classExtensions[$extendBase] = [];
+                }
+
+                $extendClass = 'Xfrocks\Api\\' . 'XF\\ApiOnly\\' . $xfClass;
+                $classExtensions[$extendBase][] = $extendClass;
+            }
+
+            return $classExtensions;
+        });
+
+        $container['request'] = function (\XF\Container $c) {
+            /** @var Server $apiServer */
+            $apiServer = $this->container('api.server');
+            /** @var \Symfony\Component\HttpFoundation\Request $apiRequest */
+            $apiRequest = $apiServer->container('request');
+
+            $request = new \XF\Http\Request(
+                $c['inputFilterer'],
+                $apiRequest->request->all() + $apiRequest->query->all(),
+                $_FILES,
+                []
+            );
+
+            return $request;
+        };
+
+        $container->extend('request.paths', function (array $paths) {
+            // move base directory up one level for URL building
+            // TODO: make the change directly at XF\Http\Request::getBaseUrl
+            $apiDirNameRegEx = '#' . preg_quote(Listener::$apiDirName, '#') . '/$#';
+            $paths['full'] = preg_replace($apiDirNameRegEx, '', $paths['full']);
+            $paths['base'] = preg_replace($apiDirNameRegEx, '', $paths['base']);
+
+            return $paths;
+        });
+
+        $container->extend('request.pather', function ($pather) {
+            return function ($url, $modifier = 'full') use ($pather) {
+                // always use canonical/full URL in api context
+                if ($modifier !== 'canonical') {
+                    $modifier = 'full';
+                }
+
+                return $pather($url, $modifier);
+            };
+        });
+    }
+
+    /**
+     * @param \XF\Session\Session $session
+     * @return void
+     */
+    protected function onSessionCreation(\XF\Session\Session $session)
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->container('api.server');
+        $accessToken = $apiServer->parseRequest();
+
+        /** @var \Xfrocks\Api\XF\ApiOnly\Session\Session $apiSession */
+        $apiSession = $session;
+        $apiSession->setToken($accessToken !== null ? $accessToken->getXfToken() : null);
+    }
+
+    /**
+     * @return void
+     */
+    protected function updateModeratorCaches()
+    {
+        // no op
+    }
+
+    /**
+     * @return void
+     */
+    protected function updateUserCaches()
+    {
+        // no op
+    }
+}
diff --git a/Cli/Command/PreTest.php b/Cli/Command/PreTest.php
new file mode 100644
index 00000000..68886431
--- /dev/null
+++ b/Cli/Command/PreTest.php
@@ -0,0 +1,349 @@
+<?php
+
+namespace Xfrocks\Api\Cli\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use XF\Entity\Forum;
+use XF\Entity\TfaProvider;
+use XF\Entity\Thread;
+use XF\Entity\User;
+use XF\PrintableException;
+use XF\Service\Thread\Replier;
+use XF\Util\Random;
+use Xfrocks\Api\Entity\Client;
+
+class PreTest extends Command
+{
+    const VERSION_ID = 2018082101;
+
+    /**
+     * @var string
+     */
+    public $prefix = 'api_test';
+
+    /**
+     * @var int
+     */
+    public $users = 5;
+
+    /**
+     * @var int
+     */
+    public $threads = 3;
+
+    /**
+     * @var int
+     */
+    public $posts = 3;
+
+    /**
+     * @param array $data
+     * @return mixed
+     * @throws PrintableException
+     */
+    public function createForum(array &$data)
+    {
+        if (!isset($data['forum'])) {
+            $app = \XF::app();
+            /** @var \XF\Entity\Node $node */
+            $node = $app->em()->create('XF:Node');
+            $node->display_in_list = false;
+            $node->node_type_id = 'Forum';
+            $node->title = sprintf('%s-%d', $this->prefix, \XF::$time);
+
+            /** @var Forum $forum */
+            $forum = $node->getDataRelationOrDefault();
+            $node->addCascadedSave($forum);
+
+            $node->save();
+
+            $data['forum'] = [
+                'node_id' => $node->node_id,
+                'version_id' => self::VERSION_ID
+            ];
+        }
+
+        return $data['forum'];
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function createUsers(array &$data)
+    {
+        $app = \XF::app();
+        if (!isset($data['users'])) {
+            $data['users'] = [];
+        }
+
+        for ($i = 0; $i < $this->users; $i++) {
+            if (isset($data['users'][$i])) {
+                continue;
+            }
+
+            $username = sprintf('%s-%d-%d', $this->prefix, \XF::$time, $i + 1);
+            $password = Random::getRandomString(32);
+
+            /** @var \XF\Service\User\Registration $registration */
+            $registration = $app->service('XF:User\Registration');
+            $user = $registration->getUser();
+            $user->setOption('admin_edit', true);
+            $registration->setFromInput(['username' => $username]);
+            $registration->setPassword($password, '', false);
+            $registration->skipEmailConfirmation();
+            $registration->save();
+
+            $data['users'][$i] = [
+                'user_id' => $user->user_id,
+                'username' => $username,
+                'password' => $password,
+                'version_id' => self::VERSION_ID
+            ];
+
+            if ($i === 3) {
+                /** @var \XF\Service\UpdatePermissions $permissionUpdater */
+                $permissionUpdater = $app->service('XF:UpdatePermissions');
+                $permissionUpdater->setUser($user)->setGlobal();
+                $permissionUpdater->updatePermissions([
+                    'general' => [
+                        'bypassFloodCheck' => 'allow'
+                    ]
+                ]);
+            } elseif ($i === 4) {
+                /** @var TfaProvider $tfaProvider */
+                $tfaProvider = $app->em()->find('XF:TfaProvider', 'totp');
+                $handler = $tfaProvider->getHandler();
+                if ($handler !== null) {
+                    $initialData = $handler->generateInitialData($user);
+                    $data['users'][$i]['tfa_secret'] = $initialData['secret'];
+
+                    /** @var \XF\Repository\Tfa $tfaRepo */
+                    $tfaRepo = $app->repository('XF:Tfa');
+                    $tfaRepo->enableUserTfaProvider($user, $tfaProvider, $initialData);
+                }
+            }
+        }
+
+        return $data['users'];
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     * @throws \Exception
+     * @throws PrintableException
+     */
+    public function createThreads(array &$data)
+    {
+        if (!isset($data['threads'])) {
+            $data['threads'] = [];
+        }
+
+        $app = \XF::app();
+        /** @var Forum $forum */
+        $forum = $app->em()->find('XF:Forum', $data['forum']['node_id']);
+        /** @var User $user */
+        $user = $app->em()->find('XF:User', $data['users'][0]['user_id']);
+
+        for ($i = 0; $i < $this->threads; $i++) {
+            if (isset($data['threads'][$i])) {
+                continue;
+            }
+
+            /** @var \XF\Service\Thread\Creator $creator */
+            $creator = \XF::asVisitor($user, function () use ($forum, $app) {
+                return $app->service('XF:Thread\Creator', $forum);
+            });
+
+            $creator->setContent(
+                sprintf('%s-%d-%d', $this->prefix, \XF::$time, $i + 1),
+                str_repeat(__METHOD__ . ' ', 10)
+            );
+
+            if (!$creator->validate($errors)) {
+                throw new PrintableException($errors);
+            }
+
+            $thread = $creator->save();
+            $data['threads'][$i] = [
+                'thread_id' => $thread->thread_id,
+                'title' => $thread->title,
+                'node_id' => $thread->node_id,
+                'version_id' => self::VERSION_ID
+            ];
+        }
+
+        return $data['threads'];
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     * @throws \Exception
+     * @throws PrintableException
+     */
+    public function createPosts(array &$data)
+    {
+        if (!isset($data['posts'])) {
+            $data['posts'] = [];
+        }
+
+        $app = \XF::app();
+        /** @var Thread $thread */
+        $thread = $app->em()->find('XF:Thread', $data['threads'][0]['thread_id']);
+        /** @var User $user */
+        $user = $app->em()->find('XF:User', $data['users'][0]['user_id']);
+
+        for ($i = 0; $i < $this->posts; $i++) {
+            if (isset($data['posts'][$i])) {
+                continue;
+            }
+
+            /** @var Replier $replier */
+            $replier = \XF::asVisitor($user, function () use ($app, $thread) {
+                return $app->service('XF:Thread\Replier', $thread);
+            });
+
+            $replier->setMessage(str_repeat(__METHOD__ . ' ', 10));
+            if (!$replier->validate($errors)) {
+                throw new PrintableException($errors);
+            }
+
+            $post = $replier->save();
+            $data['posts'][$i] = [
+                'post_id' => $post->post_id,
+                'thread_id' => $thread->thread_id,
+                'version_id' => self::VERSION_ID
+            ];
+        }
+
+        return $data['posts'];
+    }
+
+    /**
+     * @param array $userData
+     * @param array $data
+     * @return mixed
+     * @throws PrintableException
+     */
+    public function createApiClient(array $userData, array &$data)
+    {
+        if (!isset($data['apiClient'])) {
+            $app = \XF::app();
+
+            /** @var Client $client */
+            $client = $app->em()->create('Xfrocks\Api:Client');
+            $client->name = $this->prefix;
+            $client->description = __METHOD__;
+            $client->redirect_uri = $app->options()->boardUrl;
+            $client->user_id = $userData['user_id'];
+            $client->save();
+
+            $data['apiClient'] = [
+                'client_id' => $client->client_id,
+                'client_secret' => $client->client_secret,
+                'version_id' => self::VERSION_ID
+            ];
+        }
+
+        return $data['apiClient'];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function enableSubscriptions(array &$data)
+    {
+        $app = \XF::app();
+        $options = $app->options();
+        /** @var \XF\Repository\Option $optionRepo */
+        $optionRepo = $app->repository('XF:Option');
+        $data['subscriptions'] = ['options' => []];
+
+        foreach ([
+                     'bdApi_subscriptionColumnThreadPost' => 'xf_thread',
+                     'bdApi_subscriptionColumnUser' => 'xf_user_option',
+                     'bdApi_subscriptionColumnUserNotification' => 'xf_user_option',
+                 ] as $optionName => $tableName) {
+            $columnName = strval($options->offsetGet($optionName));
+            if (strpos($columnName, $optionName) !== 0) {
+                $sm = \XF::db()->getSchemaManager();
+
+                $columnName = sprintf('%s_%d', $optionName, \XF::$time);
+                $sm->alterTable($tableName, function (\XF\Db\Schema\Alter $table) use ($columnName) {
+                    $table->addColumn($columnName, 'MEDIUMBLOB')->nullable(true);
+                });
+
+                $optionRepo->updateOption($optionName, $columnName);
+                $options[$optionName] = $columnName;
+            }
+
+            $data['subscriptions']['options'][$optionName] = $columnName;
+        }
+
+        foreach ([
+                     'bdApi_subscriptionThreadPost',
+                     'bdApi_subscriptionUser',
+                     'bdApi_subscriptionUserNotification',
+
+                     // for testing api tags
+                     'enableTagging'
+                 ] as $optionName) {
+            $optionRepo->updateOption($optionName, true);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    protected function configure()
+    {
+        $this
+            ->setName('xfrocks-api:pre-test')
+            ->setDescription('Prepare environment for API testings');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null
+     * @throws PrintableException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        if (!\XF::$debugMode) {
+            throw new \LogicException('XenForo must be in debug mode for testing');
+        }
+
+        $jsonPath = "/tmp/{$this->prefix}.json";
+
+        $data = [];
+        if (file_exists($jsonPath)) {
+            $json = file_get_contents($jsonPath);
+            if (is_string($json)) {
+                $data = @json_decode($json, true);
+                if (!is_array($data)) {
+                    $data = [];
+                }
+            }
+        }
+
+        $this->enableSubscriptions($data);
+
+        $this->createForum($data);
+        $this->createUsers($data);
+        $this->createThreads($data);
+        $this->createPosts($data);
+
+        $this->createApiClient($data['users'][0], $data);
+
+        file_put_contents($jsonPath, json_encode($data, JSON_PRETTY_PRINT));
+        $output->writeln("Written test data to {$jsonPath}");
+
+        return 0;
+    }
+}
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
new file mode 100644
index 00000000..7e7602a6
--- /dev/null
+++ b/Controller/AbstractController.php
@@ -0,0 +1,415 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Finder;
+use XF\Mvc\ParameterBag;
+use XF\Mvc\Reply;
+use XF\Mvc\Reply\AbstractReply;
+use XF\Mvc\Reply\Redirect;
+use Xfrocks\Api\Data\Params;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Repository\Log;
+use Xfrocks\Api\Transform\LazyTransformer;
+use Xfrocks\Api\Transform\TransformContext;
+
+class AbstractController extends \XF\Pub\Controller\AbstractController
+{
+    /**
+     * @var Params|null
+     */
+    protected $apiParams = null;
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionOptionsGeneric(ParameterBag $params)
+    {
+        $data = [
+            'action' => $params->get('action'),
+            'class' => get_class($this),
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param array $data
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function api(array $data)
+    {
+        return new \Xfrocks\Api\Mvc\Reply\Api($data);
+    }
+
+    /**
+     * @param string|null $scope
+     * @return void
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function assertApiScope($scope)
+    {
+        if ($scope === null || strlen($scope) === 0) {
+            return;
+        }
+
+        $session = $this->session();
+        if (!$session->hasScope($scope)) {
+            throw $this->errorException(\XF::phrase('do_not_have_permission'), 403);
+        }
+    }
+
+    /**
+     * @param string $linkUrl
+     * @return void
+     * @throws Reply\Exception
+     */
+    public function assertCanonicalUrl($linkUrl)
+    {
+        $responseType = $this->responseType;
+        $this->responseType = 'html';
+        $exception = null;
+
+        try {
+            parent::assertCanonicalUrl($linkUrl);
+        } catch (Reply\Exception $exceptionReply) {
+            $reply = $exceptionReply->getReply();
+            if ($reply instanceof Redirect) {
+                /** @var Redirect $redirect */
+                $redirect = $reply;
+                $url = $redirect->getUrl();
+                if (preg_match('#^https?://.+(https?://.+)$#', $url, $matches) === 1) {
+                    // because we are unable to modify XF\Http\Request::getBaseUrl,
+                    // parent::assertCanonicalUrl will prepend the full base path incorrectly.
+                    // And because we don't want to parse the request params ourselves
+                    // we will take care of the extraneous prefix here
+                    $alteredUrl = $matches[1];
+
+                    if ($alteredUrl === $this->request->getRequestUri()) {
+                        // skip redirecting, if it happens to be the current request URI
+                        $exceptionReply = null;
+                    } else {
+                        $redirect->setUrl($alteredUrl);
+                    }
+                }
+            }
+
+            $exception = $exceptionReply;
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->responseType = $responseType;
+        if ($exception !== null) {
+            throw $exception;
+        }
+    }
+
+    /**
+     * @return void
+     * @throws Reply\Exception
+     */
+    protected function assertValidToken()
+    {
+        if ($this->session()->getToken() === null) {
+            throw $this->exception($this->noPermission());
+        }
+    }
+
+    /**
+     * @param string $link
+     * @param mixed $data
+     * @param array $parameters
+     * @return string
+     */
+    public function buildApiLink($link, $data = null, array $parameters = [])
+    {
+        return $this->app->router(Listener::$routerType)->buildLink($link, $data, $parameters);
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @return void
+     */
+    public function checkCsrfIfNeeded($action, ParameterBag $params)
+    {
+        // no op
+    }
+
+    public function filter($key, $type = null, $default = null)
+    {
+        throw new \InvalidArgumentException('AbstractController::params() must be used to parse params.');
+    }
+
+    /**
+     * @param string $type
+     * @param array|int $whereId
+     * @param string|null $phraseKey
+     * @return LazyTransformer
+     */
+    public function findAndTransformLazily($type, $whereId, $phraseKey = null)
+    {
+        $finder = $this->finder($type);
+        $finder->whereId($whereId);
+
+        $sortByList = null;
+        $isSingle = true;
+        if (is_array($whereId)) {
+            $primaryKey = $finder->getStructure()->primaryKey;
+            if (is_array($primaryKey) && count($primaryKey) === 1) {
+                $primaryKey = reset($primaryKey);
+            }
+            if (!is_array($primaryKey)) {
+                $isSingle = false;
+                $sortByList = $whereId;
+            } else {
+                // TODO: implement this
+                throw new \RuntimeException('Compound primary key is not supported');
+            }
+        }
+
+        $lazyTransformer = new LazyTransformer($this);
+        $lazyTransformer->setFinder($finder);
+
+        if ($sortByList !== null) {
+            $lazyTransformer->addCallbackFinderPostFetch(function ($entities) use ($sortByList) {
+                /** @var \XF\Mvc\Entity\ArrayCollection $arrayCollection */
+                $arrayCollection = $entities;
+                $entities = $arrayCollection->sortByList($sortByList);
+
+                return $entities;
+            });
+        }
+
+        $lazyTransformer->addCallbackPostTransform(function ($data) use ($isSingle, $phraseKey) {
+            if (!$isSingle) {
+                return $data;
+            }
+
+            if (count($data) === 1) {
+                return $data[0];
+            }
+
+            if ($phraseKey === null) {
+                $phraseKey = 'requested_page_not_found';
+            }
+
+            throw $this->exception($this->notFound(\XF::phrase($phraseKey)));
+        });
+
+        return $lazyTransformer;
+    }
+
+    /**
+     * @return Params
+     */
+    public function params()
+    {
+        if ($this->apiParams === null) {
+            $this->apiParams = new Params($this);
+        }
+
+        return $this->apiParams;
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @return void
+     * @throws Reply\Exception
+     */
+    public function preDispatch($action, ParameterBag $params)
+    {
+        parent::preDispatch($action, $params);
+
+        $this->apiParams = null;
+
+        $addOnId = 'Xfrocks/Api';
+        $addOnCache = $this->app->container('addon.cache');
+        if (!isset($addOnCache[$addOnId])) {
+            throw $this->errorException('The API is currently disabled.', 500);
+        }
+        if (\XF::$debugMode) {
+            $addOn = $this->app->addOnManager()->getById($addOnId);
+            if ($addOn->isJsonVersionNewer()) {
+                throw $this->errorException('Please update the API add-on.', 500);
+            }
+        }
+
+        $scope = $this->getDefaultApiScopeForAction($action);
+        $this->assertApiScope($scope);
+    }
+
+    /**
+     * @return \Xfrocks\Api\XF\ApiOnly\Session\Session
+     */
+    public function session()
+    {
+        /** @var \Xfrocks\Api\XF\ApiOnly\Session\Session $session */
+        $session = parent::session();
+        return $session;
+    }
+
+    /**
+     * @param array $data
+     * @param string $key
+     * @param Entity $entity
+     * @return LazyTransformer
+     */
+    public function transformEntityIfNeeded(array &$data, $key, $entity)
+    {
+        $lazyTransformer = $this->transformEntityLazily($entity);
+        $lazyTransformer->addCallbackPreTransform(function ($context) use ($key) {
+            /** @var TransformContext $context */
+            if ($context->selectorShouldExcludeField($key)) {
+                return null;
+            }
+
+            return $context->getSubContext($key, null, null);
+        });
+        $data[$key] = $lazyTransformer;
+
+        return $lazyTransformer;
+    }
+
+    /**
+     * @param Entity $entity
+     * @return LazyTransformer
+     */
+    public function transformEntityLazily($entity)
+    {
+        $lazyTransformer = new LazyTransformer($this);
+        $lazyTransformer->setEntity($entity);
+        return $lazyTransformer;
+    }
+
+    /**
+     * @param Finder $finder
+     * @return LazyTransformer
+     */
+    public function transformFinderLazily($finder)
+    {
+        $lazyTransformer = new LazyTransformer($this);
+        $lazyTransformer->setFinder($finder);
+        return $lazyTransformer;
+    }
+
+    /**
+     * @param mixed $viewClass
+     * @param mixed $templateName
+     * @param array $params
+     * @return Reply\View
+     */
+    public function view($viewClass = '', $templateName = '', array $params = [])
+    {
+        if ($viewClass !== '') {
+            $viewClass = \XF::stringToClass($viewClass, '%s\%s\View\%s', 'Pub');
+        }
+
+        return parent::view($viewClass, $templateName, $params);
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @param AbstractReply $reply
+     * @param mixed $viewState
+     * @return false
+     */
+    protected function canUpdateSessionActivity($action, ParameterBag $params, AbstractReply &$reply, &$viewState)
+    {
+        return false;
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @param AbstractReply $reply
+     * @return void
+     */
+    public function postDispatch($action, ParameterBag $params, Reply\AbstractReply &$reply)
+    {
+        $this->logRequest($reply);
+
+        parent::postDispatch($action, $params, $reply);
+    }
+
+    /**
+     * @param AbstractReply $reply
+     * @return void
+     */
+    protected function logRequest(AbstractReply $reply)
+    {
+        $requestMethod = $this->request()->getServer('REQUEST_METHOD');
+        $requestUri = $this->request()->getRequestUri();
+
+        $responseOutput = $this->getControllerResponseOutput($reply, $responseCode);
+        if ($responseOutput === false) {
+            return;
+        }
+
+        $requestData = $this->request()->getInputForLogs();
+
+        /** @var Log $logRepo */
+        $logRepo = $this->repository('Xfrocks\Api:Log');
+        $logRepo->logRequest($requestMethod, $requestUri, $requestData, $responseCode, $responseOutput);
+    }
+
+    /**
+     * @param AbstractReply|Reply\Exception $reply
+     * @param int $responseCode
+     * @return array|false
+     */
+    protected function getControllerResponseOutput($reply, &$responseCode)
+    {
+        if ($reply instanceof AbstractReply) {
+            $responseCode = $reply->getResponseCode();
+        }
+
+        if ($reply instanceof Redirect) {
+            $responseCode = 301;
+            $responseOutput = [
+                'redirectType' => $reply->getType(),
+                'redirectMessage' => $reply->getMessage(),
+                'redirectUri' => $reply->getUrl()
+            ];
+        } elseif ($reply instanceof Reply\View) {
+            $responseOutput = $reply->getParams();
+        } elseif ($reply instanceof Reply\Error) {
+            $responseOutput = ['errors' => $reply->getErrors()];
+        } elseif ($reply instanceof Reply\Exception) {
+            $responseOutput = $this->getControllerResponseOutput($reply->getReply(), $responseCode);
+        } elseif ($reply instanceof Reply\Message) {
+            $responseOutput = ['message' => $reply->getMessage()];
+        } else {
+            return false;
+        }
+
+        return $responseOutput;
+    }
+
+    /**
+     * @param string $action
+     * @return string|null
+     */
+    protected function getDefaultApiScopeForAction($action)
+    {
+        if (strpos($action, 'Post') === 0) {
+            return Server::SCOPE_POST;
+        } elseif (strpos($action, 'Put') === 0) {
+            // TODO: separate scope?
+            return Server::SCOPE_POST;
+        } elseif (strpos($action, 'Delete') === 0) {
+            // TODO: separate scope?
+            return Server::SCOPE_POST;
+        } elseif ($this->options()->bdApi_restrictAccess) {
+            return Server::SCOPE_READ;
+        }
+
+        return null;
+    }
+}
diff --git a/Controller/AbstractNode.php b/Controller/AbstractNode.php
new file mode 100644
index 00000000..77fe39be
--- /dev/null
+++ b/Controller/AbstractNode.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+use XF\Repository\Node;
+
+abstract class AbstractNode extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->node_id) {
+            return $this->actionSingle($params->node_id);
+        }
+
+        $params = $this
+            ->params()
+            ->define('parent_category_id', 'str', 'id of parent category')
+            ->define('parent_forum_id', 'str', 'id of parent forum')
+            ->define('parent_node_id', 'str', 'id of parent node')
+            ->defineOrder([
+                'list' => ['lft', 'asc']
+            ]);
+
+        $parentId = $params['parent_category_id'];
+        if ($parentId === '') {
+            $parentId = $params['parent_forum_id'];
+        }
+        if ($parentId === '') {
+            $parentId = $params['parent_node_id'];
+        }
+        if ($parentId === '') {
+            $parentId = false;
+        } else {
+            $parentId = intval($parentId);
+        }
+
+        /** @var Node $nodeRepo */
+        $nodeRepo = $this->repository('XF:Node');
+        $nodeList = $nodeRepo->getNodeList();
+
+        $nodeIds = [];
+        /** @var \XF\Entity\Node $nodeItem */
+        foreach ($nodeList as $nodeItem) {
+            if ($parentId !== false && $nodeItem->parent_node_id !== $parentId) {
+                continue;
+            }
+
+            if ($nodeItem->node_type_id === $this->getNodeTypeId()) {
+                $nodeIds[] = $nodeItem->node_id;
+            }
+        }
+
+        $nodeTypes = $this->app()->container('nodeTypes');
+        $keyNodes = $this->getNamePlural();
+        $keyTotal = $this->getNamePlural() . '_total';
+        $data = [$keyNodes => [], $keyTotal => 0];
+
+        if (count($nodeIds) > 0 && isset($nodeTypes[$this->getNodeTypeId()])) {
+            $entityIdentifier = $nodeTypes[$this->getNodeTypeId()]['entity_identifier'];
+
+            $finder = $this->finder($entityIdentifier)
+                ->where('node_id', $nodeIds);
+
+            $params->sortFinder($finder);
+
+            $data[$keyTotal] = $finder->total();
+            $data[$keyNodes] = $this->transformFinderLazily($finder);
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $nodeId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionSingle($nodeId)
+    {
+        $nodeTypes = $this->app()->container('nodeTypes');
+        $nodeTypeId = $this->getNodeTypeId();
+
+        if (!isset($nodeTypes[$nodeTypeId])) {
+            return $this->noPermission();
+        }
+
+        $with = 'Node.Permissions|' . \XF::visitor()->permission_combination_id;
+        $node = $this->assertRecordExists($nodeTypes[$nodeTypeId]['entity_identifier'], $nodeId, $with);
+
+        $data = [
+            $this->getNameSingular() => $this->transformEntityLazily($node)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getNodeTypeId();
+
+    /**
+     * @return string
+     */
+    abstract protected function getNamePlural();
+
+    /**
+     * @return string
+     */
+    abstract protected function getNameSingular();
+}
diff --git a/Controller/Asset.php b/Controller/Asset.php
new file mode 100644
index 00000000..1379521a
--- /dev/null
+++ b/Controller/Asset.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+class Asset extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\View
+     */
+    public function actionGetSdk()
+    {
+        $params = $this->params()
+            ->define('prefix', 'str', 'JS code prefix');
+
+        $prefix = preg_replace('/[^a-zA-Z0-9]/', '', $params['prefix']);
+
+        $sdkPath = '';
+        if (\XF::$debugMode) {
+            $devSdkPath = dirname(__DIR__) . '/_files/js/Xfrocks/Api/sdk.js';
+            if (file_exists($devSdkPath)) {
+                $sdkPath = $devSdkPath;
+            }
+        }
+
+        if ($sdkPath === '') {
+            $sdkPath = sprintf(
+                '%1$s%2$sjs%2$sXfrocks%2$sApi%2$s' . 'sdk.min.js',
+                \XF::getRootDirectory(),
+                DIRECTORY_SEPARATOR
+            );
+        }
+        if (!file_exists($sdkPath)) {
+            return $this->noPermission();
+        }
+
+        $sdk = strval(file_get_contents($sdkPath));
+        $sdk = str_replace('{prefix}', $prefix, $sdk);
+        $sdk = str_replace('{data_uri}', $this->app->router('public')->buildLink('misc/api-data'), $sdk);
+        $sdk = str_replace('{request_uri}', $this->buildApiLink('index'), $sdk);
+
+        $this->setResponseType('raw');
+        return $this->view('Xfrocks\Api\View\Asset\Sdk', '', ['sdk' => $sdk]);
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertBoardActive($action)
+    {
+        // intentionally left empty
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertViewingPermissions($action)
+    {
+        // intentionally left empty
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+}
diff --git a/Controller/Attachment.php b/Controller/Attachment.php
new file mode 100644
index 00000000..714272f5
--- /dev/null
+++ b/Controller/Attachment.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+
+class Attachment extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->attachment_id) {
+            return $this->actionSingle($params->attachment_id);
+        }
+
+        return $this->notFound();
+    }
+
+    /**
+     * @param ParameterBag $pb
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionDeleteIndex(ParameterBag $pb)
+    {
+        $params = $this->params()
+            ->define('hash', 'str');
+
+        /** @var \XF\Entity\Attachment $attachment */
+        $attachment = $this->assertRecordExists('XF:Attachment', $pb->attachment_id);
+
+        $handler = $attachment->getHandler();
+        if ($handler === null) {
+            return $this->noPermission();
+        }
+
+        if (strlen($attachment->temp_hash) > 0) {
+            if ($params['hash'] !== $attachment->temp_hash) {
+                return $this->noPermission();
+            }
+        } else {
+            $entity = $handler->getContainerEntity($attachment->content_id);
+            $context = $handler->getContext($entity);
+            $error = null;
+            if (!$handler->canManageAttachments($context, $error)) {
+                return $this->noPermission($error);
+            }
+        }
+
+        $attachment->delete();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param int $attachmentId
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function actionSingle($attachmentId)
+    {
+        /** @var \XF\Entity\Attachment|null $attachment */
+        $attachment = $this->em()->find('XF:Attachment', $attachmentId);
+        if ($attachment === null) {
+            throw $this->exception($this->notFound());
+        }
+
+        if ($attachment->temp_hash !== '') {
+            $hash = $this->filter('hash', 'str');
+            if ($attachment->temp_hash !== $hash) {
+                return $this->noPermission();
+            }
+        } else {
+            if (!$attachment->canView($error)) {
+                return $this->noPermission($error);
+            }
+        }
+
+        /** @var \XF\ControllerPlugin\Attachment $attachPlugin */
+        $attachPlugin = $this->plugin('XF:Attachment');
+
+        return $attachPlugin->displayAttachment($attachment);
+    }
+}
diff --git a/Controller/Batch.php b/Controller/Batch.php
new file mode 100644
index 00000000..be63b419
--- /dev/null
+++ b/Controller/Batch.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\Reply\AbstractReply;
+use Xfrocks\Api\Data\BatchJob;
+use Xfrocks\Api\Transformer;
+
+class Batch extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionPostIndex()
+    {
+        $inputRaw = $this->request->getInputRaw();
+        if ($inputRaw === '' && \XF::$debugMode) {
+            $inputRaw = $this->request->filter('_xfApiInputRaw', 'str');
+        }
+        $configs = @json_decode($inputRaw, true);
+        if (!is_array($configs)) {
+            return $this->error(\XF::phrase('bdapi_slash_batch_requires_json'));
+        }
+
+        $replies = [];
+        foreach ($configs as $config) {
+            if (!is_array($config)) {
+                continue;
+            }
+            $job = $this->buildJobFromConfig($config);
+            if ($job === null) {
+                continue;
+            }
+
+            if (!isset($config['id'])) {
+                $i = 0;
+                do {
+                    $id = $i > 0 ? sprintf('%s_%d', $job->getUri(), $i) : $job->getUri();
+                    $i++;
+                } while (isset($replies[$id]));
+            } else {
+                $id = $config['id'];
+            }
+
+            $replies[$id] = $job->execute();
+        }
+
+        $data = [
+            'jobs' => $this->transformReplies($replies)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param array $config
+     * @return BatchJob|null
+     */
+    protected function buildJobFromConfig(array $config)
+    {
+        if (!isset($config['uri']) || !is_string($config['uri'])) {
+            return null;
+        }
+
+        if (!isset($config['method'])) {
+            $config['method'] = 'GET';
+        }
+        $config['method'] = strtoupper($config['method']);
+
+        if (!isset($config['params']) || !is_array($config['params'])) {
+            $config['params'] = [];
+        }
+
+        /** @var string|false $uriQuery */
+        $uriQuery = @parse_url($config['uri'], PHP_URL_QUERY);
+        if ($uriQuery !== false) {
+            $uriParams = [];
+            parse_str($uriQuery, $uriParams);
+            if (count($uriParams) > 0) {
+                $config['params'] = array_merge($uriParams, $config['params']);
+            }
+        }
+
+        return new BatchJob($this->app, $config['method'], $config['params'], $config['uri']);
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+
+    protected function logRequest(AbstractReply $reply)
+    {
+        // Does not support log request for this controller
+    }
+
+    /**
+     * @param array $replies
+     * @return array
+     */
+    protected function transformReplies(array $replies)
+    {
+        $data = [];
+
+        /** @var Transformer $transformer */
+        $transformer = $this->app()->container('api.transformer');
+
+        foreach ($replies as $jobId => $reply) {
+            $data[$jobId] = $transformer->transformBatchJobReply($reply);
+        }
+
+        return $data;
+    }
+}
diff --git a/Controller/Category.php b/Controller/Category.php
new file mode 100644
index 00000000..1faa1a2d
--- /dev/null
+++ b/Controller/Category.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+class Category extends AbstractNode
+{
+    protected function getNamePlural()
+    {
+        return 'categories';
+    }
+
+    protected function getNameSingular()
+    {
+        return 'category';
+    }
+
+    protected function getNodeTypeId()
+    {
+        return 'Category';
+    }
+}
diff --git a/Controller/Conversation.php b/Controller/Conversation.php
new file mode 100644
index 00000000..3f31cd2f
--- /dev/null
+++ b/Controller/Conversation.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\Util\PageNav;
+
+class Conversation extends AbstractController
+{
+    public function preDispatch($action, ParameterBag $params)
+    {
+        parent::preDispatch($action, $params);
+
+        $this->assertApiScope('conversate');
+        $this->assertRegistrationRequired();
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->conversation_id) {
+            return $this->actionSingle($params->conversation_id);
+        }
+
+        $params = $this
+            ->params()
+            ->definePageNav();
+
+        $visitor = \XF::visitor();
+        /** @var \XF\Repository\Conversation $conversionRepo */
+        $conversionRepo = $this->repository('XF:Conversation');
+
+        $finder = $conversionRepo->findUserConversations($visitor);
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+
+        $conversations = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'conversations' => $conversations,
+            'conversations_total' => $total
+        ];
+
+        PageNav::addLinksToData($data, $params, $total, 'conversations');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $conversationId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionSingle($conversationId)
+    {
+        $conversation = $this->assertViewableConversation($conversationId);
+
+        $data = [
+            'conversation' => $this->transformEntityLazily($conversation)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('conversation_title', 'str', 'title of the new conversation')
+            ->define('recipients', 'str', 'usernames of recipients of the new conversation')
+            ->define('message_body', 'str', 'content of the new conversation')
+            ->defineAttachmentHash();
+
+        $visitor = \XF::visitor();
+
+        /** @var \XF\Service\Conversation\Creator $creator */
+        $creator = $this->service('XF:Conversation\Creator', $visitor);
+        $creator->setRecipients($params['recipients']);
+        $creator->setContent($params['conversation_title'], $params['message_body']);
+
+        $contentData = ['message_id' => 0];
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($contentData);
+
+        if ($creator->getConversation()->canUploadAndManageAttachments()) {
+            $creator->setAttachmentHash($tempHash);
+        }
+
+        $creator->checkForSpam();
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $conversation = $creator->save();
+        return $this->actionSingle($conversation->conversation_id);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionDeleteIndex(ParameterBag $params)
+    {
+        $conversation = $this->assertViewableConversation($params->conversation_id);
+
+        $recipient = $conversation->Recipients[\XF::visitor()->user_id];
+        $recipient->recipient_state = 'deleted';
+        $recipient->save();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostAttachments()
+    {
+        $this->params()
+            ->defineFile('file')
+            ->defineAttachmentHash();
+
+        $contentData = ['message_id' => 0];
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($contentData);
+
+        return $attachmentPlugin->doUpload($tempHash, 'conversation_message', $contentData);
+    }
+
+    /**
+     * @param int $conversationId
+     * @param array $extraWith
+     * @return \XF\Entity\ConversationMaster
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableConversation($conversationId, array $extraWith = [])
+    {
+        $extraWith[] = 'Users|' . \XF::visitor()->user_id;
+
+        /** @var \XF\Entity\ConversationMaster $conversation */
+        $conversation = $this->assertRecordExists(
+            'XF:ConversationMaster',
+            $conversationId,
+            $extraWith,
+            'requested_conversation_not_found'
+        );
+
+        if (!$conversation->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $conversation;
+    }
+}
diff --git a/Controller/ConversationMessage.php b/Controller/ConversationMessage.php
new file mode 100644
index 00000000..2e7b47a2
--- /dev/null
+++ b/Controller/ConversationMessage.php
@@ -0,0 +1,384 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Entity\ConversationMaster;
+use XF\Mvc\ParameterBag;
+use XF\Service\Conversation\MessageEditor;
+use XF\Service\Conversation\Replier;
+use Xfrocks\Api\ControllerPlugin\Like;
+use Xfrocks\Api\Data\Params;
+use Xfrocks\Api\Util\PageNav;
+
+class ConversationMessage extends Conversation
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->message_id) {
+            return $this->actionSingle($params->message_id);
+        }
+
+        $orderChoices = [
+            'natural' => ['message_date', 'ASC'],
+            'natural_reverse' => ['message_date', 'DESC']
+        ];
+
+        $params = $this
+            ->params()
+            ->define('conversation_id', 'uint', 'conversation id to filter')
+            ->define('before', 'uint', 'date to get older messages')
+            ->define('after', 'uint', 'date to get newer messages')
+            ->definePageNav()
+            ->defineOrder($orderChoices);
+
+        $this->assertRegistrationRequired();
+
+        /** @var ConversationMaster $conversation */
+        $conversation = $this->assertRecordExists('XF:ConversationMaster', $params['conversation_id']);
+        if (!$conversation->canView($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Repository\ConversationMessage $convoMessageRepo */
+        $convoMessageRepo = $this->repository('XF:ConversationMessage');
+
+        $finder = $convoMessageRepo->findMessagesForConversationView($conversation);
+        $this->applyMessagesFilters($finder, $params);
+
+        $total = $finder->total();
+
+        $tc = $this->params()->getTransformContext();
+        $tc->onTransformEntitiesCallbacks[] = function ($_, $entities) use ($conversation) {
+            $maxReadDate = 0;
+            foreach ($entities as $entity) {
+                if (!$entity instanceof \XF\Entity\ConversationMessage) {
+                    continue;
+                }
+
+                $maxReadDate = max($entity->message_date, $maxReadDate);
+            }
+
+            if ($maxReadDate > 0) {
+                /** @var \XF\Repository\Conversation $convoRepo */
+                $convoRepo = $this->repository('XF:Conversation');
+                $visitor = \XF::visitor();
+                $convoRepo->markUserConversationRead($conversation->Users[$visitor->user_id], $maxReadDate);
+            }
+        };
+
+        $messages = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'messages' => $messages,
+            'messages_total' => $total
+        ];
+
+        $this->transformEntityIfNeeded($data, 'conversation', $conversation);
+        PageNav::addLinksToData($data, $params, $total, 'conversation-messages');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $messageId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionSingle($messageId)
+    {
+        $message = $this->assertViewableMessage($messageId);
+
+        $data = [
+            'message' => $this->transformEntityLazily($message)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('conversation_id', 'uint', 'id of the target conversation')
+            ->define('message_body', 'str', 'content of the new message')
+            ->defineAttachmentHash();
+
+        $conversation = $this->assertViewableConversation($params['conversation_id']);
+        if (!$conversation->canReply()) {
+            return $this->noPermission();
+        }
+
+        /** @var Replier $replier */
+        $replier = $this->service('XF:Conversation\Replier', $conversation, \XF::visitor());
+
+        $replier->setMessageContent($params['message_body']);
+
+        if ($conversation->canUploadAndManageAttachments()) {
+            $context = [
+                'conversation_id' => $params['conversation_id']
+            ];
+
+            /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+            $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+            $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
+
+            $replier->setAttachmentHash($tempHash);
+        }
+
+        $replier->checkForSpam();
+
+        if (!$replier->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $this->assertNotFlooding('conversation');
+
+        $message = $replier->save();
+        return $this->actionSingle($message->message_id);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPutIndex(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        $params = $this
+            ->params()
+            ->define('message_body', 'str', 'new content of the message')
+            ->defineAttachmentHash();
+
+        $error = null;
+        if (!$message->canEdit($error)) {
+            return $this->noPermission($error);
+        }
+
+        $conversation = $message->Conversation;
+        if ($conversation === null) {
+            return $this->noPermission();
+        }
+
+        /** @var MessageEditor $editor */
+        $editor = $this->service('XF:Conversation\MessageEditor', $message);
+        $editor->setMessageContent($params['message_body']);
+
+        if ($conversation->canUploadAndManageAttachments()) {
+            $context = [
+                'message_id' => $message->message_id
+            ];
+
+            /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+            $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+            $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
+
+            $editor->setAttachmentHash($tempHash);
+        }
+
+        $editor->checkForSpam();
+
+        if (!$editor->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $message = $editor->save();
+        return $this->actionSingle($message->message_id);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\AbstractReply
+     */
+    public function actionDeleteIndex(ParameterBag $params)
+    {
+        return $this->noPermission();
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetAttachments(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        $params = $this
+            ->params()
+            ->define('attachment_id', 'uint');
+
+        if ($params['attachment_id'] > 0) {
+            return $this->rerouteController('Xfrocks\Api\Controller\Attachment', 'get-data');
+        }
+
+        $finder = $message->getRelationFinder('Attachments');
+
+        $data = [
+            'attachments' => $message->attach_count > 0 ? $this->transformFinderLazily($finder) : []
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostAttachments()
+    {
+        $params = $this
+            ->params()
+            ->defineFile('file')
+            ->define('conversation_id', 'uint', 'id of the container conversation of the target message')
+            ->define('message_id', 'uint', 'id of the target message')
+            ->defineAttachmentHash();
+
+        if ($params['conversation_id'] === '' && $params['message_id'] === '') {
+            return $this->error(\XF::phrase('bdapi_slash_conversation_messages_attachments_requires_ids'), 400);
+        }
+
+        $context = [
+            'conversation_id' => $params['conversation_id'],
+            'message_id' => $params['message_id']
+        ];
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
+
+        return $attachmentPlugin->doUpload($tempHash, 'conversation_message', $context);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostReport(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        $params = $this
+            ->params()
+            ->define('message', 'str', 'reason of the report');
+
+        $error = null;
+        if (!$message->canReport($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Service\Report\Creator $creator */
+        $creator = $this->service('XF:Report\Creator', 'conversation_message', $message);
+        $creator->setMessage($params['message']);
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $creator->save();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetLikes(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionGetLikes($message);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostLikes(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($message, true);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteLikes(ParameterBag $params)
+    {
+        $message = $this->assertViewableMessage($params->message_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($message, false);
+    }
+
+    /**
+     * @param int $messageId
+     * @param array $extraWith
+     * @return \XF\Entity\ConversationMessage
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableMessage($messageId, array $extraWith = [])
+    {
+        $extraWith[] = 'Conversation.Users|' . \XF::visitor()->user_id;
+
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $this->assertRecordExists(
+            'XF:ConversationMessage',
+            $messageId,
+            $extraWith,
+            'requested_message_not_found'
+        );
+
+        if (!$message->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $message;
+    }
+
+    /**
+     * @param \XF\Finder\ConversationMessage $finder
+     * @param Params $params
+     * @return void
+     */
+    protected function applyMessagesFilters($finder, Params $params)
+    {
+        if ($params['order'] === 'natural_reverse') {
+            $finder->resetOrder()
+                ->order('message_date', 'DESC');
+        }
+
+        if ($params['before'] > 0) {
+            $finder->where('message_date', '<', $params['before']);
+        }
+
+        if ($params['after'] > 0) {
+            $finder->where('message_date', '>', $params['after']);
+        }
+
+        $params->limitFinderByPage($finder);
+    }
+}
diff --git a/Controller/Error.php b/Controller/Error.php
new file mode 100644
index 00000000..1ededa3f
--- /dev/null
+++ b/Controller/Error.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+
+class Error extends AbstractController
+{
+    /**
+     * @see \XF\Pub\Controller\Error::actionDispatchError
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error
+     */
+    public function actionDispatchError(ParameterBag $params)
+    {
+        if ($params['code'] === 'invalid_action'
+            && substr($params['action'], 0, 3) === 'Get') {
+            $controller = $this->app->controller($params['controller'], $this->request);
+            $method = substr_replace($params['action'], 'actionPost', 0, 3);
+            if (is_callable([$controller, $method])) {
+                return $this->error(\XF::phrase('bdapi_only_accepts_post_requests'), 400);
+            }
+        }
+
+        return $this->pluginError()->actionDispatchError($params);
+    }
+
+    /**
+     * @see \XF\Pub\Controller\Error::actionException
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\View
+     */
+    public function actionException(ParameterBag $params)
+    {
+        return $this->pluginError()->actionException($params->get('exception', false));
+    }
+
+    /**
+     * @see \XF\Pub\Controller\Error::actionAddOnUpgrade
+     * @return \XF\Mvc\Reply\Error
+     */
+    public function actionAddOnUpgrade()
+    {
+        return $this->pluginError()->actionAddOnUpgrade();
+    }
+
+    /**
+     * @return void
+     */
+    public function assertIpNotBanned()
+    {
+        // no op
+    }
+
+    /**
+     * @return void
+     */
+    public function assertNotBanned()
+    {
+        // no op
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertViewingPermissions($action)
+    {
+        // no op
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertCorrectVersion($action)
+    {
+        // no op
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertBoardActive($action)
+    {
+        // no op
+    }
+
+    /**
+     * @param mixed $action
+     * @return void
+     */
+    public function assertTfaRequirement($action)
+    {
+        // no op
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+
+    /**
+     * @return \XF\ControllerPlugin\Error
+     */
+    protected function pluginError()
+    {
+        /** @var \XF\ControllerPlugin\Error $errorPlugin */
+        $errorPlugin = $this->plugin('XF:Error');
+        return $errorPlugin;
+    }
+}
diff --git a/Controller/Forum.php b/Controller/Forum.php
new file mode 100644
index 00000000..7d8b4229
--- /dev/null
+++ b/Controller/Forum.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Entity\ForumWatch;
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Forum extends AbstractNode
+{
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowed()
+    {
+        $this->assertRegistrationRequired();
+
+        $visitor = \XF::visitor();
+        $finder = $this->finder('XF:ForumWatch')
+            ->where('user_id', $visitor->user_id);
+
+        if ($this->request()->exists('total')) {
+            $total = $finder->total();
+
+            $data = [
+                'forums_total' => $total
+            ];
+
+            return $this->api($data);
+        }
+
+        $finder->with('Forum');
+        /** @var ForumWatch[] $forumWatches */
+        $forumWatches = $finder->fetch();
+
+        $forums = [];
+        $context = $this->params()->getTransformContext();
+        $context->onTransformedCallbacks[] = function ($context, &$data) use ($forumWatches) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!($source instanceof \XF\Entity\Forum)) {
+                return;
+            }
+
+            $watched = null;
+            foreach ($forumWatches as $forumWatch) {
+                if ($forumWatch->node_id == $source->node_id) {
+                    $watched = $forumWatch;
+
+                    break;
+                }
+            }
+
+            if ($watched !== null) {
+                $data['follow'] = [
+                    'post' => $watched->notify_on == 'message',
+                    'alert' => $watched->send_alert,
+                    'email' => $watched->send_email
+                ];
+            }
+        };
+
+        foreach ($forumWatches as $forumWatch) {
+            $forum = $forumWatch->Forum;
+            if ($forum !== null) {
+                $forums[] = $this->transformEntityLazily($forum);
+            }
+        }
+
+        $data = [
+            'forums' => $forums
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowers(ParameterBag $paramBag)
+    {
+        $forum = $this->assertViewableForum($paramBag->node_id);
+
+        $users = [];
+        if ($forum->canWatch()) {
+            $visitor = \XF::visitor();
+
+            /** @var ForumWatch|null $watched */
+            $watched = $this->em()->findOne('XF:ForumWatch', [
+                'user_id' => $visitor->user_id,
+                'node_id' => $forum->node_id
+            ]);
+
+            if ($watched !== null) {
+                $users[] = [
+                    'user_id' => $visitor->user_id,
+                    'username' => $visitor->username,
+                    'follow' => [
+                        'post' => $watched->notify_on == 'message',
+                        'alert' => $watched->send_alert,
+                        'email' => $watched->send_email
+                    ]
+                ];
+            }
+        }
+
+        $data = [
+            'users' => $users
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostFollowers(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('post', 'uint', 'whether to receive notification for post')
+            ->define('alert', 'uint', 'whether to receive notification as alert', 1)
+            ->define('email', 'uint', 'whether to receive notification as email');
+
+        $forum = $this->assertViewableForum($paramBag->node_id);
+
+        $error = null;
+        if (!$forum->canWatch($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Repository\ForumWatch $forumWatchRepo */
+        $forumWatchRepo = $this->repository('XF:ForumWatch');
+        $forumWatchRepo->setWatchState(
+            $forum,
+            \XF::visitor(),
+            $params['post'] > 0 ? 'message' : 'thread',
+            $params['alert'],
+            $params['email']
+        );
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteFollowers(ParameterBag $paramBag)
+    {
+        $forum = $this->assertViewableForum($paramBag->node_id);
+
+        $error = null;
+        if (!$forum->canWatch($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Repository\ForumWatch $forumWatchRepo */
+        $forumWatchRepo = $this->repository('XF:ForumWatch');
+        $forumWatchRepo->setWatchState($forum, \XF::visitor(), 'delete');
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    protected function getNodeTypeId()
+    {
+        return 'Forum';
+    }
+
+    protected function getNamePlural()
+    {
+        return 'forums';
+    }
+
+    protected function getNameSingular()
+    {
+        return 'forum';
+    }
+
+    /**
+     * @param int $forumId
+     * @param array $extraWith
+     * @return \XF\Entity\Forum
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableForum($forumId, array $extraWith = [])
+    {
+        $extraWith[] = 'Node.Permissions|' . \XF::visitor()->permission_combination_id;
+
+        /** @var \XF\Entity\Forum $forum */
+        $forum = $this->assertRecordExists('XF:Forum', $forumId, $extraWith);
+        if (!$forum->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $forum;
+    }
+}
diff --git a/Controller/Index.php b/Controller/Index.php
new file mode 100644
index 00000000..25a64295
--- /dev/null
+++ b/Controller/Index.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use Xfrocks\Api\Data\Modules;
+use Xfrocks\Api\OAuth2\Server;
+
+class Index extends AbstractController
+{
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetIndex()
+    {
+        /** @var Modules $modules */
+        $modules = $this->data('Xfrocks\Api:Modules');
+
+        $systemInfo = [];
+        $token = $this->session()->getToken();
+        if ($token === null) {
+            $systemInfo += [
+                'oauth/authorize' => $this->app->router('public')->buildLink('account/authorize'),
+                'oauth/token' => $this->buildApiLink('oauth/token')
+            ];
+        } elseif ($token->hasScope(Server::SCOPE_POST)) {
+            $systemInfo += [
+                'api_revision' => 2016062001,
+                'api_modules' => $modules->getVersions()
+            ];
+            ksort($systemInfo['api_modules']);
+        }
+
+        $data = $modules->getDataForApiIndex($this);
+        ksort($data['links']);
+        ksort($data['post']);
+        $data['system_info'] = $systemInfo;
+
+        return $this->api($data);
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+}
diff --git a/Controller/LostPassword.php b/Controller/LostPassword.php
new file mode 100644
index 00000000..9daf12ca
--- /dev/null
+++ b/Controller/LostPassword.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Service\User\PasswordReset;
+
+class LostPassword extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     */
+    public function actionPostIndex()
+    {
+        $params = $this->params()
+            ->define('username', 'str')
+            ->define('email', 'str');
+
+        $usernameOrEmail = $params['username'];
+        if (strlen($usernameOrEmail) === 0) {
+            $usernameOrEmail = $params['email'];
+        }
+        if ($usernameOrEmail === '') {
+            return $this->error(\XF::phrase('bdapi_slash_lost_password_requires_username_or_email'), 400);
+        }
+
+        $token = $this->session()->getToken();
+        if ($token === null) {
+            return $this->noPermission();
+        }
+
+        /** @var \XF\Repository\User $userRepo */
+        $userRepo = $this->repository('XF:User');
+        /** @var \XF\Entity\User|null $user */
+        $user = $userRepo->getUserByNameOrEmail($usernameOrEmail);
+        if ($user === null) {
+            return $this->error(\XF::phrase('requested_member_not_found'));
+        }
+
+        /** @var PasswordReset $passwordReset */
+        $passwordReset = $this->service('XF:User\PasswordReset', $user);
+        if (!$passwordReset->canTriggerConfirmation($error)) {
+            return $this->error($error);
+        }
+
+        $passwordReset->triggerConfirmation();
+        return $this->message(\XF::phrase('password_reset_request_has_been_emailed_to_you'));
+    }
+}
diff --git a/Controller/Navigation.php b/Controller/Navigation.php
new file mode 100644
index 00000000..a8d81697
--- /dev/null
+++ b/Controller/Navigation.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+class Navigation extends AbstractController
+{
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('parent', 'str');
+
+        $elements = $this->getElements($params['parent']);
+        return $this->api(['elements' => $elements]);
+    }
+
+    /**
+     * @param string $parentNodeId
+     * @return array
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function getElements($parentNodeId)
+    {
+        $parentNode = null;
+        $expectParentNodeId = null;
+        if (is_numeric($parentNodeId)) {
+            $expectParentNodeId = intval($parentNodeId);
+            /** @var \XF\Entity\Node|null $parentNode */
+            $parentNode = $expectParentNodeId > 0 ? $this->assertRecordExists(
+                'XF:Node',
+                $parentNodeId,
+                [],
+                'bdapi_navigation_element_not_found'
+            ) : null;
+        }
+
+        /** @var \XF\Repository\Node $nodeRepo */
+        $nodeRepo = $this->repository('XF:Node');
+        $nodeList = $nodeRepo->getNodeList($parentNode);
+
+        $nodes = [];
+        /** @var \XF\Entity\Node $node */
+        foreach ($nodeList as $node) {
+            if ($expectParentNodeId !== null && $node->parent_node_id !== $expectParentNodeId) {
+                continue;
+            }
+            $nodes[] = $node;
+        }
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Navigation $navigationPlugin */
+        $navigationPlugin = $this->plugin('Xfrocks\Api:Navigation');
+        return $navigationPlugin->prepareElements($nodes);
+    }
+}
diff --git a/Controller/Notification.php b/Controller/Notification.php
new file mode 100644
index 00000000..7665ce6c
--- /dev/null
+++ b/Controller/Notification.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Entity\UserAlert;
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\Data\BatchJob;
+use Xfrocks\Api\Transformer;
+use Xfrocks\Api\Util\PageNav;
+use Xfrocks\Api\Repository\Subscription as RepoSub;
+
+class Notification extends AbstractController
+{
+    public function preDispatch($action, ParameterBag $params)
+    {
+        parent::preDispatch($action, $params);
+
+        $this->assertRegistrationRequired();
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetIndex()
+    {
+        $params = $this
+            ->params()
+            ->definePageNav();
+
+        /** @var \XF\Repository\UserAlert $alertRepo */
+        $alertRepo = $this->repository('XF:UserAlert');
+
+        $visitor = \XF::visitor();
+        $option = $visitor->Option;
+        if ($option === null) {
+            throw new \RuntimeException('$option === null');
+        }
+
+        $finder = $alertRepo->findAlertsForUser(
+            $visitor->user_id,
+            \XF::$time - $this->options()->alertExpiryDays * 86400
+        );
+
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+        $notifications = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'notifications' => $notifications,
+            'notifications_total' => $total
+        ];
+
+        $topicType = RepoSub::TYPE_NOTIFICATION;
+        if (RepoSub::getSubOption($topicType)) {
+            /** @var RepoSub $subscriptionRepo */
+            $subscriptionRepo = $this->repository('Xfrocks\Api:Subscription');
+            $subscriptionRepo->prepareDiscoveryParams(
+                $data,
+                $topicType,
+                $visitor->user_id,
+                $this->buildApiLink('notifications', null, ['oauth_token' => '']),
+                $option->getValue(RepoSub::getSubColumn($topicType))
+            );
+        }
+
+        PageNav::addLinksToData($data, $params, $total, 'notifications');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Message
+     */
+    public function actionPostRead()
+    {
+        $visitor = \XF::visitor();
+        if ($visitor->alerts_unread > 0) {
+            /** @var \XF\Repository\UserAlert $alertRepo */
+            $alertRepo = $this->repository('XF:UserAlert');
+            $alertRepo->markUserAlertsRead(\XF::visitor());
+        }
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetContent(ParameterBag $params)
+    {
+        /** @var UserAlert $alert */
+        $alert = $this->assertRecordExists('XF:UserAlert', $params->alert_id);
+        if ($alert->alerted_user_id !== \XF::visitor()->user_id) {
+            return $this->noPermission();
+        }
+
+        $jobConfig = $this->getBatchJobConfig($alert);
+        $contentResponse = null;
+
+        if (is_array($jobConfig)) {
+            $jobConfig = array_replace([
+                'method' => 'GET',
+                'uri' => null,
+                'params' => []
+            ], $jobConfig);
+
+            $job = new BatchJob($this->app, $jobConfig['method'], $jobConfig['params'], $jobConfig['uri']);
+            $contentResponse = $job->execute();
+        }
+
+        $data = [
+            'notification_id' => $alert->alert_id,
+            'notification' => $this->transformEntityLazily($alert)
+        ];
+
+        if ($contentResponse !== null) {
+            /** @var Transformer $transformer */
+            $transformer = $this->app()->container('api.transformer');
+
+            $data = array_merge($data, $transformer->transformBatchJobReply($contentResponse));
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param UserAlert $alert
+     * @return array|null
+     */
+    protected function getBatchJobConfig(UserAlert $alert)
+    {
+        switch ($alert->content_type) {
+            case 'conversation':
+                switch ($alert->action) {
+                    case 'insert':
+                    case 'join':
+                    case 'reply':
+                        return [
+                            'uri' => 'conversation-messages',
+                            'params' => [
+                                'conversation_id' => $alert->content_id
+                            ]
+                        ];
+                }
+
+                return [
+                    'uri' => 'conversations',
+                    'params' => [
+                        'conversation_id' => $alert->content_id
+                    ]
+                ];
+            case 'thread':
+                return [
+                    'uri' => 'threads',
+                    'params' => [
+                        'thread_id' => $alert->content_id
+                    ]
+                ];
+            case 'post':
+                return [
+                    'uri' => 'posts',
+                    'params' => [
+                        'page_of_post_id' => $alert->content_id
+                    ]
+                ];
+            case 'user':
+                switch ($alert->action) {
+                    case 'following':
+                        return [
+                            'uri' => 'users/followers',
+                            'params' => [
+                                'user_id' => $alert->content_id
+                            ]
+                        ];
+                    case 'post_copy':
+                    case 'post_move':
+                    case 'thread_merge':
+                        // TODO: Support user alert action (post_copy, post_move, thread_merge)
+                        break;
+                    case 'thread_move':
+                        break;
+                }
+
+                return [
+                    'uri' => 'users',
+                    'params' => [
+                        'user_id' => $alert->content_id
+                    ]
+                ];
+            case 'profile_post':
+                return [
+                    'uri' => 'profile-posts/comments',
+                    'params' => [
+                        'profile_post_id' => $alert->content_id
+                    ]
+                ];
+            case 'profile_post_comment':
+                return [
+                    'uri' => 'profile-posts/comments',
+                    'params' => [
+                        'page_of_comment_id' => $alert->content_id
+                    ]
+                ];
+        }
+
+        return null;
+    }
+}
diff --git a/Controller/OAuth2.php b/Controller/OAuth2.php
new file mode 100644
index 00000000..3d55e215
--- /dev/null
+++ b/Controller/OAuth2.php
@@ -0,0 +1,311 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use XF\ConnectedAccount\ProviderData\Facebook;
+use XF\Entity\ConnectedAccountProvider;
+use XF\Repository\ConnectedAccount;
+use XF\Repository\Tfa;
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Util\Crypt;
+use Xfrocks\Api\Util\Token;
+
+class OAuth2 extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetAuthorize()
+    {
+        $this->assertCanonicalUrl($this->buildLink('account/authorize'));
+
+        return $this->noPermission();
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \League\OAuth2\Server\Exception\InvalidGrantException
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostToken()
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+
+        return $this->api($apiServer->grantFinalize($this));
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\PrintableException
+     */
+    public function actionPostTokenAdmin()
+    {
+        $params = $this->params()
+            ->define('user_id', 'uint', 'User ID');
+
+        $session = $this->session();
+        $token = $session->getToken();
+        if ($token === null) {
+            return $this->noPermission();
+        }
+
+        $client = $token->Client;
+        if ($client === null) {
+            return $this->noPermission();
+        }
+
+        if (!\XF::visitor()->hasAdminPermission('user')) {
+            return $this->noPermission();
+        }
+
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+        $scopes = $apiServer->getScopeDefaults();
+        $accessToken = $apiServer->newAccessToken($params['user_id'], $client, $scopes);
+
+        return $this->api(Token::transformLibAccessTokenEntity($accessToken));
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostTokenFacebook()
+    {
+        $params = $this
+            ->params()
+            ->define('client_id', 'str')
+            ->define('client_secret', 'str')
+            ->define('facebook_token', 'str');
+
+        /** @var Client $client */
+        $client = $this->assertRecordExists(
+            'Xfrocks\Api:Client',
+            $params['client_id'],
+            ['User'],
+            'bdapi_requested_client_not_found'
+        );
+
+        if ($client->client_secret !== $params['client_secret']) {
+            return $this->noPermission();
+        }
+
+        $provider = $this->assertProviderExists('facebook');
+        $handler = $provider->getHandler();
+
+        if ($handler === null || !$handler->isUsable($provider)) {
+            return $this->noPermission();
+        }
+
+        $storageState = $handler->getStorageState($provider, \XF::visitor());
+
+        $tokenObj = new StdOAuth2Token();
+        $tokenObj->setAccessToken($params['facebook_token']);
+
+        $storageState->storeToken($tokenObj);
+
+        /** @var Facebook $providerData */
+        $providerData = $handler->getProviderData($storageState);
+        if (strval($providerData->getProviderKey()) === '') {
+            return $this->error(\XF::phrase('bdapi_invalid_facebook_token'), 400);
+        }
+
+        $externalProviderKey = sprintf('fb_%s', $providerData->getProviderKey());
+
+        $httpClient = $this->app()->http()->client();
+        $fbApp = $httpClient->get('https://graph.facebook.com/app', [
+            'query' => [
+                'access_token' => $params['facebook_token']
+            ]
+        ])->getBody()->getContents();
+
+        $fbApp = json_decode(strval($fbApp), true);
+        if (isset($fbApp['id']) && $fbApp['id'] === $provider->options['app_id']) {
+            $externalProviderKey = $providerData->getProviderKey();
+        }
+
+        /** @var ConnectedAccount $connectedAccountRepo */
+        $connectedAccountRepo = $this->repository('XF:ConnectedAccount');
+        $userConnected = $connectedAccountRepo->getUserConnectedAccountFromProviderData($providerData);
+        if ($userConnected && $userConnected->User) {
+            return $this->postTokenNonStandard($client, $userConnected->User);
+        }
+
+        $userData = [];
+
+        if ($email = $providerData->getEmail()) {
+            /** @var \XF\Entity\User|null $userByEmail */
+            $userByEmail = $this->em()->find('XF:User', ['email' => $email]);
+
+            if ($userByEmail !== null) {
+                $userData['associatable'][$userByEmail->user_id] = [
+                    'user_id' => $userByEmail->user_id,
+                    'username' => $userByEmail->username,
+                    'user_email' => $userByEmail->email
+                ];
+            } else {
+                $userData['user_email'] = $email;
+            }
+        }
+
+        if ($fbUsername = $providerData->getUsername()) {
+            $testUser = $this->em()->create('XF:User');
+            $testUser->set('username', $fbUsername);
+
+            if (!$testUser->hasErrors()) {
+                $userData['username'] = $fbUsername;
+            }
+        }
+
+        $extraData = [
+            'external_provider' => 'facebook',
+            'external_provider_key' => $externalProviderKey,
+            'access_token' => $params['facebook_token']
+        ];
+
+        if (isset($userData['user_email'])) {
+            $extraData['user_email'] = $userData['user_email'];
+        }
+
+        $extraData = serialize($extraData);
+        $extraTimestamp = intval(time() + $this->app()->options()->bdApi_refreshTokenTTLDays * 86400);
+
+        $userData += [
+            'extra_data' => Crypt::encryptTypeOne($extraData, $extraTimestamp),
+            'extra_timestamp' => $extraTimestamp
+        ];
+
+        $data = [
+            'status' => 'ok',
+            'message' => \XF::phrase('bdapi_no_facebook_association_found'),
+            'user_data' => $userData
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return int|false
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function verifyCredentials($username, $password)
+    {
+        $ip = $this->request->getIp();
+
+        /** @var \XF\Service\User\Login $loginService */
+        $loginService = $this->service('XF:User\Login', $username, $ip);
+        if ($loginService->isLoginLimited($limitType)) {
+            throw $this->errorException(\XF::phrase('your_account_has_temporarily_been_locked_due_to_failed_login_attempts'));
+        }
+
+        $user = $loginService->validate($password, $error);
+        if (!$user) {
+            return false;
+        }
+
+        if (!$this->runTfaValidation($user)) {
+            return false;
+        }
+
+        return $user->user_id;
+    }
+
+    /**
+     * @param \XF\Entity\User $user
+     * @return bool
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function runTfaValidation(\XF\Entity\User $user)
+    {
+        $params = $this
+            ->params()
+            ->define('tfa_provider', 'str')
+            ->define('tfa_trigger', 'bool');
+
+        /** @var \XF\ControllerPlugin\Login $loginPlugin */
+        $loginPlugin = $this->plugin('XF:Login');
+        if (!$loginPlugin->isTfaConfirmationRequired($user)) {
+            return true;
+        }
+
+        /** @var Tfa $tfaRepo */
+        $tfaRepo = $this->repository('XF:Tfa');
+        $providers = $tfaRepo->getAvailableProvidersForUser($user->user_id);
+        if (count($providers) === 0) {
+            return true;
+        }
+
+        $response = $this->app()->response();
+        $response->header('X-Api-Tfa-Providers', implode(', ', array_keys($providers)));
+
+        $tfaProvider = $params['tfa_provider'];
+        if (!isset($providers[$tfaProvider])) {
+            throw $this->errorException(\XF::phrase('two_step_verification_required'), 202);
+        }
+        /** @var \XF\Service\User\Tfa $tfaService */
+        $tfaService = $this->service('XF:User\Tfa', $user);
+
+        if ($params['tfa_trigger'] === true) {
+            $tfaService->trigger($this->request(), $tfaProvider);
+            throw $this->exception($this->message(\XF::phrase('changes_saved')));
+        }
+
+        if ($tfaService->hasTooManyTfaAttempts()) {
+            throw $this->errorException(
+                \XF::phrase('your_account_has_temporarily_been_locked_due_to_failed_login_attempts')
+            );
+        }
+
+        if ($tfaService->verify($this->request, $tfaProvider)) {
+            return true;
+        }
+
+        throw $this->errorException(\XF::phrase('two_step_verification_value_could_not_be_confirmed'));
+    }
+
+    /**
+     * @param Client $client
+     * @param \XF\Entity\User $user
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\PrintableException
+     */
+    protected function postTokenNonStandard(Client $client, \XF\Entity\User $user)
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app()->container('api.server');
+        $scopes = $apiServer->getScopeDefaults();
+
+        $token = $apiServer->newAccessToken($user->user_id, $client, $scopes);
+        $refreshToken = $apiServer->newRefreshToken($user->user_id, $client, $scopes);
+
+        return $this->api(Token::transformLibAccessTokenEntity($token, $refreshToken));
+    }
+
+    /**
+     * @param string $id
+     * @param null $with
+     * @param null $phraseKey
+     * @return ConnectedAccountProvider
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertProviderExists($id, $with = null, $phraseKey = null)
+    {
+        /** @var ConnectedAccountProvider $provider */
+        $provider = $this->assertRecordExists('XF:ConnectedAccountProvider', $id, $with, $phraseKey);
+
+        return $provider;
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+}
diff --git a/Controller/Page.php b/Controller/Page.php
new file mode 100644
index 00000000..ac26b0e5
--- /dev/null
+++ b/Controller/Page.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+class Page extends AbstractNode
+{
+    protected function getNamePlural()
+    {
+        return 'pages';
+    }
+
+    protected function getNameSingular()
+    {
+        return 'page';
+    }
+
+    protected function getNodeTypeId()
+    {
+        return 'Page';
+    }
+}
diff --git a/Controller/Post.php b/Controller/Post.php
new file mode 100644
index 00000000..26c32a8b
--- /dev/null
+++ b/Controller/Post.php
@@ -0,0 +1,479 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+use XF\Service\Post\Deleter;
+use XF\Service\Post\Editor;
+use XF\Service\Thread\Replier;
+use Xfrocks\Api\ControllerPlugin\Like;
+use Xfrocks\Api\Data\Params;
+use Xfrocks\Api\Util\PageNav;
+
+class Post extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->post_id) {
+            return $this->actionSingle($params->post_id);
+        }
+
+        $params = $this->params()
+            ->define('thread_id', 'uint', 'thread id to filter', 0)
+            ->define('page_of_post_id', 'uint', 'post id to filter for thread and page', 0)
+            ->defineOrder([
+                'natural' => ['position', 'asc'],
+                'natural_reverse' => ['position', 'desc'],
+                'post_create_date' => ['post_date', 'asc'],
+                'post_create_date_reverse' => ['post_date', 'desc']
+            ])
+            ->definePageNav()
+            ->define('post_ids', 'str', 'post ids to fetch (ignoring all filters, separated by comma)');
+
+        if ($params['post_ids'] !== '') {
+            $postIds = $params->filterCommaSeparatedIds('post_ids');
+
+            return $this->actionMultiple($postIds);
+        }
+
+        if ($params['thread_id'] < 1 && $params['page_of_post_id'] < 1) {
+            $this->assertValidToken();
+        }
+
+        /** @var \XF\Finder\Post $finder */
+        $finder = $this->finder('XF:Post');
+        $this->applyFilters($finder, $params);
+        $params->sortFinder($finder);
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+        $posts = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'posts' => $posts,
+            'posts_total' => $total
+        ];
+
+        if ($params['thread_id'] > 0) {
+            $thread = $this->assertViewableThread($params['thread_id']);
+            $this->transformEntityIfNeeded($data, 'thread', $thread);
+        }
+
+        PageNav::addLinksToData($data, $params, $total, 'posts');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param array $ids
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionMultiple(array $ids)
+    {
+        $posts = [];
+        if (count($ids) > 0) {
+            $posts = $this->findAndTransformLazily('XF:Post', $ids);
+        }
+
+        return $this->api(['posts' => $posts]);
+    }
+
+    /**
+     * @param int $postId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionSingle($postId)
+    {
+        return $this->api([
+            'post' => $this->findAndTransformLazily('XF:Post', intval($postId), 'requested_post_not_found')
+        ]);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('thread_id', 'uint', 'id of the target thread')
+            ->define('quote_post_id', 'uint', 'id of the quote post')
+            ->define('post_body', 'str', 'content of the new post')
+            ->defineAttachmentHash();
+
+        if ($params['quote_post_id'] > 0) {
+            $post = $this->assertViewablePost($params['quote_post_id']);
+            if ($params['thread_id'] > 0 && $post->thread_id !== $params['thread_id']) {
+                return $this->noPermission();
+            }
+
+            $thread = $post->Thread;
+            if ($thread === null) {
+                return $this->notFound();
+            }
+
+            $postBody = $post->getQuoteWrapper($post->message) . $params['post_body'];
+        } else {
+            $thread = $this->assertViewableThread($params['thread_id']);
+
+            $postBody = $params['post_body'];
+        }
+
+        if (!$thread->canReply($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Replier $replier */
+        $replier = $this->service('XF:Thread\Replier', $thread);
+
+        $replier->setMessage($postBody);
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash([
+            'thread_id' => $thread->thread_id
+        ]);
+
+        $replier->setAttachmentHash($tempHash);
+
+        $replier->checkForSpam();
+
+        if (!$replier->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $post = $replier->save();
+
+        return $this->actionSingle($post->post_id);
+    }
+
+    /**
+     * @param ParameterBag $pb
+     * @return mixed|\XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPutIndex(ParameterBag $pb)
+    {
+        $post = $this->assertViewablePost($pb->post_id);
+
+        $params = $this
+            ->params()
+            ->define('post_body', 'str', 'new content of the post')
+            ->define('thread_title', 'str', 'new title of the thread')
+            ->define('thread_prefix_id', 'uint', 'new id of the thread\'s prefix')
+            ->define('thread_tags', 'str', 'new tags of the thread')
+            ->define('fields', 'array')
+            ->defineAttachmentHash();
+
+        if (!$post->canEdit($error)) {
+            return $this->noPermission($error);
+        }
+
+        $thread = $post->Thread;
+        if ($thread === null) {
+            throw new \RuntimeException('$thread === null');
+        }
+
+        /** @var Editor $editor */
+        $editor = $this->service('XF:Post\Editor', $post);
+
+        $editor->setMessage($params['post_body']);
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $attachmentContentData = $pb->_attachmentContentData;
+        if (!is_array($attachmentContentData)) {
+            $attachmentContentData = ['post_id' => $post->post_id];
+        }
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($attachmentContentData);
+
+        $editor->setAttachmentHash($tempHash);
+
+        $editor->checkForSpam();
+
+        $threadEditor = null;
+        $tagger = null;
+        $errors = [];
+
+        if ($post->isFirstPost()) {
+            /** @var \XF\Service\Thread\Editor $threadEditor */
+            $threadEditor = $this->service('XF:Thread\Editor', $thread);
+
+            if ($this->request()->exists('thread_title')) {
+                $threadEditor->setTitle($params['thread_title']);
+            }
+
+            $threadEditor->setPrefix($params['thread_prefix_id']);
+
+            if ($this->request()->exists('fields')) {
+                $threadEditor->setCustomFields($params['fields']);
+            }
+
+            if ($thread->canEditTags()) {
+                /** @var \XF\Service\Tag\Changer $tagger */
+                $tagger = $this->service('XF:Tag\Changer', 'thread', $thread);
+
+                $tagger->setEditableTags($params['thread_tags']);
+
+                if ($tagger->hasErrors()) {
+                    $errors = array_merge($errors, $tagger->getErrors());
+                }
+            }
+
+            $threadErrors = [];
+            $threadEditor->validate($threadErrors);
+
+            $errors = array_merge($errors, $threadErrors);
+        }
+
+        $postErrors = [];
+        $editor->validate($postErrors);
+
+        $errors = array_merge($errors, $postErrors);
+        if (count($errors) > 0) {
+            return $this->error($errors);
+        }
+
+        $post = $editor->save();
+
+        if ($threadEditor !== null) {
+            $threadEditor->save();
+        }
+
+        if ($tagger !== null) {
+            $tagger->save();
+        }
+
+        if (is_callable($pb->_replyCallback)) {
+            return call_user_func($pb->_replyCallback, $this);
+        }
+
+        return $this->actionSingle($post->post_id);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteIndex(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        $params = $this
+            ->params()
+            ->define('reason', 'str', 'reason of the post removal');
+
+        if (!$post->canDelete('soft', $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Deleter $deleter */
+        $deleter = $this->service('XF:Post\Deleter', $post);
+        $deleter->delete('soft', $params['reason']);
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetAttachments(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        $params = $this
+            ->params()
+            ->define('attachment_id', 'uint');
+
+        if ($params['attachment_id'] > 0) {
+            return $this->rerouteController('Xfrocks\Api\Controller\Attachment', 'get-data');
+        }
+
+        $finder = $post->getRelationFinder('Attachments');
+
+        $data = [
+            'attachments' => $this->transformFinderLazily($finder)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostAttachments()
+    {
+        $params = $this
+            ->params()
+            ->defineFile('file', 'binary data of the attachment')
+            ->define('thread_id', 'uint', 'id of the container thread of the target post')
+            ->define('post_id', 'uint', 'id of the target post')
+            ->defineAttachmentHash();
+
+        if ($params['post_id'] === '' && $params['thread_id'] === '') {
+            return $this->error(\XF::phrase('bdapi_slash_posts_attachments_requires_ids'), 400);
+        }
+
+        $context = [
+            'thread_id' => $params['thread_id'],
+            'post_id' => $params['post_id']
+        ];
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
+
+        return $attachmentPlugin->doUpload($tempHash, 'post', $context);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetLikes(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionGetLikes($post);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostLikes(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($post, true);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteLikes(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($post, false);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostReport(ParameterBag $params)
+    {
+        $post = $this->assertViewablePost($params->post_id);
+
+        $params = $this
+            ->params()
+            ->define('message', 'str', 'reason of the report');
+
+        if (!$post->canReport($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Service\Report\Creator $creator */
+        $creator = $this->service('XF:Report\Creator', 'post', $post);
+        $creator->setMessage($params['message']);
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $creator->save();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param int $postId
+     * @param array $extraWith
+     * @return \XF\Entity\Post
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewablePost($postId, array $extraWith = [])
+    {
+        $extraWith[] = 'Thread.Forum.Node.Permissions|' . \XF::visitor()->permission_combination_id;
+
+        /** @var \XF\Entity\Post $post */
+        $post = $this->assertRecordExists('XF:Post', $postId, $extraWith, 'requested_post_not_found');
+
+        if (!$post->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $post;
+    }
+
+    /**
+     * @param int $threadId
+     * @param array $extraWith
+     * @return \XF\Entity\Thread
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableThread($threadId, array $extraWith = [])
+    {
+        $extraWith[] = 'Forum.Node.Permissions|' . \XF::visitor()->permission_combination_id;
+
+        /** @var \XF\Entity\Thread $thread */
+        $thread = $this->assertRecordExists('XF:Thread', $threadId, $extraWith, 'requested_thread_not_found');
+
+        if (!$thread->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $thread;
+    }
+
+    /**
+     * @param \XF\Finder\Post $finder
+     * @param Params $params
+     * @return void
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function applyFilters($finder, Params $params)
+    {
+        if ($params['page_of_post_id'] > 0) {
+            $post = $this->assertViewablePost($params['page_of_post_id']);
+            $params['page_of_post_id'] = 0;
+            $params['thread_id'] = $post->thread_id;
+
+            list($limit,) = $params->filterLimitAndPage();
+
+            if ($params['order'] !== 'natural') {
+                // force natural ordering
+                $params['order'] = 'natural';
+            }
+            $params['page'] = floor($post->position / $limit) + 1;
+        }
+
+        if ($params['thread_id'] > 0) {
+            $thread = $this->assertViewableThread($params['thread_id']);
+            $finder->inThread($thread);
+        }
+    }
+}
diff --git a/Controller/ProfilePost.php b/Controller/ProfilePost.php
new file mode 100644
index 00000000..f1c11c48
--- /dev/null
+++ b/Controller/ProfilePost.php
@@ -0,0 +1,396 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Entity\ProfilePostComment;
+use XF\Mvc\ParameterBag;
+use XF\Service\ProfilePostComment\Creator;
+use XF\Service\ProfilePostComment\Deleter;
+use Xfrocks\Api\ControllerPlugin\Like;
+
+class ProfilePost extends AbstractController
+{
+    /**
+     * @param ParameterBag $paramBag
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('profile_post_ids', 'str');
+
+        if ($params['profile_post_ids'] !== '') {
+            $profilePostIds = $params->filterCommaSeparatedIds('profile_post_ids');
+
+            return $this->actionMultiple($profilePostIds);
+        }
+
+        return $this->actionSingle($paramBag->profile_post_id);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPutIndex(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('post_body', 'str', 'new content of the profile post');
+
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+        if (!$profilePost->canEdit($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Service\ProfilePost\Editor $editor */
+        $editor = $this->service('XF:ProfilePost\Editor', $profilePost);
+        $editor->setMessage($params['post_body']);
+
+        if (!$editor->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $profilePost = $editor->save();
+
+        return $this->actionSingle($profilePost->profile_post_id);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteIndex(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('reason', 'str');
+
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+        if (!$profilePost->canDelete('soft', $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Service\ProfilePost\Deleter $deleter */
+        $deleter = $this->service('XF:ProfilePost\Deleter', $profilePost);
+        $deleter->delete('soft', $params['reason']);
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetLikes(ParameterBag $paramBag)
+    {
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionGetLikes($profilePost);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostLikes(ParameterBag $paramBag)
+    {
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($profilePost, true);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteLikes(ParameterBag $paramBag)
+    {
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+        /** @var Like $likePlugin */
+        $likePlugin = $this->plugin('Xfrocks\Api:Like');
+        return $likePlugin->actionToggleLike($profilePost, true);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetComments(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('before', 'uint')
+            ->define('page_of_comment_id', 'uint')
+            ->define('comment_id', 'uint')
+            ->definePageNav();
+
+        /** @var ProfilePostComment|null $pageOfComment */
+        $pageOfComment = null;
+        if ($params['page_of_comment_id'] > 0) {
+            $pageOfComment = $this->assertViewableComment($params['page_of_comment_id']);
+            $profilePost = $pageOfComment->ProfilePost;
+        } else {
+            $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+            if ($params['comment_id'] > 0) {
+                $oneComment = $this->assertViewableComment($params['comment_id']);
+                if ($oneComment->profile_post_id != $profilePost->profile_post_id) {
+                    return $this->noPermission();
+                }
+
+                $data = [
+                    'comment' => $this->transformEntityLazily($oneComment)
+                ];
+
+                return $this->api($data);
+            }
+        }
+
+        if ($profilePost === null) {
+            throw new \RuntimeException('$profilePost === null');
+        }
+        $profileUser = $profilePost->ProfileUser;
+
+        $beforeDate = $params['before'];
+        if ($pageOfComment !== null) {
+            $beforeDate = $pageOfComment->comment_date + 1;
+        }
+
+        list($limit,) = $params->filterLimitAndPage();
+
+        /** @var \XF\Repository\ProfilePost $profilePostRepo */
+        $profilePostRepo = $this->repository('XF:ProfilePost');
+        $finder = $profilePostRepo->findNewestCommentsForProfilePost($profilePost, $beforeDate);
+
+        $finder->limit($limit);
+
+        $comments = $finder->fetch()->reverse(true);
+
+        /** @var ProfilePostComment|false $oldestComment */
+        $oldestComment = $comments->first();
+        /** @var ProfilePostComment|false $latestComment */
+        $latestComment = $comments->last();
+
+        $data = [
+            'comments' => [],
+            'comment_total' => $profilePost->comment_count,
+            'links' => [],
+            'profile_post' => $this->transformEntityLazily($profilePost),
+            'timeline_user' => $profileUser !== null ? $this->transformEntityLazily($profileUser) : null,
+        ];
+
+        foreach ($comments as $comment) {
+            $data['comments'][] = $this->transformEntityLazily($comment);
+        }
+
+        if ($oldestComment !== false && $oldestComment->comment_date !== $profilePost->first_comment_date) {
+            $data['links']['prev'] = $this->buildApiLink(
+                'profile-posts/comments',
+                $profilePost,
+                ['before' => $oldestComment->comment_date]
+            );
+        }
+
+        if ($latestComment !== false && $latestComment->comment_date !== $profilePost->last_comment_date) {
+            $data['links']['latest'] = $this->buildApiLink(
+                'profile-posts/comments',
+                $profilePost
+            );
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostComments(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('comment_body', 'str');
+
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+        if (!$profilePost->canComment($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Creator $creator */
+        $creator = $this->service('XF:ProfilePostComment\Creator', $profilePost);
+        $creator->setContent($params['comment_body']);
+
+        $creator->checkForSpam();
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $this->assertNotFlooding('post');
+
+        /** @var ProfilePostComment $comment */
+        $comment = $creator->save();
+        $creator->sendNotifications();
+
+        $this->request()->set('comment_id', $comment->profile_post_comment_id);
+        return $this->rerouteController(__CLASS__, 'get-comments', [
+            'profile_post_id' => $profilePost->profile_post_id
+        ]);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteComments(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('comment_id', 'uint')
+            ->define('reason', 'str');
+
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+        $comment = $this->assertViewableComment($params['comment_id']);
+
+        if ($comment->profile_post_id != $profilePost->profile_post_id) {
+            return $this->noPermission();
+        }
+
+        if (!$comment->canDelete('soft', $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Deleter $deleter */
+        $deleter = $this->service('XF:ProfilePostComment\Deleter', $comment);
+        $deleter->delete('soft', $params['reason']);
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostReport(ParameterBag $paramBag)
+    {
+        $params = $this->params()->define('message', 'str');
+
+        $profilePost = $this->assertViewableProfilePost($paramBag->profile_post_id);
+
+        if (!$profilePost->canReport($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XF\Service\Report\Creator $creator */
+        $creator = $this->service('XF:Report\Creator', 'profile_post', $profilePost);
+        $creator->setMessage($params['message']);
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $creator->save();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param array $ids
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionMultiple(array $ids)
+    {
+        $profilePosts = [];
+        if (count($ids) > 0) {
+            $profilePosts = $this->findAndTransformLazily('XF:ProfilePost', $ids);
+        }
+
+        return $this->api(['profile_posts' => $profilePosts]);
+    }
+
+    /**
+     * @param int $profilePostId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionSingle($profilePostId)
+    {
+        $profilePost = $this->assertViewableProfilePost($profilePostId);
+
+        $data = [
+            'profile_post' => $this->transformEntityLazily($profilePost)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $commentId
+     * @param array $extraWith
+     * @return ProfilePostComment
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableComment($commentId, array $extraWith = [])
+    {
+        $extraWith[] = 'User';
+        $extraWith[] = 'ProfilePost.ProfileUser.Privacy';
+
+        /** @var ProfilePostComment $comment */
+        $comment = $this->assertRecordExists(
+            'XF:ProfilePostComment',
+            $commentId,
+            $extraWith,
+            'requested_comment_not_found'
+        );
+
+        if (!$comment->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $comment;
+    }
+
+    /**
+     * @param int $profilePostId
+     * @param array $extraWith
+     * @return \XF\Entity\ProfilePost
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableProfilePost($profilePostId, array $extraWith = [])
+    {
+        $extraWith[] = 'User';
+        $extraWith[] = 'ProfileUser.Privacy';
+
+        /** @var \XF\Entity\ProfilePost $profilePost */
+        $profilePost = $this->assertRecordExists(
+            'XF:ProfilePost',
+            $profilePostId,
+            $extraWith,
+            'requested_profile_post_not_found'
+        );
+
+        if (!$profilePost->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $profilePost;
+    }
+}
diff --git a/Controller/Search.php b/Controller/Search.php
new file mode 100644
index 00000000..af3a3a6d
--- /dev/null
+++ b/Controller/Search.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\Util\PageNav;
+
+class Search extends AbstractController
+{
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetIndex()
+    {
+        $data = [
+            'links' => [
+                'posts' => $this->buildApiLink('search/posts'),
+                'threads' => $this->buildApiLink('search/threads')
+            ]
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetResults(ParameterBag $params)
+    {
+        $search = $this->assertViewableSearch($params->search_id);
+
+        $params = $this
+            ->params()
+            ->definePageNav();
+
+        list($perPage, $page) = $params->filterLimitAndPage();
+
+        $searcher = $this->app()->search();
+        $resultSet = $searcher->getResultSet($search->search_results);
+
+        $resultSet->sliceResultsToPage($page, $perPage, false);
+
+        if (!$resultSet->countResults()) {
+            return $this->error(\XF::phrase('no_results_found'), 400);
+        }
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Search $searchPlugin */
+        $searchPlugin = $this->plugin('Xfrocks\Api:Search');
+
+        $data = [
+            'data_total' => $search->result_count,
+            'data' => $searchPlugin->prepareSearchResults($resultSet->getResults())
+        ];
+
+        PageNav::addLinksToData($data, $params, $data['data_total'], 'search/results', $search);
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Reroute
+     * @throws \XF\PrintableException
+     */
+    public function actionPostThreads()
+    {
+        if (!\XF::visitor()->canSearch($error)) {
+            return $this->noPermission($error);
+        }
+
+        $params = $this
+            ->params()
+            ->define('q', 'str', 'query to search for')
+            ->define('forum_id', 'uint', 'forum id to filter')
+            ->define('user_id', 'uint', 'creator user id to filter');
+
+        if ($params['q'] === '' && $params['user_id'] === 0) {
+            return $this->error(\XF::phrase('bdapi_slash_search_requires_q'), 400);
+        }
+
+        $search = $this->searchRepo()->search($params, 'thread');
+        if ($search === null) {
+            return $this->error(\XF::phrase('no_results_found'), 400);
+        }
+
+        return $this->rerouteController(__CLASS__, 'getResults', ['search_id' => $search->search_id]);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Reroute
+     * @throws \XF\PrintableException
+     */
+    public function actionPostPosts()
+    {
+        if (!\XF::visitor()->canSearch($error)) {
+            return $this->noPermission($error);
+        }
+
+        $params = $this
+            ->params()
+            ->define('q', 'str', 'query to search for')
+            ->define('forum_id', 'uint', 'id of the container forum to search for contents')
+            ->define('thread_id', 'uint', 'id of the container thread to search for posts')
+            ->define('user_id', 'uint', 'id of the creator to search for contents');
+
+        if ($params['q'] === '' && $params['user_id'] === 0) {
+            return $this->error(\XF::phrase('bdapi_slash_search_requires_q'), 400);
+        }
+
+        $search = $this->searchRepo()->search($params, 'post');
+        if ($search === null) {
+            // no results.
+            return $this->error(\XF::phrase('no_results_found'), 400);
+        }
+
+        return $this->rerouteController(__CLASS__, 'getResults', ['search_id' => $search->search_id]);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message|\XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionUserTimeline(ParameterBag $params)
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $this->assertRecordExists('XF:User', $params->user_id, [], 'requested_user_not_found');
+
+        $searcher = $this->app->search();
+        $query = $searcher->getQuery();
+        $query->byUserId($user->user_id)
+            ->orderedBy('date');
+
+        /** @var \XF\Repository\Search $searchRepo */
+        $searchRepo = $this->repository('XF:Search');
+        $search = $searchRepo->runSearch($query, [
+            'users' => $user->username
+        ], false);
+
+        if (!$search) {
+            return $this->message(\XF::phrase('no_results_found'));
+        }
+
+        return $this->rerouteController(__CLASS__, 'get-results', [
+            'search_id' => $search->search_id
+        ]);
+    }
+
+    /**
+     * @param int $searchId
+     * @param array $extraWith
+     * @return \XF\Entity\Search
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableSearch($searchId, array $extraWith = [])
+    {
+        /** @var \XF\Entity\Search $search */
+        $search = $this->assertRecordExists('XF:Search', $searchId, $extraWith, 'no_results_found');
+
+        if ($search->user_id !== \XF::visitor()->user_id) {
+            throw $this->exception($this->notFound(\XF::phrase('no_results_found')));
+        }
+
+        return $search;
+    }
+
+    /**
+     * @return \Xfrocks\Api\Repository\Search
+     */
+    protected function searchRepo()
+    {
+        /** @var \Xfrocks\Api\Repository\Search $searchRepo */
+        $searchRepo = $this->repository('Xfrocks\Api:Search');
+
+        return $searchRepo;
+    }
+}
diff --git a/Controller/Subscription.php b/Controller/Subscription.php
new file mode 100644
index 00000000..1d393e0c
--- /dev/null
+++ b/Controller/Subscription.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+class Subscription extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\PrintableException
+     */
+    public function actionPostIndex()
+    {
+        $params = $this->params()
+            ->define('hub_callback', 'str')
+            ->define('hub_mode', 'str')
+            ->define('hub_topic', 'str')
+            ->define('hub_lease_seconds', 'str')
+            ->define('client_id', 'str');
+
+        $session = $this->session();
+        $token = $session->getToken();
+
+        $clientId = '';
+        if ($token !== null) {
+            $clientId = $token->client_id;
+        }
+
+        $isSessionClientId = true;
+        if ($clientId === '') {
+            $clientId = $params['client_id'];
+            $isSessionClientId = false;
+        }
+
+        if ($clientId === '') {
+            return $this->noPermission();
+        }
+
+        $validator = $this->app->validator('XF:Url');
+        if (!$validator->isValid($params['hub_callback'])) {
+            return $this->responseError(\XF::phrase('bdapi_subscription_callback_is_required'));
+        }
+
+        if (!in_array($params['hub_mode'], [
+            'subscribe',
+            'unsubscribe'
+        ], true)) {
+            return $this->responseError(\XF::phrase('bdapi_subscription_mode_must_valid'));
+        }
+
+        /** @var \Xfrocks\Api\Entity\Subscription[]|null $existingSubscriptions */
+        $existingSubscriptions = null;
+        $hubTopic = $params['hub_topic'];
+
+        if (!$this->subscriptionRepo()->isValidTopic($hubTopic)) {
+            return $this->responseError(\XF::phrase('bdapi_subscription_topic_not_recognized'));
+        }
+
+        if ($params['hub_mode'] === 'subscribe') {
+            if (!$isSessionClientId) {
+                return $this->noPermission();
+            }
+        } else {
+            $existingSubscriptions = $this->finder('Xfrocks\Api:Subscription')
+                ->where('client_id', $clientId)
+                ->where('topic', $hubTopic)
+                ->fetch();
+
+            if ($existingSubscriptions->count() > 0) {
+                foreach ($existingSubscriptions->keys() as $key) {
+                    if ($existingSubscriptions[$key]['callback'] != $params['hub_callback']) {
+                        unset($existingSubscriptions[$key]);
+                    }
+                }
+            }
+        }
+
+        $verified = $this->subscriptionRepo()->verifyIntentOfSubscriber(
+            $params['hub_callback'],
+            $params['hub_mode'],
+            $hubTopic,
+            $params['hub_lease_seconds'],
+            ['client_id' => $clientId]
+        );
+
+        if ($verified) {
+            switch ($params['hub_mode']) {
+                case 'unsubscribe':
+                    foreach ($existingSubscriptions as $subscription) {
+                        try {
+                            $subscription->delete();
+                        } catch (\Exception $e) {
+                            // ignore
+                        }
+                    }
+
+                    $this->subscriptionRepo()->updateCallbacksForTopic($hubTopic);
+                    break;
+                default:
+                    $subscriptions = $this->finder('Xfrocks\Api:Subscription')
+                        ->where('client_id', $clientId)
+                        ->where('topic', $hubTopic)
+                        ->fetch();
+
+                    /** @var \Xfrocks\Api\Entity\Subscription $subscription */
+                    foreach ($subscriptions as $subscription) {
+                        if ($subscription->callback === $params['hub_callback']) {
+                            try {
+                                $subscription->delete();
+                            } catch (\Exception $e) {
+                                // ignore
+                            }
+                        }
+                    }
+
+                    /** @var \Xfrocks\Api\Entity\Subscription $subscriptionEntity */
+                    $subscriptionEntity = $this->em()->create('Xfrocks\Api:Subscription');
+                    $subscriptionEntity->client_id = $clientId;
+                    $subscriptionEntity->callback = $params['hub_callback'];
+                    $subscriptionEntity->topic = $hubTopic;
+
+                    if ($params['hub_lease_seconds'] > 0) {
+                        $subscriptionEntity->expire_date = \XF::$time + $params['hub_lease_seconds'];
+                    }
+
+                    $subscriptionEntity->save();
+            }
+
+            $this->setResponseType('raw');
+            return $this->view('Xfrocks\Api:Subscription\Post', 'DEFAULT', [
+                'httpResponseCode' => 202
+            ]);
+        }
+
+        return $this->responseError(\XF::phrase('bdapi_subscription_cannot_verify_intent_of_subscriber'));
+    }
+
+    /**
+     * @param mixed $error
+     * @return \XF\Mvc\Reply\View
+     */
+    protected function responseError($error)
+    {
+        $this->setResponseType('raw');
+
+        return $this->view('Xfrocks\Api:Subscription\Post', 'DEFAULT', [
+            'httpResponseCode' => 400,
+            'message' => $error
+        ]);
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+
+    /**
+     * @return \Xfrocks\Api\Repository\Subscription
+     */
+    protected function subscriptionRepo()
+    {
+        /** @var \Xfrocks\Api\Repository\Subscription $repo */
+        $repo = $this->repository('Xfrocks\Api:Subscription');
+
+        return $repo;
+    }
+}
diff --git a/Controller/Tag.php b/Controller/Tag.php
new file mode 100644
index 00000000..1adaae71
--- /dev/null
+++ b/Controller/Tag.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Util\PageNav;
+
+class Tag extends AbstractController
+{
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->tag_id > 0) {
+            return $this->actionSingle($params->tag_id);
+        }
+
+        $tagCloud = $this->options()->tagCloud;
+        $tags = [];
+        if ((bool)$tagCloud['enabled']) {
+            $results = $this->tagRepo()->getTagsForCloud($tagCloud['count'], $this->options()->tagCloudMinUses);
+            foreach ($results as $result) {
+                $tags[] = $this->transformEntityLazily($result);
+            }
+        }
+
+        $data = [
+            'tags' => $tags
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $tagId
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\PrintableException
+     */
+    public function actionSingle($tagId)
+    {
+        $params = $this->params()
+            ->definePageNav();
+
+        /** @var \XF\Entity\Tag|null $tag */
+        $tag = $this->em()->find('XF:Tag', $tagId);
+        if ($tag === null) {
+            return $this->error(\XF::phrase('requested_tag_not_found'), 404);
+        }
+
+        list($perPage, $page) = $params->filterLimitAndPage();
+
+        $cache = $this->tagRepo()->getTagResultCache($tag->tag_id, 0);
+        if ($cache->result_cache_id > 0) {
+            $contentTags = $cache->results;
+        } else {
+            $contentTags = $this->tagRepo()->getTagSearchResults($tag->tag_id, $this->options()->maximumSearchResults);
+
+            $insertCache = count($contentTags) > $perPage;
+            if ($insertCache) {
+                $cache->results = $contentTags;
+                $cache->save();
+            }
+        }
+
+        $totalResults = count($contentTags);
+        $resultSet = $this->tagRepo()->getTagResultSet($contentTags);
+
+        $resultSet->sliceResultsToPage($page, $perPage, false);
+        if (!$resultSet->countResults()) {
+            return $this->error(\XF::phrase('no_results_found'), 400);
+        }
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Search $searchPlugin */
+        $searchPlugin = $this->plugin('Xfrocks\Api:Search');
+        $contentData = $searchPlugin->prepareSearchResults($resultSet->getResults());
+
+        $data = [
+            'tag' => $this->transformEntityLazily($tag),
+            'tagged' => array_values($contentData),
+            'tagged_total' => $totalResults
+        ];
+
+        PageNav::addLinksToData($data, $params, $totalResults, 'tags', $tag);
+
+        return $this->api($data);
+    }
+
+    public function actionGetFind()
+    {
+        $params = $this->params()
+            ->define('q', 'str');
+        $this->assertApiScope(Server::SCOPE_POST);
+
+        $q = $this->tagRepo()->normalizeTag($params['q']);
+
+        $ids = [];
+        $tags = [];
+        if (strlen($q) >= 2) {
+            $results = $this->tagRepo()->getTagAutoCompleteResults($q);
+            foreach ($results as $result) {
+                $tagTransformed = $this->transformEntityLazily($result)->transform();
+                if (is_array($tagTransformed)) {
+                    $ids[] = $tagTransformed['tag_id'];
+                    $tags[] = $tagTransformed;
+                }
+            }
+        }
+
+        $data = [
+            'ids' => [],
+            'tags' => []
+        ];
+        return $this->api($data);
+    }
+
+    public function actionGetList()
+    {
+        $params = $this->params()
+            ->definePageNav();
+        $this->assertValidToken();
+
+        /** @var \XF\Entity\Tag|null $latestTag */
+        $latestTag = $this->finder('XF:Tag')
+            ->order('tag_id', 'desc')
+            ->fetchOne();
+        $total = ($latestTag !== null) ? $latestTag->tag_id : 0;
+
+        list($perPage, $page) = $params->filterLimitAndPage();
+
+        $tagIdEnd = $page * $perPage;
+        $tagIdStart = $tagIdEnd - $perPage + 1;
+
+        $tags = $this->finder('XF:Tag')
+            ->where('tag_id', 'BETWEEN', [$tagIdStart, $tagIdEnd]);
+
+        $data = [
+            'tags' => $this->transformFinderLazily($tags),
+            'tags_total' => $total
+        ];
+
+        PageNav::addLinksToData($data, $params, $total, 'tags/list');
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Repository\Tag
+     */
+    protected function tagRepo()
+    {
+        /** @var \XF\Repository\Tag $tagRepo */
+        $tagRepo = $this->repository('XF:Tag');
+
+        return $tagRepo;
+    }
+}
diff --git a/Controller/Thread.php b/Controller/Thread.php
new file mode 100644
index 00000000..e8724b39
--- /dev/null
+++ b/Controller/Thread.php
@@ -0,0 +1,705 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use XF\Entity\Forum;
+use XF\Entity\Poll;
+use XF\Entity\PollResponse;
+use XF\Mvc\Entity\Finder;
+use XF\Mvc\ParameterBag;
+use XF\Repository\Node;
+use XF\Repository\ThreadWatch;
+use XF\Service\Thread\Creator;
+use XF\Service\Thread\Deleter;
+use Xfrocks\Api\Data\Params;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Transformer;
+use Xfrocks\Api\Util\PageNav;
+use Xfrocks\Api\XF\Transform\Thread as TransformThread;
+
+class Thread extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->thread_id) {
+            return $this->actionSingle($params->thread_id);
+        }
+
+        $params = $this->params()
+            ->define('forum_id', 'uint', 'forum id to filter')
+            ->define('creator_user_id', 'uint', 'creator user id to filter')
+            ->define('sticky', 'bool', 'sticky to filter')
+            ->define('thread_prefix_id', 'uint', 'thread prefix id to filter')
+//            ->define('thread_tag_id', 'uint', 'thread tag id to filter')
+            ->defineOrder([
+                'thread_create_date' => ['post_date', 'asc'],
+                'thread_create_date_reverse' => ['post_date', 'desc'],
+                'thread_update_date' => ['last_post_date', 'asc', '_whereOp' => '>'],
+                'thread_update_date_reverse' => ['last_post_date', 'desc', '_whereOp' => '<'],
+                'thread_view_count' => ['view_count', 'asc'],
+                'thread_view_count_reverse' => ['view_count', 'asc'],
+            ])
+            ->definePageNav()
+            ->define(TransformThread::KEY_UPDATE_DATE, 'uint', 'timestamp to filter')
+            ->define('thread_ids', 'str', 'thread ids to fetch (ignoring all filters, separated by comma)');
+
+        if ($params['thread_ids'] !== '') {
+            $threadIds = $params->filterCommaSeparatedIds('thread_ids');
+
+            return $this->actionMultiple($threadIds);
+        }
+
+        if ($params['forum_id'] < 1) {
+            $this->assertValidToken();
+        }
+
+        /** @var \XF\Finder\Thread $finder */
+        $finder = $this->finder('XF:Thread');
+        $this->applyFilters($finder, $params);
+
+        $orderChoice = $params->sortFinder($finder);
+        if (is_array($orderChoice)) {
+            switch ($orderChoice[0]) {
+                case 'last_post_date':
+                    $keyUpdateDate = TransformThread::KEY_UPDATE_DATE;
+                    if ($params[$keyUpdateDate] > 0) {
+                        $finder->where($orderChoice[0], $orderChoice['_whereOp'], $params[$keyUpdateDate]);
+                    }
+                    break;
+            }
+        }
+
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+
+        $threads = [];
+        if ($total > 0) {
+            $threads = $this->transformFinderLazily($finder);
+
+            if (!$this->request()->exists('sticky')) {
+                if ($params['forum_id'] > 0 && $params['page'] === 1) {
+                    // first page without `sticky` param specify
+                    // include stickied threads on top of the results
+                    $sticky = clone $finder;
+                    $sticky->where('sticky', 1);
+
+                    $threads->addCallbackFinderPostFetch(function ($normals) use ($params, $sticky) {
+                        // call handler to prepare finder
+                        /** @var Transformer $transformer */
+                        $transformer =\XF::app()->container('api.transformer');
+                        $handler = $transformer->handler('XF:Thread');
+                        $handler->onTransformFinder($params->getTransformContext(), $sticky);
+
+                        $threads = $sticky->fetch()->toArray();
+                        foreach ($normals as $thread) {
+                            $threads[] = $thread;
+                        }
+
+                        return $threads;
+                    });
+                }
+
+                $finder->where('sticky', 0);
+            }
+        }
+
+        $data = [
+            'threads' => $threads,
+            'threads_total' => $total
+        ];
+
+        if ($params['forum_id'] > 0) {
+            $forum = $this->assertViewableForum($params['forum_id']);
+            $this->transformEntityIfNeeded($data, 'forum', $forum);
+        }
+
+        PageNav::addLinksToData($data, $params, $total, 'threads');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('forum_id', 'uint', 'id of the target forum')
+            ->define('thread_title', 'str', 'title of the new thread')
+            ->define('post_body', 'str', 'content of the new thread')
+            ->define('thread_prefix_id', 'uint', 'id of a prefix for the new thread')
+            ->define('thread_tags', 'str', 'thread tags for the new thread')
+            ->define('fields', 'array', 'thread fields for the new thread')
+            ->defineAttachmentHash();
+
+        $forum = $this->assertViewableForum($params['forum_id']);
+        if (!$forum->canCreateThread($error)) {
+            return $this->error($error);
+        }
+
+        /** @var Creator $creator */
+        $creator = $this->service('XF:Thread\Creator', $forum);
+        $creator->setContent($params['thread_title'], $params['post_body']);
+
+        if ($params['thread_prefix_id'] > 0) {
+            $creator->setPrefix($params['thread_prefix_id']);
+        }
+
+        if ($params['thread_tags'] !== '') {
+            $creator->setTags($params['thread_tags']);
+        }
+
+        if (count($params['fields']) > 0) {
+            $creator->setCustomFields($params['fields']);
+        }
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $creator->setAttachmentHash($attachmentPlugin->getAttachmentTempHash([
+            'node_id' => $forum->node_id,
+            'forum_id' => $forum->node_id
+        ]));
+
+        $creator->checkForSpam();
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $this->assertNotFlooding('post');
+        $thread = $creator->save();
+
+        /** @var \XF\Repository\Thread $threadRepo */
+        $threadRepo = $this->repository('XF:Thread');
+        $threadRepo->markThreadReadByVisitor($thread, $thread->post_date);
+
+        return $this->actionSingle($thread->thread_id);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     *
+     * @see Post::actionPutIndex()
+     */
+    public function actionPutIndex(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        return $this->rerouteController('Xfrocks\Api\Controller\Post', 'put-index', [
+            '_attachmentContentData' => ['thread_id' => $thread->thread_id],
+            '_replyCallback' => function ($controller) use ($thread) {
+                /** @var Post $controller */
+                $params = ['thread_id' => $thread->thread_id];
+                return $controller->rerouteController('Xfrocks\Api\Controller\Thread', 'get-index', $params);
+            },
+            'post_id' => $thread->first_post_id
+        ]);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteIndex(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        $params = $this
+            ->params()
+            ->define('reason', 'str', 'reason of the thread removal');
+
+        if (!$thread->canDelete('soft', $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Deleter $deleter */
+        $deleter = $this->service('XF:Thread\Deleter', $thread);
+        $deleter->delete('soft', $params['reason']);
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostAttachments()
+    {
+        $params = $this
+            ->params()
+            ->define('forum_id', 'uint', 'id of the container forum of the target thread')
+            ->defineAttachmentHash()
+            ->defineFile('file', 'binary data of the attachment');
+
+        $forum = $this->assertViewableForum($params['forum_id']);
+
+        $context = [
+            'node_id' => $forum->node_id,
+            'forum_id' => $forum->node_id
+        ];
+
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Attachment $attachmentPlugin */
+        $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
+        $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
+
+        return $attachmentPlugin->doUpload($tempHash, 'post', $context);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowers(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        $users = [];
+        if ($thread->canWatch()) {
+            $visitor = \XF::visitor();
+            /** @var \XF\Entity\ThreadWatch|null $watch */
+            $watch = $thread->Watch[$visitor->user_id];
+            if ($watch !== null) {
+                $users[] = [
+                    'user_id' => $visitor->user_id,
+                    'username' => $visitor->username,
+                    'follow' => [
+                        'alert' => true,
+                        'email' => $watch->email_subscribe
+                    ]
+                ];
+            }
+        }
+
+        $data = [
+            'users' => $users
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostFollowers(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        $params = $this
+            ->params()
+            ->define('email', 'bool', 'whether to receive notification as email');
+
+        if (!$thread->canWatch($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var ThreadWatch $threadWatchRepo */
+        $threadWatchRepo = $this->repository('XF:ThreadWatch');
+        $threadWatchRepo->setWatchState(
+            $thread,
+            \XF::visitor(),
+            $params['email'] === true ? 'watch_email' : 'watch_no_email'
+        );
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteFollowers(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        /** @var ThreadWatch $threadWatchRepo */
+        $threadWatchRepo = $this->repository('XF:ThreadWatch');
+        $threadWatchRepo->setWatchState($thread, \XF::visitor(), '');
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowed()
+    {
+        $params = $this
+            ->params()
+            ->define('total', 'uint')
+            ->definePageNav();
+
+        $this->assertRegistrationRequired();
+
+        /** @var \XF\Repository\Thread $threadRepo */
+        $threadRepo = $this->repository('XF:Thread');
+        $threadFinder = $threadRepo->findThreadsForWatchedList();
+
+        if ($params['total'] > 0) {
+            $data = [
+                'threads_total' => $threadFinder->total()
+            ];
+
+            return $this->api($data);
+        }
+
+        $params->limitFinderByPage($threadFinder);
+
+        $context = $this->params()->getTransformContext();
+        $context->onTransformedCallbacks[] = function ($context, &$data) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!($source instanceof \XF\Entity\Thread)) {
+                return;
+            }
+
+            $data['follow'] = [
+                'alert' => true,
+                'email' => $source->Watch[\XF::visitor()->user_id]->email_subscribe
+            ];
+        };
+
+        $total = $threadFinder->total();
+        $threads = $total > 0 ? $this->transformFinderLazily($threadFinder) : [];
+
+        $data = [
+            'threads' => $threads,
+            'threads_total' => $total
+        ];
+
+        PageNav::addLinksToData($data, $params, $total, 'threads/followed');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetNavigation(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+        $forum = $thread->Forum;
+        if ($forum === null) {
+            throw new \RuntimeException('$thread->Forum === null');
+        }
+
+        $breadcrumbs = $forum->getBreadcrumbs(true);
+        $nodeIds = [];
+        foreach ($breadcrumbs as $breadcrumb) {
+            $nodeIds[] = $breadcrumb['node_id'];
+        }
+
+        /** @var \Xfrocks\Api\ControllerPlugin\Navigation $navigationPlugin */
+        $navigationPlugin = $this->plugin('Xfrocks\Api:Navigation');
+        $elements = $navigationPlugin->prepareElementsFromIds($nodeIds);
+
+        return $this->api(['elements' => $elements]);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostPollVotes(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        $params = $this
+            ->params()
+            ->define('response_id', 'uint', 'the id of the response to vote for')
+            ->define('response_ids', 'array-uint', 'an array of ids of responses');
+
+        $poll = $thread->Poll;
+        if ($poll === null) {
+            return $this->noPermission();
+        }
+
+        if (!$poll->canVote($error)) {
+            return $this->noPermission();
+        }
+
+        /** @var \XF\Service\Poll\Voter $voter */
+        $voter = $this->service('XF:Poll\Voter', $poll);
+
+        $responseIds = $params['response_ids'];
+        if ($params['response_id'] > 0) {
+            $responseIds[] = $params['response_id'];
+        }
+
+        $voter->setVotes($responseIds);
+        if (!$voter->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $voter->save();
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetPollResults(ParameterBag $params)
+    {
+        $thread = $this->assertViewableThread($params->thread_id);
+
+        /** @var Poll|null $poll */
+        $poll = $thread->Poll;
+        if ($poll === null) {
+            return $this->noPermission();
+        }
+
+        if (!$poll->canViewResults($error)) {
+            return $this->noPermission($error);
+        }
+
+        $userIds = [];
+        foreach ($poll->Responses as $pollResponse) {
+            $userIds = array_merge($userIds, array_keys($pollResponse->voters));
+        }
+
+        $users = $this->em()->findByIds('XF:User', $userIds);
+
+        $transformContext = $this->params()->getTransformContext();
+        $transformContext->onTransformedCallbacks[] = function ($context, &$data) use ($users) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!($source instanceof PollResponse)) {
+                return;
+            }
+
+            $data['voters'] = [];
+
+            foreach (array_keys($source->voters) as $userId) {
+                if (isset($users[$userId])) {
+                    /** @var \XF\Entity\User $user */
+                    $user = $users[$userId];
+                    $data['voters'][] = [
+                        'user_id' => $user->user_id,
+                        'username' => $user->username
+                    ];
+                }
+            }
+        };
+
+        $finder = $poll->getRelationFinder('Responses');
+        $data = [
+            'results' => $this->transformFinderLazily($finder)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionGetNew()
+    {
+        $this
+            ->params()
+            ->define('forum_id', 'uint')
+            ->definePageNav();
+
+        $this->assertRegistrationRequired();
+
+        /** @var \XF\Repository\Thread $threadRepo */
+        $threadRepo = $this->repository('XF:Thread');
+        $finder = $threadRepo->findThreadsWithUnreadPosts();
+
+        return $this->getNewOrRecentResponse('threads_new', $finder);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionGetRecent()
+    {
+        $this
+            ->params()
+            ->define('forum_id', 'uint')
+            ->definePageNav();
+
+        /** @var \XF\Repository\Thread $threadRepo */
+        $threadRepo = $this->repository('XF:Thread');
+        $finder = $threadRepo->findThreadsWithLatestPosts();
+
+        return $this->getNewOrRecentResponse('threads_recent', $finder);
+    }
+
+    /**
+     * @param array $ids
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionMultiple(array $ids)
+    {
+        $threads = [];
+        if (count($ids) > 0) {
+            $this->params()->getTransformContext()->setData(true, TransformThread::DYNAMIC_KEY_FORUM_DATA_KEY);
+            $threads = $this->findAndTransformLazily('XF:Thread', $ids);
+        }
+
+        return $this->api(['threads' => $threads]);
+    }
+
+    /**
+     * @param int $threadId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionSingle($threadId)
+    {
+        $thread = $this->findAndTransformLazily('XF:Thread', intval($threadId), 'requested_thread_not_found');
+        return $this->api(['thread' => $thread]);
+    }
+
+    /**
+     * @param \XF\Finder\Thread $finder
+     * @param Params $params
+     * @return void
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function applyFilters($finder, Params $params)
+    {
+        if ($params['forum_id'] > 0) {
+            $forum = $this->assertViewableForum($params['forum_id']);
+            $finder->inForum($forum);
+        }
+
+        if ($params['creator_user_id'] > 0) {
+            $finder->where('user_id', $params['creator_user_id']);
+        }
+
+        if ($this->request()->exists('sticky')) {
+            $finder->where('sticky', $params['sticky']);
+        }
+
+        if ($params['thread_prefix_id'] > 0) {
+            $finder->where('prefix_id', $params['thread_prefix_id']);
+        }
+
+        // TODO: Add more filters?
+    }
+
+    /**
+     * @param string $searchType
+     * @param Finder $finder
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    protected function getNewOrRecentResponse($searchType, Finder $finder)
+    {
+        $params = $this->params();
+
+        if ($params['forum_id'] > 0) {
+            $forum = $this->assertViewableForum($params['forum_id']);
+
+            /** @var Node $nodeRepo */
+            $nodeRepo = $this->repository('XF:Node');
+            $node = $forum->Node;
+            if ($node !== null) {
+                $nodeIds = $nodeRepo->findChildren($node, false)->fetch()->keys();
+                $nodeIds[] = $forum->node_id;
+
+                $finder->where('node_id', $nodeIds);
+            }
+        }
+
+        $finder->limit($this->options()->maximumSearchResults);
+        $threads = $finder->fetch();
+
+        $searchResults = [];
+        /** @var \XF\Entity\Thread $thread */
+        foreach ($threads as $thread) {
+            if ($thread->canView() && !$thread->isIgnored()) {
+                $searchResults[] = ['thread', $thread->thread_id];
+            }
+        }
+
+        $totalResults = count($searchResults);
+        if ($totalResults === 0) {
+            return $this->message(\XF::phrase('no_results_found'));
+        }
+
+        /** @var \XF\Entity\Search $search */
+        $search = $this->em()->create('XF:Search');
+
+        $search->search_type = $searchType;
+        $search->search_results = $searchResults;
+        $search->result_count = $totalResults;
+        $search->search_order = 'date';
+        $search->user_id = \XF::visitor()->user_id;
+
+        $search->query_hash = md5(serialize($search->getNewValues()));
+
+        $search->save();
+
+        return $this->rerouteController('Xfrocks\Api\Controller\Search', 'get-results', [
+            'search_id' => $search->search_id
+        ]);
+    }
+
+    /**
+     * @param int $forumId
+     * @param array $extraWith
+     * @return Forum
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableForum($forumId, array $extraWith = [])
+    {
+        $extraWith[] = 'Node.Permissions|' . \XF::visitor()->permission_combination_id;
+
+        /** @var Forum $forum */
+        $forum = $this->assertRecordExists('XF:Forum', $forumId, $extraWith, 'requested_forum_not_found');
+
+        if (!$forum->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $forum;
+    }
+
+    /**
+     * @param int $threadId
+     * @param array $extraWith
+     * @return \XF\Entity\Thread
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableThread($threadId, array $extraWith = [])
+    {
+        $extraWith[] = 'Forum.Node.Permissions|' . \XF::visitor()->permission_combination_id;
+
+        /** @var \XF\Entity\Thread $thread */
+        $thread = $this->assertRecordExists('XF:Thread', $threadId, $extraWith, 'requested_thread_not_found');
+
+        if (!$thread->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $thread;
+    }
+}
diff --git a/Controller/Tool.php b/Controller/Tool.php
new file mode 100644
index 00000000..b43992cf
--- /dev/null
+++ b/Controller/Tool.php
@@ -0,0 +1,222 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use Xfrocks\Api\ControllerPlugin\Login;
+use Xfrocks\Api\ControllerPlugin\ParseLink;
+use Xfrocks\Api\Util\Crypt;
+use Xfrocks\Api\Util\OneTimeToken;
+
+class Tool extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply|\XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function actionGetChr()
+    {
+        $params = $this->params()
+            ->define('html', 'str')
+            ->define('required_externals', 'str')
+            ->define('timestamp', 'int');
+        $link = $this->buildLink('misc/api-chr', null, [
+            'html' => $params['html'],
+            'required_externals' => $params['required_externals'],
+            'timestamp' => $params['timestamp'],
+        ]);
+
+        if (\XF::visitor()->user_id > 0) {
+            /** @var Login $loginPlugin */
+            $loginPlugin = $this->plugin('Xfrocks\Api:Login');
+            return $loginPlugin->initiate('misc/api-login', $link);
+        }
+
+        return $this->redirect($link, '', 'permanent');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply|\XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function actionGetLogin()
+    {
+        /** @var Login $loginPlugin */
+        $loginPlugin = $this->plugin('Xfrocks\Api:Login');
+        return $loginPlugin->initiate('misc/api-login');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply|\XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function actionGetLogout()
+    {
+        /** @var Login $loginPlugin */
+        $loginPlugin = $this->plugin('Xfrocks\Api:Login');
+        return $loginPlugin->initiate('account/api-logout');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     */
+    public function actionGetWebsubEchoHubChallenge()
+    {
+        if (!\XF::$debugMode) {
+            return $this->noPermission();
+        }
+
+        $params = $this->params()
+            ->define('hub_challenge', 'str');
+
+        die($params['hub_challenge']);
+    }
+
+    /**
+     * @return void
+     */
+    public function actionGetWebsubEchoNone()
+    {
+        exit(0);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\PrintableException
+     */
+    public function actionPostCrypt()
+    {
+        $params = $this->params()
+            ->define('algo', 'str', 'Encryption algorithm', Crypt::ALGO_AES_128)
+            ->define('data', 'str', 'Data string to be encrypted', 'data')
+            ->define('data_encrypted', 'str', 'Data string to be decrypted')
+            ->define('key', 'str', 'Key to encrypt/decrypt', 'key');
+
+        $data = [
+            'algo' => $params['algo'],
+            'key' => $params['key'],
+            'results' => [
+                'encrypt' => [
+                    'input' => $params['data'],
+                    'output' => Crypt::encrypt($params['data'], $params['algo'], $params['key'])
+                ],
+            ],
+        ];
+
+        $dataEncrypted = $params['data_encrypted'];
+        if (strlen($dataEncrypted) > 0) {
+            $data['results']['decrypt'] = [
+                'input' => $dataEncrypted,
+                'output' => Crypt::decrypt($dataEncrypted, $params['algo'], $params['key'])
+            ];
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionPostLink()
+    {
+        $params = $this->params()
+            ->define('type', 'str', 'Link type (admin, api, or public)', 'public')
+            ->define('route', 'str', 'Link route', 'index');
+
+        switch ($params['type']) {
+            case 'admin':
+            case 'public':
+                $link = $this->app->router($params['type'])->buildLink($params['route']);
+                break;
+            case 'api':
+            default:
+                $link = $this->buildApiLink($params['route']);
+                break;
+        }
+
+        return $this->api(['link' => $link]);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionPostOtt()
+    {
+        $params = $this->params()
+            ->define('ttl', 'uint', 'Time to live in seconds');
+
+        if (!\XF::$debugMode) {
+            return $this->noPermission();
+        }
+
+        $session = $this->session();
+        $token = $session->getToken();
+        if ($token === null) {
+            return $this->noPermission();
+        }
+
+        $client = $token->Client;
+        if ($client === null) {
+            return $this->noPermission();
+        }
+
+        return $this->api(['ott' => OneTimeToken::generate($params['ttl'], $client)]);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\PrintableException
+     */
+    public function actionPostPasswordTest()
+    {
+        $params = $this->params()
+            ->define('password', 'str')
+            ->define('password_algo', 'str')
+            ->define('decrypt', 'bool');
+
+        if (!\XF::$debugMode) {
+            return $this->noPermission();
+        }
+
+        if ($params['decrypt'] === false) {
+            $result = Crypt::encrypt($params['password'], $params['password_algo']);
+        } else {
+            $result = Crypt::decrypt($params['password'], $params['password_algo']);
+        }
+
+        return $this->api(['result' => $result]);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \Exception
+     */
+    public function actionGetParseLink()
+    {
+        $params = $this->params()
+            ->define('link', 'str');
+
+        /** @var ParseLink $plugin */
+        $plugin = $this->plugin('Xfrocks\Api:ParseLink');
+        return $plugin->parse($params['link']);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     */
+    public function actionPostWebsubEchoHubChallenge()
+    {
+        if (!\XF::$debugMode) {
+            return $this->noPermission();
+        }
+
+        $inputRaw = $this->request->getInputRaw();
+        \XF\Util\File::log(__METHOD__, $inputRaw);
+
+        exit(0);
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        return null;
+    }
+}
diff --git a/Controller/User.php b/Controller/User.php
new file mode 100644
index 00000000..a3d6e54d
--- /dev/null
+++ b/Controller/User.php
@@ -0,0 +1,1056 @@
+<?php
+
+namespace Xfrocks\Api\Controller;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use XF\Entity\ConnectedAccountProvider;
+use XF\Entity\UserAuth;
+use XF\Entity\UserFollow;
+use XF\Entity\UserGroup;
+use XF\Mvc\Entity\Finder;
+use XF\Mvc\ParameterBag;
+use XF\Repository\ConnectedAccount;
+use XF\Service\User\Avatar;
+use XF\Service\User\Follow;
+use XF\Service\User\Ignore;
+use XF\Util\Php;
+use XF\Validator\Email;
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Transformer;
+use Xfrocks\Api\Util\Crypt;
+use Xfrocks\Api\Util\PageNav;
+
+class User extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->user_id) {
+            return $this->actionSingle($params->user_id);
+        }
+
+        $params = $this
+            ->params()
+            ->definePageNav();
+
+        /** @var \XF\Finder\User $finder */
+        $finder = $this->finder('XF:User');
+
+        $finder->isValidUser();
+        $finder->order('user_id');
+
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+        $users = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'users' => $users,
+            'users_total' => $total
+        ];
+
+        PageNav::addLinksToData($data, $params, $total, 'users');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostIndex()
+    {
+        $params = $this
+            ->params()
+            ->define('user_email', 'str', 'email of the new user')
+            ->define('email', 'str', 'email of the new user (deprecated)')
+            ->define('username', 'str', 'username of the new user')
+            ->define('password', 'str', 'password of the new user')
+            ->define('password_algo', 'str', 'algorithm used to encrypt the password parameter')
+            ->define('user_dob_day', 'uint', 'date of birth (day) of the new user')
+            ->define('user_dob_month', 'uint', 'date of birth (month) of the new user')
+            ->define('user_dob_year', 'uint', 'date of birth (year) of the new user')
+            ->define('fields', 'array', 'user field values')
+            ->define('client_id', 'str', 'client ID of the Client')
+            ->define('extra_data', 'str')
+            ->define('extra_timestamp', 'uint');
+
+        if (!$this->options()->registrationSetup['enabled']) {
+            throw $this->exception(
+                $this->error(\XF::phrase('new_registrations_currently_not_being_accepted'))
+            );
+        }
+
+        // prevent discouraged IP addresses from registering
+        if ($this->options()->preventDiscouragedRegistration && $this->isDiscouraged()) {
+            throw $this->exception(
+                $this->error(\XF::phrase('new_registrations_currently_not_being_accepted'))
+            );
+        }
+
+        $session = $this->session();
+        $token = $this->session()->getToken();
+        $client = $token !== null ? $token->Client : null;
+
+        if ($client === null) {
+            /** @var Client $client */
+            $client = $this->assertRecordExists(
+                'Xfrocks\Api:Client',
+                $params['client_id'],
+                [],
+                'bdapi_requested_client_not_found'
+            );
+
+            $clientSecret = $client->client_secret;
+        } else {
+            $clientSecret = $client->client_secret;
+        }
+
+        $extraData = [];
+        if ($params['extra_data'] !== '') {
+            $extraDataDecrypted = Crypt::decryptTypeOne($params['extra_data'], $params['extra_timestamp']);
+            $extraData = Php::safeUnserialize($extraDataDecrypted);
+            if (!is_array($extraData)) {
+                $extraData = [];
+            }
+        }
+
+        /** @var \XF\Service\User\Registration $registration */
+        $registration = $this->service('XF:User\Registration');
+
+        $email = $params['user_email'];
+        if (strlen($email) === 0) {
+            $email = $params['email'];
+        }
+
+        $input = [
+            'email' => $email,
+            'username' => $params['username'],
+            'dob_day' => $params['user_dob_day'],
+            'dob_month' => $params['user_dob_month'],
+            'dob_year' => $params['user_dob_year'],
+            'custom_fields' => $params['fields']
+        ];
+
+        if ($params['password_algo'] !== '') {
+            $input['password'] = Crypt::decrypt($params['password'], $params['password_algo'], $clientSecret);
+        } elseif ($params['password'] !== '') {
+            $input['password'] = $params['password'];
+        } else {
+            $registration->setNoPassword();
+        }
+
+        $skipEmailConfirmation = false;
+        if (isset($extraData['user_email']) && $extraData['user_email'] == $input['email']) {
+            $skipEmailConfirmation = true;
+        }
+
+        $registration->skipEmailConfirmation($skipEmailConfirmation);
+
+        $registration->setFromInput($input);
+        $registration->checkForSpam();
+
+        if (!$registration->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $visitor = \XF::visitor();
+        if ($visitor->hasAdminPermission('user')) {
+            $registration->getUser()->set('user_state', 'valid', [
+                'forceSet' => true
+            ]);
+        }
+
+        /** @var \XF\Entity\User $user */
+        $user = $registration->save();
+
+        if ($visitor->user_id == 0) {
+            $session->changeUser($user);
+            \XF::setVisitor($user);
+        }
+
+        if (isset($extraData['external_provider'])
+            && isset($extraData['external_provider_key'])
+            && isset($extraData['access_token'])
+        ) {
+            /** @var ConnectedAccountProvider|null $provider */
+            $provider = $this->em()->find('XF:ConnectedAccountProvider', $extraData['external_provider']);
+            $handler = $provider !== null ? $provider->getHandler() : null;
+            if ($handler !== null && $provider !== null) {
+                $tokenObj = new StdOAuth2Token();
+                $tokenObj->setAccessToken($extraData['access_token']);
+
+                $storageState = $handler->getStorageState($provider, $user);
+                $storageState->storeToken($tokenObj);
+
+                $providerData = $handler->getProviderData($storageState);
+
+                /** @var ConnectedAccount $connectedAccountRepo */
+                $connectedAccountRepo = $this->repository('XF:ConnectedAccount');
+                $connectedAccountRepo->associateConnectedAccountWithUser($user, $providerData);
+            }
+        }
+
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+        $scopes = $apiServer->getScopeDefaults();
+        $accessToken = $apiServer->newAccessToken($user->user_id, $client, $scopes);
+        $refreshToken = $apiServer->newRefreshToken($user->user_id, $client, $scopes);
+
+        $data = [
+            'user' => $this->transformEntityLazily($user),
+            'token' => \Xfrocks\Api\Util\Token::transformLibAccessTokenEntity($accessToken, $refreshToken),
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPutIndex(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        $params = $this
+            ->params()
+            ->define('password', 'str', 'data of the new password')
+            ->define('password_old', 'str', 'data of the existing password')
+            ->define('password_algo', 'str', 'algorithm used to encrypt the password and password_old parameters')
+            ->define('user_email', 'str', 'new email of the user')
+            ->define('username', 'str', 'new username of the user')
+            ->define('user_title', 'str', 'new custom title of the user')
+            ->define('primary_group_id', 'uint', 'id of new primary group')
+            ->define('secondary_group_ids', 'array-uint', 'array of ids of new secondary groups')
+            ->define('user_dob_day', 'uint', 'new date of birth (day) of the user')
+            ->define('user_dob_month', 'uint', 'new date of birth (month) of the user')
+            ->define('user_dob_year', 'uint', 'new date of birth (year) of the user')
+            ->define('fields', 'array', 'array of values for user fields');
+
+        $visitor = \XF::visitor();
+        $isAdmin = $visitor->hasAdminPermission('user');
+        $requiredAuth = 0;
+
+        if ($params['password'] !== '') {
+            $requiredAuth++;
+        }
+        if ($params['user_email'] !== '') {
+            $requiredAuth++;
+        }
+
+        if ($requiredAuth > 0) {
+            $isAuth = false;
+            if ($isAdmin && $visitor->user_id !== $user->user_id) {
+                $isAuth = true;
+            } elseif ($params['password_old'] !== '') {
+                $userAuth = $user->Auth;
+                if ($userAuth !== null) {
+                    $passwordOld = $params['password_algo'] === '' ?
+                        $params['password_old'] :
+                        Crypt::decrypt($params['password_old'], $params['password_algo']);
+                    $authHandler = $userAuth->getAuthenticationHandler();
+                    if ($authHandler !== null
+                        && $authHandler->hasPassword()
+                        && $userAuth->authenticate($passwordOld)
+                    ) {
+                        $isAuth = true;
+                    }
+                }
+            }
+
+            if (!$isAuth) {
+                return $this->error(\XF::phrase('bdapi_slash_users_requires_password_old'), 403);
+            }
+        }
+
+        if ($isAdmin) {
+            $user->setOption('admin_edit', true);
+        }
+
+        if ($params['password'] !== '') {
+            /** @var UserAuth $userAuth */
+            $userAuth = $user->getRelationOrDefault('Auth');
+
+            if ($params['password_algo'] !== '') {
+                $userAuth->setPassword(Crypt::decrypt($params['password'], $params['password_algo']));
+            } else {
+                $userAuth->setPassword($params['password']);
+            }
+
+            $user->addCascadedSave($userAuth);
+        }
+
+        if ($params['user_email'] !== '') {
+            $user->email = $params['user_email'];
+            $options = $this->options();
+
+            if ($user->isChanged('email')
+                && $options->registrationSetup['emailConfirmation']
+            ) {
+                switch ($user->user_state) {
+                    case 'moderated':
+                    case 'email_confirm':
+                        $user->user_state = 'email_confirm';
+                        break;
+                    default:
+                        $user->user_state = 'email_confirm_edit';
+                }
+            }
+        }
+
+        if ($params['username'] !== '') {
+            $user->username = $params['username'];
+            if ($user->isChanged('username') && !$isAdmin) {
+                return $this->error(\XF::phrase('bdapi_slash_users_denied_username'), 403);
+            }
+        }
+
+        if ($this->request()->exists('user_title')) {
+            $user->custom_title = $params['user_title'];
+            if ($user->isChanged('custom_title')
+                && !$isAdmin
+            ) {
+                return $this->error(\XF::phrase('bdapi_slash_users_denied_user_title'), 403);
+            }
+        }
+
+        if ($params['primary_group_id'] > 0) {
+            /** @var UserGroup[] $userGroups */
+            $userGroups = $this->finder('XF:UserGroup')->fetch();
+
+            if (!isset($userGroups[$params['primary_group_id']])) {
+                return $this->notFound(\XF::phrase('bdapi_requested_user_group_not_found'));
+            }
+
+            foreach ($params['secondary_group_ids'] as $secondaryGroupId) {
+                if (!isset($userGroups[$secondaryGroupId])) {
+                    return $this->notFound(\XF::phrase('bdapi_requested_user_group_not_found'));
+                }
+            }
+
+            $user->user_group_id = $params['primary_group_id'];
+
+            $secondaryGroupIds = $params['secondary_group_ids'];
+            $secondaryGroupIds = array_map('intval', $secondaryGroupIds);
+            $secondaryGroupIds = array_unique($secondaryGroupIds);
+            sort($secondaryGroupIds, SORT_NUMERIC);
+
+            $zeroKey = array_search(0, $secondaryGroupIds, true);
+            if ($zeroKey !== false) {
+                unset($secondaryGroupIds[$zeroKey]);
+            }
+
+            $user->secondary_group_ids = $secondaryGroupIds;
+        }
+
+        $userProfile = $user->Profile;
+        if ($userProfile === null) {
+            throw new \RuntimeException('$user->Profile === null');
+        }
+        $user->addCascadedSave($userProfile);
+
+        if ($params['user_dob_day'] > 0 && $params['user_dob_month'] > 0 && $params['user_dob_year'] > 0) {
+            $userProfile->setDob($params['user_dob_day'], $params['user_dob_month'], $params['user_dob_year']);
+
+            $hasExistingDob = false;
+            if (!!$userProfile->getExistingValue('dob_day')
+                || !!$userProfile->getExistingValue('dob_month')
+                || !!$userProfile->getExistingValue('dob_year')) {
+                $hasExistingDob = true;
+            }
+
+            if ($hasExistingDob
+                && (
+                    $userProfile->isChanged('dob_day')
+                    || $userProfile->isChanged('dob_month')
+                    || $userProfile->isChanged('dob_year')
+                )
+                && !$isAdmin
+            ) {
+                return $this->error(\XF::phrase('bdapi_slash_users_denied_dob'), 403);
+            }
+        }
+
+        if (count($params['fields']) > 0) {
+            $inputFilter = $this->app()->inputFilterer();
+            $fields = $params['fields'];
+
+            $profileFields = $inputFilter->filterArray($fields, [
+                'about' => 'str',
+                'homepage' => 'str',
+                'location' => 'str'
+            ]);
+            $fields = array_diff($fields, $profileFields);
+
+            $userProfile->bulkSet([
+                'about' => $profileFields['about'],
+                'website' => $profileFields['homepage'],
+                'location' => $profileFields['location']
+            ]);
+            $userProfile->custom_fields->bulkSet($fields);
+        }
+
+        $user->preSave();
+
+        if (!$isAdmin) {
+            if ($user->isChanged('user_group_id')
+                || $user->isChanged('secondary_group_ids')
+            ) {
+                return $this->error(\XF::phrase('bdapi_slash_users_denied_user_group'), 403);
+            }
+        }
+
+        $shouldSendEmailConfirmation = false;
+        if ($user->isChanged('email')
+            && in_array($user->user_state, ['email_confirm', 'email_confirm_edit'], true)
+        ) {
+            $shouldSendEmailConfirmation = true;
+        }
+
+        if ($user->hasErrors()) {
+            return $this->error($user->getErrors());
+        }
+
+        $user->save();
+
+        if ($shouldSendEmailConfirmation) {
+            /** @var \XF\Service\User\EmailConfirmation $emailConfirmation */
+            $emailConfirmation = $this->service('XF:User\EmailConfirmation', $user);
+            $emailConfirmation->triggerConfirmation();
+        }
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPostPassword(ParameterBag $params)
+    {
+        $this->params()->markAsDeprecated();
+        return $this->actionPutIndex($params);
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetDefaultAvatar(ParameterBag $paramBag)
+    {
+        $avatarSizeMap = $this->app->container('avatarSizeMap');
+        $sizes = implode(', ', array_keys($avatarSizeMap));
+
+        $params = $this->params()
+            ->define('size', 'str', "Avatar size ({$sizes})", 'l');
+
+        $user = $this->assertViewableUser($paramBag->user_id);
+
+        if (!isset($avatarSizeMap[$params['size']])) {
+            return $this->noPermission();
+        }
+        $size = $avatarSizeMap[$params['size']];
+
+        $viewParams = [
+            'user' => $user,
+            'size' => $size
+        ];
+
+        $this->setResponseType('raw');
+        return $this->view('Xfrocks\Api\View\User\DefaultAvatar', '', $viewParams);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetFields()
+    {
+        $app = $this->app;
+
+        /** @var \XF\CustomField\DefinitionSet $definitionSet */
+        $definitionSet = $app->container('customFields.users');
+
+        /** @var Transformer $transformer */
+        $transformer = $app->container('api.transformer');
+
+        $context = $this->params()->getTransformContext();
+        $fields = $transformer->transformCustomFieldDefinitionSet($context, $definitionSet, '');
+
+        $data = [
+            'fields' => $fields
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetFind()
+    {
+        $params = $this
+            ->params()
+            ->define('username', 'str', 'username to filter')
+            ->define('user_email', 'str', 'email to filter')
+            ->define('email', 'str', 'email to filter (deprecated)');
+
+        /** @var \XF\Finder\User $userFinder */
+        $userFinder = $this->finder('XF:User');
+        $userFinder->isValidUser();
+
+        $users = [];
+
+        $email = $params['user_email'];
+        if (strlen($email) === 0) {
+            $email = $params['email'];
+        }
+        if ($email !== '') {
+            if (!\XF::visitor()->hasAdminPermission('user')) {
+                return $this->noPermission();
+            }
+
+            /** @var Email $emailValidator */
+            $emailValidator = \XF::app()->validator('XF:Email');
+            if ($emailValidator->isValid($email)) {
+                $userFinder->where('email', $email);
+                $users = $this->transformFinderLazily($userFinder);
+            }
+        } elseif (strlen($params['username']) > 0) {
+            $userFinder->where('username', 'like', $userFinder->escapeLike($params['username'], '?%'));
+            $users = $this->transformFinderLazily($userFinder->limit(10));
+        }
+
+        $data = [
+            'users' => $users
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetMe()
+    {
+        return $this->actionGetIndex($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionPutMe()
+    {
+        return $this->actionPutIndex($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostMeAvatar()
+    {
+        return $this->actionPostAvatar($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteMeAvatar()
+    {
+        return $this->actionDeleteAvatar($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetMeFollowers()
+    {
+        return $this->actionGetFollowers($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetMeFollowings()
+    {
+        return $this->actionGetFollowings($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetMeGroups()
+    {
+        return $this->actionGetGroups($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @param ParameterBag $paramBag
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostReport(ParameterBag $paramBag)
+    {
+        $params = $this
+            ->params()
+            ->define('message', 'str', 'reason of the report');
+
+        $user = $this->assertViewableUser($paramBag->user_id);
+
+        if (!$user->canBeReported($error)) {
+            return $this->noPermission();
+        }
+
+        /** @var \XF\Service\Report\Creator $creator */
+        $creator = $this->service('XF:Report\Creator', 'user', $user);
+        $creator->setMessage($params['message']);
+
+        if (!$creator->validate($errors)) {
+            return $this->error($errors);
+        }
+
+        $creator->save();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostAvatar(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        $params = $this
+            ->params()
+            ->defineFile('avatar', 'binary data of the avatar');
+
+        if ($user->user_id !== \XF::visitor()->user_id) {
+            return $this->noPermission();
+        }
+
+        if (!$user->canUploadAvatar()) {
+            return $this->noPermission();
+        }
+
+        /** @var \XF\Http\Upload|null $avatarUpload */
+        $avatarUpload = $params['avatar'];
+        if ($avatarUpload === null) {
+            return $this->error(\XF::phrase('bdapi_requires_upload_x', [
+                'field' => 'avatar'
+            ]), 400);
+        }
+
+        /** @var Avatar $avatarService */
+        $avatarService = $this->service('XF:User\Avatar', $user);
+        $avatarService->setImageFromUpload($avatarUpload);
+
+        $avatarService->updateAvatar();
+
+        return $this->message(\XF::phrase('upload_completed_successfully'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteAvatar(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        if ($user->user_id != \XF::visitor()->user_id) {
+            return $this->noPermission();
+        }
+
+        if (!$user->canUploadAvatar()) {
+            return $this->noPermission();
+        }
+
+        /** @var Avatar $avatar */
+        $avatar = $this->service('XF:User\Avatar', $user);
+        $avatar->deleteAvatar();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowers(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        /** @var \XF\Repository\UserFollow $userFollowRepo */
+        $userFollowRepo = $this->repository('XF:UserFollow');
+        $userFollowersFinder = $userFollowRepo->findFollowersForProfile($user);
+
+        if ($this->request()->exists('total')) {
+            $data = [
+                'users_total' => $userFollowersFinder->total()
+            ];
+
+            return $this->api($data);
+        }
+
+        $data = [
+            'users' => []
+        ];
+
+        /** @var UserFollow $userFollow */
+        foreach ($userFollowersFinder->fetch() as $userFollow) {
+            $user = $userFollow->User;
+            if ($user !== null) {
+                $data['users'][] = [
+                    'user_id' => $user->user_id,
+                    'username' => $user->username
+                ];
+            }
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostFollowers(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        $visitor = \XF::visitor();
+        if (!$visitor->canFollowUser($user)) {
+            return $this->noPermission();
+        }
+
+        /** @var Follow $follow */
+        $follow = $this->service('XF:User\Follow', $user);
+        $follow->follow();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteFollowers(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        $visitor = \XF::visitor();
+        if (!$visitor->canFollowUser($user)) {
+            return $this->noPermission();
+        }
+
+        /** @var Follow $follow */
+        $follow = $this->service('XF:User\Follow', $user);
+        $follow->unfollow();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowings(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        /** @var \XF\Repository\UserFollow $userFollowRepo */
+        $userFollowRepo = $this->repository('XF:UserFollow');
+        $userFollowingFinder = $userFollowRepo->findFollowingForProfile($user);
+
+        if ($this->request()->exists('total')) {
+            $data = [
+                'users_total' => $userFollowingFinder->total()
+            ];
+
+            return $this->api($data);
+        }
+
+        $data = [
+            'users' => []
+        ];
+
+        /** @var UserFollow $userFollow */
+        foreach ($userFollowingFinder->fetch() as $userFollow) {
+            $followUser = $userFollow->FollowUser;
+            if ($followUser !== null) {
+                $data['users'][] = [
+                    'user_id' => $followUser->user_id,
+                    'username' => $followUser->username
+                ];
+            }
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIgnored()
+    {
+        $this->assertRegistrationRequired();
+
+        $visitor = \XF::visitor();
+        $profile = $visitor->Profile;
+
+        /** @var Finder|null $finder */
+        $finder = null;
+        if ($profile != null && count($profile->ignored) > 0) {
+            $finder = $this->finder('XF:User')
+                ->where('user_id', array_keys($profile->ignored))
+                ->order('username');
+        }
+
+        if ($this->request()->exists('total')) {
+            $data = [
+                'users_total' => $finder ? $finder->total() : 0
+            ];
+
+            return $this->api($data);
+        }
+
+        $data = [
+            'users' => []
+        ];
+
+        /** @var \XF\Entity\User $user */
+        foreach ($finder->fetch() as $user) {
+            $data['users'][] = [
+                'user_id' => $user->user_id,
+                'username' => $user->username
+            ];
+        }
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostIgnore(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        if (!\XF::visitor()->canIgnoreUser($user, $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Ignore $ignore */
+        $ignore = $this->service('XF:User\Ignore', $user);
+        $ignore->ignore();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteIgnore(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+
+        if (!\XF::visitor()->canIgnoreUser($user, $error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var Ignore $ignore */
+        $ignore = $this->service('XF:User\Ignore', $user);
+        $ignore->unignore();
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetGroups(ParameterBag $params)
+    {
+        $hasAdminUserPermission = \XF::visitor()->hasAdminPermission('user');
+        if ($params->user_id) {
+            $user = $this->assertViewableUser($params->user_id);
+
+            if ($user->user_id != \XF::visitor()->user_id && !$hasAdminUserPermission) {
+                return $this->noPermission();
+            }
+
+            $userGroupIds = $user->secondary_group_ids;
+            $userGroupIds[] = $user->user_group_id;
+
+            $finder = $this->finder('XF:UserGroup');
+            $finder->whereIds($userGroupIds);
+        } else {
+            if (!$hasAdminUserPermission) {
+                return $this->noPermission();
+            }
+
+            $user = null;
+            $finder = $this->finder('XF:UserGroup');
+        }
+
+        $onTransformedCallbacksRef =& $this->params()->getTransformContext()->onTransformedCallbacks;
+        $onTransformedCallbacksRef[] = function ($context, array &$data) use ($user) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!$source instanceof UserGroup) {
+                return;
+            }
+
+            if ($user !== null) {
+                $data['is_primary_group'] = $source->user_group_id == $user->user_group_id;
+            }
+        };
+
+        $data = [
+            'user_id' => $user !== null ? $user->user_id : null,
+            'user_groups' => $this->transformFinderLazily($finder)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute
+     */
+    public function actionPostGroups(ParameterBag $params)
+    {
+        return $this->rerouteController('Xfrocks\Api\Controller\User', 'put-index', $params);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetTimeline(ParameterBag $params)
+    {
+        $user = $this->assertViewableUser($params->user_id);
+        if (!$user->canViewProfilePosts($error)) {
+            return $this->noPermission($error);
+        }
+
+        return $this->rerouteController('Xfrocks\Api:Search', 'user-timeline', $params);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Reroute
+     */
+    public function actionPostTimeline(ParameterBag $params)
+    {
+        return $this->rerouteController('Xfrocks\Api:ProfilePost', 'post-index', $params);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetMeTimeline()
+    {
+        return $this->actionGetTimeline($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Reroute
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostMeTimeline()
+    {
+        return $this->actionPostTimeline($this->buildParamsForVisitor());
+    }
+
+    /**
+     * @param int $userId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function actionSingle($userId)
+    {
+        $user = $this->assertViewableUser($userId);
+
+        $data = [
+            'user' => $this->transformEntityLazily($user)
+        ];
+
+        return $this->api($data);
+    }
+
+    protected function getDefaultApiScopeForAction($action)
+    {
+        if ($action === 'PostIndex') {
+            $session = $this->session();
+            $token = $session->getToken();
+            if ($token === null || $token->client_id === '') {
+                return null;
+            }
+        }
+
+        return parent::getDefaultApiScopeForAction($action);
+    }
+
+    /**
+     * @param int $userId
+     * @param array $extraWith
+     * @return \XF\Entity\User
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableUser($userId, array $extraWith = [])
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $this->assertRecordExists('XF:User', $userId, $extraWith, 'requested_user_not_found');
+
+        return $user;
+    }
+
+    /**
+     * @return ParameterBag
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function buildParamsForVisitor()
+    {
+        $this->assertRegistrationRequired();
+
+        return new ParameterBag(['user_id' => \XF::visitor()->user_id]);
+    }
+}
diff --git a/ControllerPlugin/Attachment.php b/ControllerPlugin/Attachment.php
new file mode 100644
index 00000000..7728e9ce
--- /dev/null
+++ b/ControllerPlugin/Attachment.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use XF\Attachment\Manipulator;
+use XF\ControllerPlugin\AbstractPlugin;
+use XF\PrintableException;
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\XF\ApiOnly\Session\Session;
+
+class Attachment extends AbstractPlugin
+{
+    /**
+     * @param string $hash
+     * @param string $contentType
+     * @param mixed $context
+     * @param string $formField
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws PrintableException
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function doUpload($hash, $contentType, $context, $formField = 'file')
+    {
+        /** @var \XF\Repository\Attachment $attachRepo */
+        $attachRepo = $this->repository('XF:Attachment');
+        $handler = $attachRepo->getAttachmentHandler($contentType);
+
+        if ($handler === null) {
+            throw new PrintableException('Invalid content type.');
+        }
+
+        if (!$handler->canManageAttachments($context, $error)) {
+            throw $this->controller->exception($this->controller->noPermission($error));
+        }
+
+        $manipulator = new Manipulator($handler, $attachRepo, $context, $hash);
+
+        if (!$manipulator->canUpload($uploadErrors)) {
+            throw $this->controller->exception($this->controller->error($uploadErrors));
+        }
+
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
+        $params = $controller->params();
+
+        /** @var \XF\Http\Upload|null $file */
+        $file = $params[$formField];
+        if ($file === null) {
+            throw $this->controller->errorException(\XF::phrase('uploaded_file_failed_not_found'));
+        }
+
+        $attachment = $manipulator->insertAttachmentFromUpload($file, $error);
+        if (!$attachment) {
+            throw $this->controller->exception($this->controller->noPermission($error));
+        }
+
+        return $controller->api(['attachment' => $controller->transformEntityLazily($attachment)]);
+    }
+
+    /**
+     * @param array $contentData
+     * @return string
+     */
+    public function getAttachmentTempHash(array $contentData = [])
+    {
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
+        $params = $controller->params();
+
+        $prefix = '';
+        $inputHash = $params['attachment_hash'];
+
+        if ($inputHash !== '') {
+            $prefix = sprintf('hash%s', $inputHash);
+        } elseif (isset($contentData['post_id'])) {
+            $prefix = sprintf('post%d', $contentData['post_id']);
+        } elseif (isset($contentData['thread_id'])) {
+            $prefix = sprintf('thread%d', $contentData['thread_id']);
+        } elseif (isset($contentData['forum_id'])) {
+            $prefix = sprintf('node%d', $contentData['forum_id']);
+        } elseif (isset($contentData['node_id'])) {
+            $prefix = sprintf('node%d', $contentData['node_id']);
+        } elseif (isset($contentData['message_id'])) {
+            $prefix = sprintf('message%d', $contentData['message_id']);
+        } elseif (isset($contentData['conversation_id'])) {
+            $prefix = sprintf('conversation%d', $contentData['conversation_id']);
+        }
+
+        /** @var Session $session */
+        $session = $this->session();
+        $token = $session->getToken();
+
+        return md5(sprintf(
+            'prefix%s_client%s_visitor%d_salt%s',
+            $prefix,
+            $token !== null ? $token->client_id : '',
+            \XF::visitor()->user_id,
+            $this->app->config('globalSalt')
+        ));
+    }
+}
diff --git a/ControllerPlugin/Like.php b/ControllerPlugin/Like.php
new file mode 100644
index 00000000..79c14b1d
--- /dev/null
+++ b/ControllerPlugin/Like.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use Xfrocks\Api\Controller\AbstractController;
+
+class Like extends \XF\ControllerPlugin\Reaction
+{
+    /**
+     * @param \XF\Mvc\Entity\Entity $content
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionGetLikes($content)
+    {
+        $finder = $content->getRelationFinder('Reactions');
+        $finder->with('ReactionUser');
+
+        $users = [];
+
+        /** @var \XF\Entity\ReactionContent $reactionContent */
+        foreach ($finder->fetch() as $reactionContent) {
+            $user = $reactionContent->ReactionUser;
+
+            if ($user !== null) {
+                $users[] = [
+                    'user_id' => $user->user_id,
+                    'username' => $user->username
+                ];
+            }
+        }
+
+        $data = ['users' => $users];
+
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
+
+        return $controller->api($data);
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Entity $content
+     * @param bool $insert true to insert, false to delete
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionToggleLike($content, $insert)
+    {
+        $requestedReaction = $this->validateReactionAction($content);
+
+        $reactionRepo = $this->getReactionRepo();
+        $contentType = $content->getEntityContentType();
+        $contentId = $content->getEntityId();
+        $reactUser = \XF::visitor();
+
+        $existingReaction = $reactionRepo->getReactionByContentAndReactionUser(
+            $contentType,
+            intval($contentId),
+            $reactUser->user_id
+        );
+
+        if ($insert === ($existingReaction === null)) {
+            $reactionRepo->reactToContent(
+                $requestedReaction->reaction_id,
+                $contentType,
+                $contentId,
+                $reactUser,
+                true
+            );
+        }
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param mixed $key
+     * @param mixed $type
+     * @param mixed $default
+     * @return mixed
+     */
+    public function filter($key, $type = null, $default = null)
+    {
+        if ($key === 'reaction_id') {
+            return 1;
+        }
+
+        return parent::filter($key, $type, $default);
+    }
+}
diff --git a/ControllerPlugin/Login.php b/ControllerPlugin/Login.php
new file mode 100644
index 00000000..94c6d3bb
--- /dev/null
+++ b/ControllerPlugin/Login.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use XF\ControllerPlugin\AbstractPlugin;
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Util\Crypt;
+
+class Login extends AbstractPlugin
+{
+    const INITIATE_TTL = 10;
+    const TWO_STEP_TTL = 300;
+
+    /**
+     * @param string $publicLink
+     * @param null|string $redirectUri
+     * @return \XF\Mvc\Reply\AbstractReply|\XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function initiate($publicLink, $redirectUri = null)
+    {
+        /** @var AbstractController $apiController */
+        $apiController = $this->controller;
+
+        if ($redirectUri === null) {
+            $params = $apiController->params()
+                ->define('redirect_uri', 'str', 'URI to redirect afterwards');
+            $redirectUri = $params['redirect_uri'];
+        }
+        if ($redirectUri === '') {
+            return $this->noPermission();
+        }
+
+        $session = $apiController->session();
+        $token = $session->getToken();
+        if ($token === null) {
+            return $this->noPermission();
+        }
+
+        $client = $token->Client;
+        if ($client === null || !$client->isValidRedirectUri($redirectUri)) {
+            return $this->noPermission();
+        }
+
+        $userId = \XF::visitor()->user_id;
+        if ($userId < 1) {
+            return $this->noPermission();
+        }
+
+        $timestamp = time() + self::INITIATE_TTL;
+        $linkParams = array(
+            '_xfRedirect' => Crypt::encryptTypeOne($redirectUri, $timestamp),
+            'timestamp' => $timestamp,
+            'user_id' => Crypt::encryptTypeOne(strval($userId), $timestamp)
+        );
+        $redirectTarget = $this->app->router('public')->buildLink($publicLink, null, $linkParams);
+
+        return $this->redirectSilently($redirectTarget);
+    }
+
+    /**
+     * @param string $selfLink
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function login($selfLink)
+    {
+        $params = $this->filter([
+            '_xfRedirect' => 'str',
+            'timestamp' => 'uint',
+            'user_id' => 'str'
+        ]);
+
+        $redirect = Crypt::decryptTypeOne($params['_xfRedirect'], $params['timestamp']);
+        $userId = Crypt::decryptTypeOne($params['user_id'], $params['timestamp']);
+        /** @var \XF\Entity\User $user */
+        $user = $this->assertRecordExists('XF:User', $userId);
+        if ($user->user_id === \XF::visitor()->user_id) {
+            return $this->redirectSilently($redirect);
+        }
+
+        /** @var \XF\ControllerPlugin\Login $loginPlugin */
+        $loginPlugin = $this->plugin('XF:Login');
+        $loginPlugin->triggerIfTfaConfirmationRequired(
+            $user,
+            function () use ($selfLink, $redirect, $userId) {
+                $timestamp = time() + self::TWO_STEP_TTL;
+                $comebackParams = array(
+                    '_xfRedirect' => Crypt::encryptTypeOne($redirect, $timestamp),
+                    'timestamp' => $timestamp,
+                    'user_id' => Crypt::encryptTypeOne($userId, $timestamp)
+                );
+                $comebackLink = $this->buildLink($selfLink, null, $comebackParams);
+
+                $twoStepParams = ['_xfRedirect' => $comebackLink, 'remember' => 1];
+                $twoStepLink = $this->buildLink('login/two-step', null, $twoStepParams);
+
+                throw $this->exception($this->redirectSilently($twoStepLink));
+            }
+        );
+        $loginPlugin->completeLogin($user, true);
+
+        return $this->redirectSilently($redirect);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function logout()
+    {
+        $params = $this->filter([
+            '_xfRedirect' => 'str',
+            'timestamp' => 'uint',
+            'user_id' => 'str'
+        ]);
+
+        $redirect = Crypt::decryptTypeOne($params['_xfRedirect'], $params['timestamp']);
+        $userId = intval(Crypt::decryptTypeOne($params['user_id'], $params['timestamp']));
+        if ($userId !== \XF::visitor()->user_id) {
+            return $this->redirectSilently($this->buildLink('index'));
+        }
+
+        /** @var \XF\ControllerPlugin\Login $loginPlugin */
+        $loginPlugin = $this->plugin('XF:Login');
+        $loginPlugin->logoutVisitor();
+
+        return $this->redirectSilently($redirect);
+    }
+
+    /**
+     * @param string $url
+     * @return \XF\Mvc\Reply\Redirect
+     */
+    public function redirectSilently($url)
+    {
+        return $this->redirect($url, '', 'permanent');
+    }
+}
diff --git a/ControllerPlugin/Navigation.php b/ControllerPlugin/Navigation.php
new file mode 100644
index 00000000..909a1f22
--- /dev/null
+++ b/ControllerPlugin/Navigation.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use XF\ControllerPlugin\AbstractPlugin;
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Navigation extends AbstractPlugin
+{
+    /**
+     * @param \XF\Entity\Node[] $nodes
+     * @return array
+     */
+    public function prepareElements($nodes)
+    {
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
+        $context = $controller->params()->getTransformContext();
+        $context->onTransformedCallbacks[] = function ($context, &$data) use ($controller) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!($source instanceof \XF\Entity\AbstractNode)) {
+                return;
+            }
+
+            $node = $source->Node;
+            if ($node === null) {
+                return;
+            }
+
+            $data['navigation_type'] = strtolower($node->node_type_id);
+            $data['navigation_id'] = $source->node_id;
+            $data['navigation_parent_id'] = $node->parent_node_id;
+
+            $data['has_sub_elements'] = $node->hasChildren();
+            if ($data['has_sub_elements'] === true) {
+                if (!isset($data['links'])) {
+                    $data['links'] = [];
+                }
+
+                $data['links']['sub-elements'] = $controller->buildApiLink(
+                    'navigation',
+                    null,
+                    ['parent' => $data['navigation_id']]
+                );
+            }
+        };
+
+        $elements = [];
+        foreach ($nodes as $node) {
+            $element = null;
+
+            switch ($node->node_type_id) {
+                case 'Category':
+                    /** @var \XF\Entity\Category|null $category */
+                    $category = $this->em()->instantiateEntity(
+                        'XF:Category',
+                        ['node_id' => $node->node_id],
+                        ['Node' => $node]
+                    );
+
+                    if ($category !== null) {
+                        $element = $controller->transformEntityLazily($category);
+                    }
+                    break;
+                case 'Forum':
+                    /** @var \XF\Entity\Forum|null $forum */
+                    $forum = $this->em()->instantiateEntity(
+                        'XF:Forum',
+                        ['node_id' => $node->node_id],
+                        ['Node' => $node]
+                    );
+
+                    if ($forum !== null) {
+                        $element = $controller->transformEntityLazily($forum);
+                    }
+                    break;
+                case 'LinkForum':
+                    /** @var \XF\Entity\LinkForum|null $linkForum */
+                    $linkForum = $this->em()->instantiateEntity(
+                        'XF:LinkForum',
+                        ['node_id' => $node->node_id],
+                        ['Node' => $node]
+                    );
+
+                    if ($linkForum !== null) {
+                        $element = $controller->transformEntityLazily($linkForum);
+                    }
+                    break;
+                case 'Page':
+                    /** @var \XF\Entity\Page|null $page */
+                    $page = $this->em()->instantiateEntity(
+                        'XF:Page',
+                        ['node_id' => $node->node_id],
+                        ['Node' => $node]
+                    );
+
+                    if ($page !== null) {
+                        $element = $controller->transformEntityLazily($page);
+                    }
+                    break;
+            }
+
+            if ($element !== null) {
+                $elements[] = $element;
+            }
+        }
+
+        return $elements;
+    }
+
+    /**
+     * @param int[] $nodeIds
+     * @return array
+     */
+    public function prepareElementsFromIds($nodeIds)
+    {
+        $this->em()->findByIds('XF:Node', $nodeIds);
+
+        $nodes = [];
+        foreach ($nodeIds as $nodeId) {
+            /** @var \XF\Entity\Node $node */
+            $node = $this->em()->instantiateEntity('XF:Node', ['node_id' => $nodeId]);
+            $nodes[] = $node;
+        }
+
+        /** @var \XF\Repository\Node $nodeRepo */
+        $nodeRepo = $this->repository('XF:Node');
+        $nodeRepo->loadNodeTypeDataForNodes($nodes);
+
+        return $this->prepareElements($nodes);
+    }
+}
diff --git a/ControllerPlugin/ParseLink.php b/ControllerPlugin/ParseLink.php
new file mode 100644
index 00000000..fb25191e
--- /dev/null
+++ b/ControllerPlugin/ParseLink.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use XF\ControllerPlugin\AbstractPlugin;
+use Xfrocks\Api\Controller\AbstractController;
+
+class ParseLink extends AbstractPlugin
+{
+    /**
+     * @param string $link
+     * @return \XF\Mvc\Reply\AbstractReply
+     * @throws \Exception
+     */
+    public function parse($link)
+    {
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
+
+        $request = $this->request($link);
+        $fullRequestUri = $request->getFullRequestUri();
+
+        $routed = $this->route($request);
+        if (is_bool($routed)) {
+            return $controller->api([
+                'link' => $fullRequestUri,
+                'routed' => $routed,
+            ]);
+        }
+
+        $rendered = $this->render($request, $routed);
+        if ($rendered !== null) {
+            return $rendered;
+        }
+
+        return $controller->api([
+            'link' => $request->getFullRequestUri(),
+            'routed' => \XF::$debugMode ? [
+                'controller' => $routed->getController(),
+                'action' => $routed->getAction(),
+                'params' => $routed->getParams(),
+            ] : true,
+        ]);
+    }
+
+    /**
+     * @param string $link
+     * @return \XF\Http\Request
+     */
+    protected function request($link)
+    {
+        $app = $this->app;
+
+        $server = $_SERVER;
+        $server['REQUEST_URI'] = str_replace($app->options()->boardUrl, '', $link);
+        return new \XF\Http\Request($app->inputFilterer(), [], [], [], $server);
+    }
+
+    /**
+     * @param \XF\Http\Request $request
+     * @return bool|\XF\Mvc\RouteMatch
+     * @throws \Exception
+     */
+    protected function route($request)
+    {
+        $app = $this->app;
+
+        $dispatcherClass = $app->extendClass('XF\Mvc\Dispatcher');
+        /** @var \XF\Mvc\Dispatcher $dispatcher */
+        $dispatcher = new $dispatcherClass($app, $request);
+        $dispatcher->setRouter($app->router('public'));
+
+        return $dispatcher->route($request->getRoutePath());
+    }
+
+    /**
+     * @param \XF\Http\Request $request
+     * @param \XF\Mvc\RouteMatch $match
+     * @return \XF\Mvc\Reply\AbstractReply|null
+     */
+    protected function render($request, $match)
+    {
+        $params = $match->getParams();
+
+        switch ($match->getController()) {
+            case 'XF:Forum':
+                $nodeId = isset($params['node_id']) ? $params['node_id'] : null;
+                if ($nodeId === null && isset($params['node_name'])) {
+                    /** @var \XF\Entity\Node|null $node */
+                    $node = $this->em->findOne('XF:Node', ['node_name' => $params['node_name']]);
+                    if ($node !== null) {
+                        $nodeId = $node->node_id;
+                    }
+                }
+
+                if ($nodeId !== null) {
+                    $this->request->set('forum_id', $nodeId);
+                    if (isset($params['page'])) {
+                        $this->request->set('page', $params['page']);
+                    }
+
+                    return $this->controller->rerouteController(
+                        'Xfrocks\Api\Controller\Thread',
+                        'get-index'
+                    );
+                }
+
+                return $this->controller->rerouteController(
+                    'Xfrocks\Api\Controller\Navigation',
+                    'get-index'
+                );
+            case 'XF:GotoPage':
+                $requestUri = $request->getRequestUri();
+                $queryStr = parse_url($requestUri, PHP_URL_QUERY);
+                if (!is_string($queryStr)) {
+                    break;
+                }
+                $queryParams = \GuzzleHttp\Psr7\parse_query($queryStr);
+
+                switch ($match->getAction()) {
+                    case 'post':
+                        if (isset($queryParams['id'])) {
+                            $this->request->set('page_of_post_id', $queryParams['id']);
+                            return $this->controller->rerouteController(
+                                'Xfrocks\Api\Controller\Post',
+                                'get-index'
+                            );
+                        }
+                        break;
+                    case 'convMessage':
+                        // TODO
+                        break;
+                }
+                break;
+            case 'XF:Member':
+                return $this->controller->rerouteController(
+                    'Xfrocks\Api\Controller\User',
+                    'get-index',
+                    isset($params['user_id']) ? ['user_id' => $params['user_id']] : null
+                );
+            case 'XF:Post':
+                if (isset($params['post_id'])) {
+                    $this->request->set('page_of_post_id', $params['post_id']);
+                    return $this->controller->rerouteController(
+                        'Xfrocks\Api\Controller\Post',
+                        'get-index'
+                    );
+                }
+                break;
+            case 'XF:Tag':
+                if (isset($params['tag_url'])) {
+                    /** @var \XF\Entity\Tag|null $tag */
+                    $tag = $this->em->findOne('XF:Tag', ['tag_url' => $params['tag_url']]);
+                    if ($tag !== null) {
+                        return $this->controller->rerouteController(
+                            'Xfrocks\Api\Controller\Tag',
+                            'get-index',
+                            ['tag_id' => $tag->tag_id]
+                        );
+                    }
+                }
+                break;
+            case 'XF:Thread':
+                if (isset($params['thread_id'])) {
+                    $this->request->set('thread_id', $params['thread_id']);
+                    if (isset($params['post_id'])) {
+                        $this->request->set('page_of_post_id', $params['post_id']);
+                    }
+                    if (isset($params['page'])) {
+                        $this->request->set('page', $params['page']);
+                    }
+
+                    return $this->controller->rerouteController(
+                        'Xfrocks\Api\Controller\Post',
+                        'get-index'
+                    );
+                }
+                break;
+        }
+
+        return null;
+    }
+}
diff --git a/ControllerPlugin/Search.php b/ControllerPlugin/Search.php
new file mode 100644
index 00000000..8e111335
--- /dev/null
+++ b/ControllerPlugin/Search.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Xfrocks\Api\ControllerPlugin;
+
+use XF\ControllerPlugin\AbstractPlugin;
+use XF\Mvc\Entity\Entity;
+use Xfrocks\Api\Controller\AbstractController;
+
+class Search extends AbstractPlugin
+{
+    /**
+     * @param array $results
+     * @return array
+     */
+    public function prepareSearchResults(array $results)
+    {
+        $grouped = [];
+        $resultKeyMap = [];
+
+        foreach ($results as $resultKey => $result) {
+            $grouped[$result[0]][] = $result[1];
+
+            $dataKey = $result[0] . '-' . $result[1];
+            $resultKeyMap[$dataKey] = $resultKey;
+        }
+
+        $searcher = $this->app->search();
+        $controller = $this->controller;
+
+        if (!($controller instanceof AbstractController)) {
+            throw new \LogicException(sprintf(
+                'Controller (%s) must be instanced of (%s)',
+                get_class($controller),
+                'Xfrocks\Api\Controller\AbstractController'
+            ));
+        }
+
+        $values = [];
+        foreach ($grouped as $contentType => $contents) {
+            $typeHandler = $searcher->handler(strval($contentType));
+            $entities = $typeHandler->getContent(array_values($contents), true);
+
+            /** @var Entity $entity */
+            foreach ($entities as $entity) {
+                $dataKey = $contentType . '-' . $entity->getEntityId();
+                if (!isset($resultKeyMap[$dataKey])) {
+                    continue;
+                }
+
+                $transformed = $controller->transformEntityLazily($entity);
+                $transformed->addCallbackPostTransform(function ($data) use ($contentType, $entity) {
+                    $data['content_type'] = $contentType;
+                    $data['content_id'] = $entity->getEntityId();
+
+                    return $data;
+                });
+
+                $values[$resultKeyMap[$dataKey]] = $transformed;
+            }
+        }
+
+        $data = [];
+        foreach ($results as $resultKey => $result) {
+            if (isset($values[$resultKey])) {
+                $data[] = $values[$resultKey];
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/Cron/CleanUp.php b/Cron/CleanUp.php
new file mode 100644
index 00000000..8362ed9f
--- /dev/null
+++ b/Cron/CleanUp.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Xfrocks\Api\Cron;
+
+use XF\Util\File;
+use Xfrocks\Api\Repository\AuthCode;
+use Xfrocks\Api\Repository\Log;
+use Xfrocks\Api\Repository\RefreshToken;
+use Xfrocks\Api\Repository\Token;
+
+class CleanUp
+{
+    /**
+     * @return void
+     */
+    public static function runHourlyCleanUp()
+    {
+        $app = \XF::app();
+        $cleanedUp = [];
+
+        /** @var AuthCode $authCodeRepo */
+        $authCodeRepo = $app->repository('Xfrocks\Api:AuthCode');
+        $cleanedUp['authCodes'] = $authCodeRepo->deleteExpiredAuthCodes();
+
+        /** @var RefreshToken $refreshTokenRepo */
+        $refreshTokenRepo = $app->repository('Xfrocks\Api:RefreshToken');
+        $cleanedUp['refreshTokens'] = $refreshTokenRepo->deleteExpiredRefreshTokens();
+
+        /** @var Token $tokenRepo */
+        $tokenRepo = $app->repository('Xfrocks\Api:Token');
+        $cleanedUp['tokens'] = $tokenRepo->deleteExpiredTokens();
+
+        /** @var Log $logRepo */
+        $logRepo = \XF::repository('Xfrocks\Api:Log');
+        $cleanedUp['logs'] = $logRepo->pruneExpired();
+
+        if (\XF::$debugMode) {
+            $json = json_encode($cleanedUp);
+            if (is_string($json)) {
+                File::log(__CLASS__, $json);
+            }
+        }
+    }
+}
diff --git a/Data/BatchJob.php b/Data/BatchJob.php
new file mode 100644
index 00000000..c3741791
--- /dev/null
+++ b/Data/BatchJob.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Xfrocks\Api\Data;
+
+class BatchJob
+{
+    /**
+     * @var \XF\App
+     */
+    protected $app;
+
+    /**
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * @var array
+     */
+    protected $params;
+
+    /**
+     * @var string
+     */
+    protected $uri;
+
+    /**
+     * @param \XF\App $app
+     * @param string $method
+     * @param array $params
+     * @param string $uri
+     */
+    public function __construct($app, $method, array $params, $uri)
+    {
+        $this->app = $app;
+        $this->method = $method;
+        $this->params = $params;
+        $this->uri = $uri;
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\AbstractReply
+     */
+    public function execute()
+    {
+        $request = $this->buildRequest();
+        $dispatcher = $this->buildDispatcher($request);
+
+        $routePath = $request->getRoutePath();
+        $match = $dispatcher->route($routePath);
+        $reply = $dispatcher->dispatchLoop($match);
+
+        return $reply;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * @return array
+     */
+    public function getParams()
+    {
+        return $this->params;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * @return \XF\Http\Request
+     */
+    protected function buildRequest()
+    {
+        $app = $this->app;
+        $appRequest = $app->request();
+        $inputFilterer = $app->inputFilterer();
+
+        $server = $_SERVER;
+        $server['REQUEST_METHOD'] = $this->method;
+        $absoluteUri = $appRequest->convertToAbsoluteUri($this->uri);
+        $requestUri = str_replace($appRequest->getHostUrl(), '', $absoluteUri);
+        $server['REQUEST_URI'] = $requestUri;
+
+        $jobRequest = new \XF\Http\Request($inputFilterer, $this->params, [], [], $server);
+        $jobRequest->set('_isApiJob', true);
+
+        return $jobRequest;
+    }
+
+    /**
+     * @param \XF\Http\Request $request
+     * @return \XF\Mvc\Dispatcher
+     */
+    protected function buildDispatcher($request)
+    {
+        $app = $this->app;
+        try {
+            $class = $app->extendClass('XF\Mvc\Dispatcher');
+            $dispatcher = new $class($app, $request);
+
+            return $dispatcher;
+        } catch (\Exception $e) {
+            throw new \RuntimeException('', 0, $e);
+        }
+    }
+}
diff --git a/Data/Modules.php b/Data/Modules.php
new file mode 100644
index 00000000..312b08bf
--- /dev/null
+++ b/Data/Modules.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Xfrocks\Api\Data;
+
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Listener;
+
+class Modules
+{
+    /**
+     * @var array
+     */
+    private $routes = [];
+
+    /**
+     * @var array
+     */
+    private $versions = [
+        'forum' => 2018092501,
+        'oauth2' => 2016030902,
+        'subscription' => 2014092301,
+    ];
+
+    public function __construct()
+    {
+        $this->addController('Xfrocks:Asset', 'assets');
+        $this->addController('Xfrocks:Attachment', 'attachments', ':int<attachment_id>/');
+        $this->addController('Xfrocks:Batch', 'batch');
+        $this->addController('Xfrocks:Category', 'categories', ':int<node_id>/');
+        $this->addController('Xfrocks:Conversation', 'conversations', ':int<conversation_id>/');
+        $this->addController('Xfrocks:ConversationMessage', 'conversation-messages', ':int<message_id>/');
+        $this->addController('Xfrocks:Index', 'index');
+        $this->addController('Xfrocks:Forum', 'forums', ':int<node_id>/');
+        $this->addController('Xfrocks:LostPassword', 'lost-password');
+        $this->addController('Xfrocks:Navigation', 'navigation');
+        $this->addController('Xfrocks:Notification', 'notifications', ':int<alert_id>/');
+        $this->addController('Xfrocks:OAuth2', 'oauth');
+        $this->addController('Xfrocks:Page', 'pages', ':int<node_id>/');
+        $this->addController('Xfrocks:ProfilePost', 'profile-posts', ':int<profile_post_id>/');
+        $this->addController('Xfrocks:Post', 'posts', ':int<post_id>/');
+        $this->addController('Xfrocks:Search', 'search', ':int<search_id>/');
+        $this->addController('Xfrocks:Subscription', 'subscriptions', ':int<subscription_id>/');
+        $this->addController('Xfrocks:Tag', 'tags', ':int<tag_id>/');
+        $this->addController('Xfrocks:Thread', 'threads', ':int<thread_id>/');
+        $this->addController('Xfrocks:Tool', 'tools');
+        $this->addController('Xfrocks:User', 'users', ':int<user_id>/');
+    }
+
+    /**
+     * @param AbstractController $controller
+     * @return array
+     */
+    public function getDataForApiIndex($controller)
+    {
+        $app = $controller->app();
+        $apiRouter = $app->router(Listener::$routerType);
+        $visitor = \XF::visitor();
+        $threadLinkParams = ['data_limit' => $app->options()->discussionsPerPage];
+
+        $data = [
+            'links' => [
+                'navigation' => $apiRouter->buildLink('navigation', null, ['parent' => 0]),
+                'search' => $apiRouter->buildLink('search'),
+                'threads/recent' => $apiRouter->buildLink('threads/recent', null, $threadLinkParams),
+                'users' => $apiRouter->buildLink('users')
+            ],
+            'post' => [],
+        ];
+
+        if ($visitor->user_id > 0) {
+            $data['links'] += [
+                'conversations' => $apiRouter->buildLink('conversations'),
+                'forums/followed' => $apiRouter->buildLink('forums/followed'),
+                'notifications' => $apiRouter->buildLink('notifications'),
+                'threads/followed' => $apiRouter->buildLink('threads/followed'),
+                'threads/new' => $apiRouter->buildLink('threads/new', null, $threadLinkParams),
+                'users/ignored' => $apiRouter->buildLink('users/ignored'),
+                'users/me' => $apiRouter->buildLink('users', $visitor)
+            ];
+
+            if ($visitor->canPostOnProfile()) {
+                $data['post']['status'] = $apiRouter->buildLink('users/me/timeline');
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    final public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * @param string $shortName
+     * @return string
+     */
+    public function getTransformerClass($shortName)
+    {
+        return \XF::stringToClass($shortName, 'Xfrocks\Api\%s\Transform\%s');
+    }
+
+    /**
+     * @return array
+     */
+    final public function getVersions()
+    {
+        return $this->versions;
+    }
+
+    /**
+     * @param string $controller
+     * @param string $prefix
+     * @param string $format
+     * @param null|callable $buildCallback
+     * @param string $subSection
+     * @param string $context
+     * @param string $actionPrefix
+     * @return void
+     */
+    protected function addController(
+        $controller,
+        $prefix,
+        $format = '',
+        $buildCallback = null,
+        $subSection = '',
+        $context = '',
+        $actionPrefix = ''
+    ) {
+        $this->addRoute($prefix, $subSection, [
+            'format' => $format,
+            'build_callback' => $buildCallback,
+            'controller' => $controller,
+            'context' => $context,
+            'action_prefix' => $actionPrefix
+        ]);
+    }
+
+    /**
+     * @param string $prefix
+     * @param string $subSection
+     * @param array $route
+     * @return void
+     */
+    protected function addRoute($prefix, $subSection, $route)
+    {
+        if (isset($this->routes[$prefix][$subSection])) {
+            throw new \InvalidArgumentException(sprintf('Route "%s"."%s" has already existed', $prefix, $subSection));
+        }
+
+        $this->routes[$prefix][$subSection] = $route;
+    }
+
+    /**
+     * @param string $id
+     * @param int $version
+     * @return void
+     */
+    protected function register($id, $version)
+    {
+        if (isset($this->versions[$id])) {
+            throw new \InvalidArgumentException(sprintf('Module "%s" has already been registered', $id));
+        }
+
+        $this->versions[$id] = $version;
+    }
+}
diff --git a/Data/Param.php b/Data/Param.php
new file mode 100644
index 00000000..25a3fc71
--- /dev/null
+++ b/Data/Param.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Xfrocks\Api\Data;
+
+class Param
+{
+    /**
+     * @var mixed
+     */
+    public $default = '';
+
+    /**
+     * @var string|null
+     */
+    public $description;
+
+    /**
+     * @var array
+     */
+    public $options = [];
+
+    /**
+     * @var string|null
+     */
+    public $type;
+
+    /**
+     * @param string|null $type
+     * @param string|null $description
+     */
+    public function __construct($type = null, $description = null)
+    {
+        $this->type = $type;
+        $this->description = $description;
+    }
+}
diff --git a/Data/Params.php b/Data/Params.php
new file mode 100644
index 00000000..bbcd5fa4
--- /dev/null
+++ b/Data/Params.php
@@ -0,0 +1,482 @@
+<?php
+
+namespace Xfrocks\Api\Data;
+
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Transform\Selector;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Params implements \ArrayAccess
+{
+    /**
+     * @var AbstractController
+     */
+    protected $controller;
+
+    /**
+     * @var bool
+     */
+    protected $defineCompleted = false;
+
+    /**
+     * @var array
+     */
+    protected $filtered = [];
+
+    /**
+     * @var bool
+     */
+    protected $isDeprecated = false;
+
+    /**
+     * @var array[]
+     */
+    protected $orderChoices = [];
+
+    /**
+     * @var string
+     */
+    protected $paramKeyLimit = '';
+
+    /**
+     * @var string
+     */
+    protected $paramKeyOrder = '';
+
+    /**
+     * @var string
+     */
+    protected $paramKeyPage = '';
+
+    /**
+     * @var string
+     */
+    protected $paramKeyTransformSelectorExclude = '';
+
+    /**
+     * @var string
+     */
+    protected $paramKeyTransformSelectorInclude = '';
+
+    /**
+     * @var Param[]
+     */
+    protected $params = [];
+
+    /**
+     * @var TransformContext|null
+     */
+    protected $transformContext = null;
+
+    /**
+     * @param AbstractController $controller
+     */
+    public function __construct($controller)
+    {
+        $this->controller = $controller;
+
+        $this->defineFieldsFiltering();
+    }
+
+    /**
+     * @param string $key
+     * @param string|Param|null $type
+     * @param string|null $description
+     * @param mixed|null $default
+     * @return Params
+     */
+    public function define($key, $type = null, $description = null, $default = null)
+    {
+        if ($this->defineCompleted) {
+            throw new \LogicException('All params must be defined together and before the first param parsing.');
+        }
+        if ($key === '') {
+            throw new \InvalidArgumentException('$key cannot be an empty string');
+        }
+
+        if ($type === null || is_string($type)) {
+            $param = new Param($type, $description);
+        } else {
+            $param = $type;
+        }
+
+        if ($default !== null) {
+            $param->default = $default;
+        }
+
+        $this->params[$key] = $param;
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function defineAttachmentHash()
+    {
+        $this->define('attachment_hash', 'str', 'a unique hash value');
+
+        return $this;
+    }
+
+    /**
+     * @param string $key
+     * @param string|null $description
+     * @return Params
+     */
+    public function defineFile($key, $description = null)
+    {
+        return $this->define($key, 'file', $description);
+    }
+
+    /**
+     * @param string $key
+     * @param string|null $description
+     * @return Params
+     */
+    public function defineFiles($key, $description = null)
+    {
+        return $this->define($key, 'files', $description);
+    }
+
+    /**
+     * @param array[] $choices
+     * @param string $paramKeyOrder
+     * @param string $defaultOrder
+     * @return Params
+     */
+    public function defineOrder(array $choices, $paramKeyOrder = 'order', $defaultOrder = 'natural')
+    {
+        $this->orderChoices = $choices;
+        $this->paramKeyOrder = $paramKeyOrder;
+
+        $param = new Param('str', implode(', ', array_keys($choices)));
+        $param->default = $defaultOrder;
+
+        return $this->define($paramKeyOrder, $param);
+    }
+
+    /**
+     * @param string $paramKeyLimit
+     * @param string $paramKeyPage
+     * @return Params
+     */
+    public function definePageNav($paramKeyLimit = 'limit', $paramKeyPage = 'page')
+    {
+        $this->paramKeyLimit = $paramKeyLimit;
+        $this->paramKeyPage = $paramKeyPage;
+
+        return $this->define($paramKeyLimit, 'posint', 'number of items per page')
+            ->define($paramKeyPage, 'posint', 'page number');
+    }
+
+    /**
+     * @param string $paramKeyExclude
+     * @param string $paramKeyInclude
+     * @return Params
+     */
+    public function defineFieldsFiltering(
+        $paramKeyExclude = 'fields_exclude',
+        $paramKeyInclude = 'fields_include'
+    ) {
+        $this->paramKeyTransformSelectorExclude = $paramKeyExclude;
+        $this->paramKeyTransformSelectorInclude = $paramKeyInclude;
+
+        return $this->define($paramKeyExclude, 'str', 'coma-separated list of fields to exclude from the response')
+            ->define($paramKeyInclude, 'str', 'coma-separated list of fields to include in the response');
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function filter($key)
+    {
+        if (!$this->defineCompleted) {
+            $this->setDefineCompleted();
+        }
+
+        if (!isset($this->params[$key])) {
+            throw new \LogicException('Unrecognized parameter: ' . $key);
+        }
+        $param = $this->params[$key];
+
+        if ($key === $this->paramKeyLimit) {
+            list($limit,) = $this->filterLimitAndPage();
+            return $limit;
+        }
+        if ($key === $this->paramKeyPage) {
+            list(, $page) = $this->filterLimitAndPage();
+            return $page;
+        }
+
+        if (!isset($this->filtered[$key])) {
+            $request = $this->controller->request();
+
+            if ($param->type === 'files' || $param->type === 'file') {
+                $valueRaw = null;
+                $value = $request->getFile($key, $param->type === 'files', false);
+            } else {
+                $valueRaw = $request->get($key, $param->default);
+                $filterer = $this->controller->app()->inputFilterer();
+                $value = $filterer->filter($valueRaw, $param->type, $param->options);
+            }
+
+            $this->filtered[$key] = [
+                'default' => $param->default,
+                'value' => $value,
+                'valueRaw' => $valueRaw
+            ];
+        }
+
+        return $this->filtered[$key]['value'];
+    }
+
+    /**
+     * @param string $key
+     * @return int[]
+     */
+    public function filterCommaSeparatedIds($key)
+    {
+        $str = $this->filter($key);
+        if (!is_string($str)) {
+            return [];
+        }
+
+        $ids = preg_split('/[^0-9]/', $str, -1, PREG_SPLIT_NO_EMPTY);
+        if (!is_array($ids)) {
+            return [];
+        }
+
+        return array_map('intval', $ids);
+    }
+
+    /**
+     * @return array
+     */
+    public function filterLimitAndPage()
+    {
+        if ($this->paramKeyLimit === '' || $this->paramKeyPage === '') {
+            throw new \LogicException('Params::definePageNav() must be called before calling filterLimitAndPage().');
+        }
+
+        if (isset($this->filtered[$this->paramKeyLimit]) && isset($this->filtered[$this->paramKeyPage])) {
+            return [
+                $this->filtered[$this->paramKeyLimit]['value'],
+                $this->filtered[$this->paramKeyPage]['value']
+            ];
+        }
+
+        $controller = $this->controller;
+        $options = $controller->options();
+        $request = $controller->request();
+        $limit = $limitDefault = intval($options->bdApi_paramLimitDefault);
+        $limitRaw = $request->get($this->paramKeyLimit, '');
+        if (strlen($limitRaw) > 0) {
+            $limit = intval($limitRaw);
+
+            $limitMax = intval($options->bdApi_paramLimitMax);
+            if ($limitMax > 0) {
+                $limit = min($limitMax, $limit);
+            }
+        }
+        $limit = max(1, $limit);
+        $this->filtered[$this->paramKeyLimit] = [
+            'default' => $limitDefault,
+            'key' => $this->paramKeyLimit,
+            'value' => $limit,
+            'valueRaw' => $limitRaw
+        ];
+
+        $pageDefault = '1';
+        $pageRaw = $request->get($this->paramKeyPage, $pageDefault);
+        $page = intval($pageRaw);
+        $pageMax = intval($options->bdApi_paramPageMax);
+        if ($pageMax > 0) {
+            $page = min($pageMax, $page);
+        }
+        $page = max(1, $page);
+        $this->filtered[$this->paramKeyPage] = [
+            'default' => $pageDefault,
+            'key' => $this->paramKeyPage,
+            'max' => $pageMax,
+            'value' => $page,
+            'valueRaw' => $pageRaw
+        ];
+
+        return [$limit, $page];
+    }
+
+    /**
+     * @return array
+     */
+    public function filterTransformSelector()
+    {
+        if ($this->paramKeyTransformSelectorExclude === '' || $this->paramKeyTransformSelectorInclude === '') {
+            throw new \LogicException('Params::defineFieldsFiltering() must be called before calling filterTransformSelector().');
+        }
+
+        return [
+            $this->filter($this->paramKeyTransformSelectorExclude),
+            $this->filter($this->paramKeyTransformSelectorInclude),
+        ];
+    }
+
+    /**
+     * @return AbstractController
+     */
+    public function getController()
+    {
+        return $this->controller;
+    }
+
+    /**
+     * @param string $key
+     * @return array|null
+     */
+    public function getFiltered($key)
+    {
+        if (!isset($this->filtered[$key])) {
+            return null;
+        }
+        return $this->filtered[$key];
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getFilteredLimit()
+    {
+        return $this->getFiltered($this->paramKeyLimit);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getFilteredPage()
+    {
+        return $this->getFiltered($this->paramKeyPage);
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilteredValues()
+    {
+        $values = [];
+        foreach ($this->filtered as $key => $filtered) {
+            $values[$key] = $filtered['value'];
+        }
+        return $values;
+    }
+
+    /**
+     * @return TransformContext
+     */
+    public function getTransformContext()
+    {
+        if ($this->transformContext === null) {
+            $selector = new Selector();
+            list($exclude, $include) = $this->filterTransformSelector();
+            $selector->parseRules($exclude, $include);
+
+            $this->transformContext = new TransformContext(null, null, $selector);
+        }
+
+        return $this->transformContext;
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Finder $finder
+     * @return int
+     */
+    public function limitFinderByPage($finder)
+    {
+        list($limit, $page) = $this->filterLimitAndPage();
+        $finder->limitByPage($page, $limit);
+
+        return $page;
+    }
+
+    /**
+     * @return void
+     */
+    public function markAsDeprecated()
+    {
+        $this->isDeprecated = true;
+    }
+
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->params[$offset]);
+    }
+
+    /**
+     * @param mixed $offset
+     * @return mixed|null
+     */
+    public function offsetGet($offset)
+    {
+        return $this->filter($offset);
+    }
+
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!isset($this->filtered[$offset])) {
+            throw new \LogicException('offsetSet must be called after offsetGet: ' . $offset);
+        }
+        $this->filtered[$offset]['value'] = $value;
+    }
+
+    /**
+     * @param mixed $offset
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        if (!isset($this->params[$offset])) {
+            throw new \LogicException('Unrecognized parameter: ' . $offset);
+        }
+        unset($this->filtered[$offset]);
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Finder $finder
+     * @return array|false
+     */
+    public function sortFinder($finder)
+    {
+        if ($this->paramKeyOrder === '') {
+            throw new \LogicException('Params::defineOrder() must be called before calling sortFinder().');
+        }
+
+        $order = $this->offsetGet($this->paramKeyOrder);
+        if ($order === '' || !isset($this->orderChoices[$order])) {
+            return false;
+        }
+
+        $orderChoice = $this->orderChoices[$order];
+
+        if (count($orderChoice) >= 2) {
+            $finder->order($orderChoice[0], $orderChoice[1]);
+        }
+
+        return $orderChoice;
+    }
+
+    /**
+     * @return void
+     */
+    protected function setDefineCompleted()
+    {
+        $this->defineCompleted = true;
+    }
+}
diff --git a/DevHelper/Admin/Controller/Entity.php b/DevHelper/Admin/Controller/Entity.php
new file mode 100644
index 00000000..5ead9792
--- /dev/null
+++ b/DevHelper/Admin/Controller/Entity.php
@@ -0,0 +1,762 @@
+<?php
+
+namespace Xfrocks\Api\DevHelper\Admin\Controller;
+
+use XF\Admin\Controller\AbstractController;
+use XF\Mvc\Entity\Entity as MvcEntity;
+use XF\Mvc\FormAction;
+use XF\Mvc\ParameterBag;
+
+/**
+ * @version 2020052301
+ * @see \DevHelper\Autogen\Admin\Controller\Entity
+ */
+abstract class Entity extends AbstractController
+{
+    /**
+     * @return \XF\Mvc\Reply\View
+     */
+    public function actionIndex()
+    {
+        $page = $this->filterPage();
+        $perPage = $this->getPerPage();
+
+        list($finder, $filters) = $this->entityListData();
+
+        $finder->limitByPage($page, $perPage);
+        $total = $finder->total();
+
+        $viewParams = [
+            'entities' => $finder->fetch(),
+
+            'filters' => $filters,
+            'page' => $page,
+            'perPage' => $perPage,
+            'total' => $total
+        ];
+
+        return $this->getViewReply('list', $viewParams);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\View
+     * @throws \Exception
+     */
+    public function actionAdd()
+    {
+        if (!$this->supportsAdding()) {
+            return $this->noPermission();
+        }
+
+        return $this->entityAddEdit($this->createEntity());
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\View|\XF\Mvc\Reply\Redirect
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionDelete(ParameterBag $params)
+    {
+        if (!$this->supportsDeleting()) {
+            return $this->noPermission();
+        }
+
+        $entityId = $this->getEntityIdFromParams($params);
+        $entity = $this->assertEntityExists($entityId);
+
+        if ($this->isPost()) {
+            $entity->delete();
+
+            return $this->redirect($this->buildLink($this->getRoutePrefix()));
+        }
+
+        $viewParams = [
+            'entity' => $entity,
+            'entityLabel' => $this->getEntityLabel($entity)
+        ];
+
+        return $this->getViewReply('delete', $viewParams);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionEdit(ParameterBag $params)
+    {
+        if (!$this->supportsEditing()) {
+            return $this->noPermission();
+        }
+
+        $entityId = $this->getEntityIdFromParams($params);
+        $entity = $this->assertEntityExists($entityId);
+        return $this->entityAddEdit($entity);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Redirect
+     * @throws \Exception
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionSave()
+    {
+        $this->assertPostOnly();
+
+        $entityId = $this->filter('entity_id', 'str');
+        if ($entityId !== '') {
+            $entity = $this->assertEntityExists($entityId);
+        } else {
+            $entity = $this->createEntity();
+        }
+
+        $this->entitySaveProcess($entity)->run();
+
+        return $this->redirect($this->buildLink($this->getRoutePrefix()));
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @param string $columnName
+     * @return string|object|null
+     */
+    public function getEntityColumnLabel($entity, $columnName)
+    {
+        /** @var mixed $unknownEntity */
+        $unknownEntity = $entity;
+        $callback = [$unknownEntity, 'getEntityColumnLabel'];
+        if (!is_callable($callback)) {
+            $shortName = $entity->structure()->shortName;
+            throw new \InvalidArgumentException("Entity {$shortName} does not implement {$callback[1]}");
+        }
+
+        return call_user_func($callback, $columnName);
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @return string
+     */
+    public function getEntityExplain($entity)
+    {
+        return '';
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @return string
+     */
+    public function getEntityHint($entity)
+    {
+        $structure = $entity->structure();
+        if (isset($structure->columns['display_order'])) {
+            return sprintf('%s: %d', \XF::phrase('display_order'), $entity->get('display_order'));
+        }
+
+        return '';
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @return mixed
+     */
+    public function getEntityLabel($entity)
+    {
+        /** @var mixed $unknownEntity */
+        $unknownEntity = $entity;
+        $callback = [$unknownEntity, 'getEntityLabel'];
+        if (!is_callable($callback)) {
+            $shortName = $entity->structure()->shortName;
+            throw new \InvalidArgumentException("Entity {$shortName} does not implement {$callback[1]}");
+        }
+
+        return call_user_func($callback);
+    }
+
+    /**
+     * @param int $entityId
+     * @return MvcEntity
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertEntityExists($entityId)
+    {
+        return $this->assertRecordExists($this->getShortName(), $entityId);
+    }
+
+    /**
+     * @return MvcEntity
+     */
+    protected function createEntity()
+    {
+        return $this->em()->create($this->getShortName());
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @return \XF\Mvc\Reply\View
+     * @throws \Exception
+     */
+    protected function entityAddEdit($entity)
+    {
+        $viewParams = [
+            'entity' => $entity,
+            'columns' => [],
+        ];
+
+        $structure = $entity->structure();
+        $viewParams['columns'] = $this->entityGetMetadataForColumns($entity);
+
+        foreach ($structure->relations as $relationKey => $relation) {
+            if (!isset($relation['entity']) ||
+                !isset($relation['type']) ||
+                $relation['type'] !== MvcEntity::TO_ONE ||
+                !isset($relation['primary']) ||
+                !isset($relation['conditions'])) {
+                continue;
+            }
+
+            $columnName = '';
+            $relationConditions = $relation['conditions'];
+            if (is_string($relationConditions)) {
+                $columnName = $relationConditions;
+            } elseif (is_array($relationConditions)) {
+                if (count($relationConditions) === 1) {
+                    $relationCondition = reset($relationConditions);
+                    if (count($relationCondition) === 3 &&
+                        $relationCondition[1] === '=' &&
+                        preg_match('/\$(.+)$/', $relationCondition[2], $matches) === 1
+                    ) {
+                        $columnName = $matches[1];
+                    }
+                }
+            }
+            if ($columnName === '' || !isset($viewParams['columns'][$columnName])) {
+                continue;
+            }
+            $columnViewParamRef = &$viewParams['columns'][$columnName];
+            list ($relationTag, $relationTagOptions) = $this->entityAddEditRelationColumn(
+                $entity,
+                $columnViewParamRef['_structureData'],
+                $relationKey,
+                $relation
+            );
+
+            if ($relationTag !== null) {
+                $columnViewParamRef['tag'] = $relationTag;
+                $columnViewParamRef['tagOptions'] = $relationTagOptions;
+            }
+        }
+
+        return $this->getViewReply('edit', $viewParams);
+    }
+
+    /**
+     * @param MvcEntity $entity
+     * @param array $column
+     * @param string $relationKey
+     * @param array $relation
+     * @return array
+     */
+    protected function entityAddEditRelationColumn($entity, array $column, $relationKey, array $relation)
+    {
+        $tag = null;
+        $tagOptions = [];
+        switch ($relation['entity']) {
+            case 'XF:Forum':
+                $tag = 'select';
+                /** @var \XF\Repository\Node $nodeRepo */
+                $nodeRepo = $entity->repository('XF:Node');
+                $tagOptions['choices'] = $nodeRepo->getNodeOptionsData(false, ['Forum']);
+                break;
+            case 'XF:User':
+                $tag = 'username';
+                /** @var \XF\Entity\User|null $user */
+                $user = $entity->getRelation($relationKey);
+                $tagOptions['username'] = $user !== null ? $user->username : '';
+                break;
+            default:
+                if (strpos($relation['entity'], $this->getPrefixForClasses()) === 0) {
+                    $choices = [];
+
+                    /** @var MvcEntity $relationEntity */
+                    foreach ($this->finder($relation['entity'])->fetch() as $relationEntity) {
+                        $choices[] = [
+                            'value' => $relationEntity->getEntityId(),
+                            'label' => $this->getEntityLabel($relationEntity)
+                        ];
+                    }
+
+                    $tag = 'select';
+                    $tagOptions['choices'] = $choices;
+                }
+        }
+
+        if ($tag === 'select') {
+            if (isset($tagOptions['choices']) &&
+                (!isset($column['required']) || $column['required'] === false)
+            ) {
+                array_unshift($tagOptions['choices'], [
+                    'value' => 0,
+                    'label' => '',
+                ]);
+            }
+        }
+
+        return [$tag, $tagOptions];
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Entity $entity
+     * @param string $columnName
+     * @param array $column
+     * @return array|null
+     * @throws \Exception
+     */
+    protected function entityGetMetadataForColumn($entity, $columnName, array $column)
+    {
+        $columnTag = null;
+        $columnTagOptions = [];
+        $columnFilter = null;
+        $requiresLabel = true;
+
+        if (!$entity->exists()) {
+            if (isset($column['default'])) {
+                $entity->set($columnName, $column['default']);
+            }
+
+            if ($this->request->exists($columnName)) {
+                $input = $this->filter(['filters' => [$columnName => 'str']]);
+                if ($input['filters'][$columnName] !== '') {
+                    $entity->set($columnName, $this->filter($columnName, $input['filters'][$columnName]));
+                    $requiresLabel = false;
+                }
+            }
+        } else {
+            if (isset($column['writeOnce']) && $column['writeOnce'] === true) {
+                // do not render row for write once column, new value won't be accepted anyway
+                return null;
+            }
+        }
+
+        $columnLabel = $this->getEntityColumnLabel($entity, $columnName);
+        if ($requiresLabel && $columnLabel === null) {
+            return null;
+        }
+
+        switch ($column['type']) {
+            case MvcEntity::BOOL:
+                $columnTag = 'radio';
+                $columnTagOptions = [
+                    'choices' => [
+                        ['value' => 1, 'label' => \XF::phrase('yes')],
+                        ['value' => 0, 'label' => \XF::phrase('no')],
+                    ]
+                ];
+                $columnFilter = 'bool';
+                break;
+            case MvcEntity::INT:
+                $columnTag = 'number-box';
+                $columnFilter = 'int';
+                break;
+            case MvcEntity::UINT:
+                $columnTag = 'number-box';
+                $columnTagOptions['min'] = 0;
+                $columnFilter = 'uint';
+                break;
+            case MvcEntity::STR:
+                if (isset($column['allowedValues'])) {
+                    $choices = [];
+                    foreach ($column['allowedValues'] as $allowedValue) {
+                        $label = $allowedValue;
+                        if (is_object($columnLabel) && $columnLabel instanceof \XF\Phrase) {
+                            $labelPhraseName = $columnLabel->getName() . '_' .
+                                preg_replace('/[^a-z]+/i', '_', $allowedValue);
+                            $label = \XF::phraseDeferred($labelPhraseName);
+                        }
+
+                        $choices[] = [
+                            'value' => $allowedValue,
+                            'label' => $label
+                        ];
+                    }
+
+                    $columnTag = 'select';
+                    $columnTagOptions = ['choices' => $choices];
+                } elseif (isset($column['maxLength']) && $column['maxLength'] <= 255) {
+                    $columnTag = 'text-box';
+                } else {
+                    $columnTag = 'text-area';
+                }
+                $columnFilter = 'str';
+                break;
+        }
+
+        if ($columnTag === null || $columnFilter === null) {
+            if (isset($column['inputFilter']) && isset($column['macroTemplate'])) {
+                $columnTag = 'custom';
+                $columnFilter = $column['inputFilter'];
+            }
+        }
+
+        if ($columnTag === null || $columnFilter === null) {
+            if (\XF::$debugMode) {
+                if ($columnTag === null) {
+                    throw new \Exception(
+                        "Cannot render column {$columnName}, " .
+                        "consider putting \`macroTemplate\` in getStructure for custom rendering."
+                    );
+                }
+
+                if ($columnFilter === null) {
+                    throw new \Exception(
+                        "Cannot detect filter data type for column {$columnName}, " .
+                        "consider putting \`inputFilter\` in getStructure to continue."
+                    );
+                }
+            }
+
+            return null;
+        }
+
+        return [
+            'filter' => $columnFilter,
+            'label' => $columnLabel,
+            'tag' => $columnTag,
+            'tagOptions' => $columnTagOptions,
+        ];
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Entity $entity
+     * @return array
+     * @throws \Exception
+     */
+    protected function entityGetMetadataForColumns($entity)
+    {
+        $columns = [];
+        $structure = $entity->structure();
+
+        $getterColumns = [];
+        foreach ($structure->getters as $getterKey => $getterCacheable) {
+            if (!$getterCacheable) {
+                continue;
+            }
+
+            $columnLabel = $this->getEntityColumnLabel($entity, $getterKey);
+            if ($columnLabel === null) {
+                continue;
+            }
+
+            $value = $entity->get($getterKey);
+            if (!($value instanceof \XF\Phrase)) {
+                continue;
+            }
+
+            $getterColumns[$getterKey] = [
+                'isGetter' => true,
+                'isNotValue' => true,
+                'isPhrase' => true,
+                'type' => MvcEntity::STR
+            ];
+        }
+
+        $structureColumns = array_merge($getterColumns, $structure->columns);
+        foreach ($structureColumns as $columnName => $column) {
+            $metadata = $this->entityGetMetadataForColumn($entity, $columnName, $column);
+            if (!is_array($metadata)) {
+                continue;
+            }
+
+            $columns[$columnName] = $metadata;
+            $columns[$columnName] += [
+                '_structureData' => $column,
+                'name' => sprintf('values[%s]', $columnName),
+                'value' => $entity->get($columnName),
+            ];
+        }
+
+        return $columns;
+    }
+
+    /**
+     * @return array
+     */
+    final protected function entityListData()
+    {
+        $shortName = $this->getShortName();
+        $finder = $this->finder($shortName);
+        $filters = ['pageNavParams' => []];
+
+        /** @var mixed $unknownFinder */
+        $unknownFinder = $finder;
+        $entityDoXfFilter = [$unknownFinder, 'entityDoXfFilter'];
+        if (is_callable($entityDoXfFilter)) {
+            $filter = $this->filter('_xfFilter', ['text' => 'str', 'prefix' => 'bool']);
+            if (strlen($filter['text']) > 0) {
+                call_user_func($entityDoXfFilter, $filter['text'], $filter['prefix']);
+                $filters['_xfFilter'] = $filter['text'];
+            }
+        }
+
+        $entityDoListData = [$unknownFinder, 'entityDoListData'];
+        if (is_callable($entityDoListData)) {
+            $filters = call_user_func($entityDoListData, $this, $filters);
+        } else {
+            $structure = $this->em()->getEntityStructure($shortName);
+            if (isset($structure->columns['display_order'])) {
+                $finder->setDefaultOrder('display_order');
+            }
+        }
+
+        return [$finder, $filters];
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Entity $entity
+     * @return FormAction
+     * @throws \Exception
+     */
+    protected function entitySaveProcess($entity)
+    {
+        $filters = [];
+        $columns = $this->entityGetMetadataForColumns($entity);
+        foreach ($columns as $columnName => $metadata) {
+            if (isset($metadata['_structureData']['isNotValue'])
+                && $metadata['_structureData']['isNotValue'] === true
+            ) {
+                continue;
+            }
+
+            $filters[$columnName] = $metadata['filter'];
+        }
+
+        $form = $this->formAction();
+        $input = $this->filter(['values' => $filters]);
+        $form->basicEntitySave($entity, $input['values']);
+
+        $form->setup(function (FormAction $form) use ($columns, $entity) {
+            $input = $this->filter([
+                'hidden_columns' => 'array-str',
+                'hidden_values' => 'array-str',
+                'values' => 'array',
+            ]);
+
+            foreach ($input['hidden_columns'] as $columnName) {
+                $entity->set(
+                    $columnName,
+                    isset($input['hidden_values'][$columnName]) ? $input['hidden_values'][$columnName] : ''
+                );
+            }
+
+            foreach ($columns as $columnName => $metadata) {
+                if (!isset($input['values'][$columnName])) {
+                    continue;
+                }
+
+                if (isset($metadata['_structureData']['isPhrase']) &&
+                    $metadata['_structureData']['isPhrase'] === true
+                ) {
+                    /** @var mixed $unknownEntity */
+                    $unknownEntity = $entity;
+                    $callable = [$unknownEntity, 'getMasterPhrase'];
+                    if (is_callable($callable)) {
+                        /** @var \XF\Entity\Phrase $masterPhrase */
+                        $masterPhrase = call_user_func($callable, $columnName);
+                        $masterPhrase->phrase_text = $input['values'][$columnName];
+                        $entity->addCascadedSave($masterPhrase);
+                    }
+                }
+            }
+        });
+
+        $form->setup(function (FormAction $form) use ($entity) {
+            $input = $this->filter([
+                'username_columns' => 'array-str',
+                'username_values' => 'array-str',
+            ]);
+
+            foreach ($input['username_columns'] as $columnName) {
+                $userId = 0;
+
+                if (isset($input['username_values'][$columnName])) {
+                    /** @var \XF\Repository\User $userRepo */
+                    $userRepo = $this->repository('XF:User');
+                    /** @var \XF\Entity\User|null $user */
+                    $user = $userRepo->getUserByNameOrEmail($input['username_values'][$columnName]);
+                    if ($user === null) {
+                        $form->logError(\XF::phrase('requested_user_not_found'));
+                    } else {
+                        $userId = $user->user_id;
+                    }
+                }
+
+                $entity->set($columnName, $userId);
+            }
+        });
+
+        return $form;
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return int
+     */
+    protected function getEntityIdFromParams(ParameterBag $params)
+    {
+        $structure = $this->em()->getEntityStructure($this->getShortName());
+        if (is_string($structure->primaryKey)) {
+            return $params->get($structure->primaryKey);
+        }
+
+        return 0;
+    }
+
+    /**
+     * @return int
+     */
+    protected function getPerPage()
+    {
+        return 20;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getViewLinks()
+    {
+        $routePrefix = $this->getRoutePrefix();
+        $links = [
+            'index' => $routePrefix,
+            'save' => sprintf('%s/save', $routePrefix)
+        ];
+
+        if ($this->supportsAdding()) {
+            $links['add'] = sprintf('%s/add', $routePrefix);
+        }
+
+        if ($this->supportsDeleting()) {
+            $links['delete'] = sprintf('%s/delete', $routePrefix);
+        }
+
+        if ($this->supportsEditing()) {
+            $links['edit'] = sprintf('%s/edit', $routePrefix);
+        }
+
+        if ($this->supportsViewing()) {
+            $links['view'] = sprintf('%s/view', $routePrefix);
+        }
+
+        if ($this->supportsXfFilter()) {
+            $links['quickFilter'] = $routePrefix;
+        }
+
+        return $links;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getViewPhrases()
+    {
+        $prefix = $this->getPrefixForPhrases();
+
+        $phrases = [];
+        foreach ([
+                     'add',
+                     'edit',
+                     'entities',
+                     'entity',
+                 ] as $partial) {
+            $phrases[$partial] = \XF::phrase(sprintf('%s_%s', $prefix, $partial));
+        }
+
+        return $phrases;
+    }
+
+    /**
+     * @param string $action
+     * @param array $viewParams
+     * @return \XF\Mvc\Reply\View
+     */
+    protected function getViewReply($action, array $viewParams)
+    {
+        $viewClass = sprintf('%s\Entity%s', $this->getShortName(), ucwords($action));
+        $templateTitle = sprintf('%s_entity_%s', $this->getPrefixForTemplates(), strtolower($action));
+
+        $viewParams['controller'] = $this;
+        $viewParams['links'] = $this->getViewLinks();
+        $viewParams['phrases'] = $this->getViewPhrases();
+
+        return $this->view($viewClass, $templateTitle, $viewParams);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function supportsAdding()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function supportsDeleting()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function supportsEditing()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function supportsViewing()
+    {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function supportsXfFilter()
+    {
+        /** @var mixed $unknownFinder */
+        $unknownFinder = $this->finder($this->getShortName());
+        return is_callable([$unknownFinder, 'entityDoXfFilter']);
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getShortName();
+
+    /**
+     * @return string
+     */
+    abstract protected function getPrefixForClasses();
+
+    /**
+     * @return string
+     */
+    abstract protected function getPrefixForPhrases();
+
+    /**
+     * @return string
+     */
+    abstract protected function getPrefixForTemplates();
+
+    /**
+     * @return string
+     */
+    abstract protected function getRoutePrefix();
+}
diff --git a/Entity/AuthCode.php b/Entity/AuthCode.php
new file mode 100644
index 00000000..c8127abb
--- /dev/null
+++ b/Entity/AuthCode.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Structure;
+use Xfrocks\Api\OAuth2\Server;
+
+/**
+ * COLUMNS
+ * @property int auth_code_id
+ * @property string auth_code_text
+ * @property string client_id
+ * @property int user_id
+ * @property int expire_date
+ * @property string redirect_uri
+ * @property string scope
+ *
+ * GETTERS
+ * @property string[] scopes
+ *
+ * RELATIONS
+ * @property \XF\Entity\User User
+ * @property \Xfrocks\Api\Entity\Client Client
+ */
+class AuthCode extends TokenWithScope
+{
+    /**
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->auth_code_text;
+    }
+
+    /**
+     * @param string $columnName
+     * @return \XF\Phrase|null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        switch ($columnName) {
+            case 'auth_code_text':
+            case 'client_id':
+            case 'expire_date':
+            case 'redirect_uri':
+            case 'scope':
+                return \XF::phrase('bdapi_' . $columnName);
+            case 'user_id':
+                return \XF::phrase('user_name');
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->auth_code_text;
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        /** @var Server $apiServer */
+        $apiServer = \XF::app()->container('api.server');
+
+        $structure->table = 'xf_bdapi_auth_code';
+        $structure->shortName = 'Xfrocks\Api:AuthCode';
+        $structure->primaryKey = 'auth_code_id';
+        $structure->columns = [
+            'auth_code_id' => ['type' => self::UINT, 'autoIncrement' => true],
+            'auth_code_text' => [
+                'type' => self::STR,
+                'maxLength' => 255,
+                'default' => $apiServer->generateSecureKey(),
+                'writeOnce' => true,
+            ],
+            'client_id' => ['type' => self::STR, 'maxLength' => 255, 'required' => true],
+            'user_id' => ['type' => self::UINT, 'default' => \XF::visitor()->user_id],
+            'expire_date' => ['type' => self::UINT, 'default' => \XF::$time + $apiServer->getOptionAuthCodeTTL()],
+            'redirect_uri' => ['type' => self::STR, 'required' => true],
+        ];
+        $structure->relations = [
+            'User' => [
+                'entity' => 'XF:User',
+                'type' => self::TO_ONE,
+                'conditions' => 'user_id',
+                'primary' => true
+            ],
+            'Client' => [
+                'entity' => 'Xfrocks\Api:Client',
+                'type' => self::TO_ONE,
+                'conditions' => 'client_id',
+                'primary' => true
+            ]
+        ];
+
+        self::addDefaultTokenElements($structure);
+
+        return $structure;
+    }
+}
diff --git a/Entity/Client.php b/Entity/Client.php
new file mode 100644
index 00000000..78614194
--- /dev/null
+++ b/Entity/Client.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Structure;
+use XF\Util\Arr;
+
+/**
+ * COLUMNS
+ * @property string name
+ * @property string description
+ * @property int user_id
+ * @property string redirect_uri
+ * @property string client_id
+ * @property string client_secret
+ * @property array options
+ *
+ * RELATIONS
+ * @property \XF\Entity\User User
+ */
+class Client extends Entity
+{
+    /**
+     * @return bool
+     */
+    public function canEdit()
+    {
+        $visitorUserId = \XF::visitor()->user_id;
+        return $visitorUserId > 0 && $visitorUserId === $this->user_id;
+    }
+
+    /**
+     * @param string $redirectUri
+     * @return bool
+     */
+    public function isValidRedirectUri($redirectUri)
+    {
+        if ($redirectUri === $this->redirect_uri) {
+            return true;
+        }
+
+        if (strpos($redirectUri, $this->app()->options()->boardUrl) === 0) {
+            return true;
+        }
+
+        if (!isset($this->options['whitelisted_domains'])) {
+            return false;
+        }
+
+        $parsed = parse_url($redirectUri);
+        if (!is_array($parsed) || !isset($parsed['scheme']) || !isset($parsed['host'])) {
+            return false;
+        }
+
+        $domains = explode("\n", $this->options['whitelisted_domains']);
+        foreach ($domains as $domain) {
+            if ($domain === '') {
+                continue;
+            }
+
+            $pattern = '#^';
+            for ($i = 0, $l = utf8_strlen($domain); $i < $l; $i++) {
+                $char = utf8_substr($domain, $i, 1);
+                if ($char === '*') {
+                    $pattern .= '.+';
+                } else {
+                    $pattern .= preg_quote($char, '#');
+                }
+            }
+            $pattern .= '$#';
+            if (preg_match($pattern, $parsed['host']) === 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array $options
+     * @return void
+     */
+    public function setClientOptions(array $options)
+    {
+        /** @var array|null $existing */
+        $existing = $this->options;
+        $this->options = Arr::mapMerge($existing !== null ? $existing : [], $options);
+    }
+
+    /**
+     * @param string $columnName
+     * @return \XF\Phrase|null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        switch ($columnName) {
+            case 'client_id':
+            case 'client_secret':
+            case 'redirect_uri':
+                return \XF::phrase('bdapi_' . $columnName);
+            case 'name':
+            case 'description':
+                return \XF::phrase('bdapi_client_' . $columnName);
+            case 'user_id':
+                return \XF::phrase('user_name');
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->name;
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        $structure->table = 'xf_bdapi_client';
+        $structure->shortName = 'Xfrocks\Api:Client';
+        $structure->primaryKey = 'client_id';
+        $structure->columns = [
+            'name' => ['type' => self::STR, 'maxLength' => 255, 'required' => true],
+            'description' => ['type' => self::STR, 'required' => true],
+            'user_id' => ['type' => self::UINT, 'default' => \XF::visitor()->user_id],
+            'redirect_uri' => ['type' => self::STR, 'required' => true],
+            'client_id' => [
+                'type' => self::STR,
+                'default' => \XF::generateRandomString(10),
+                'maxLength' => 255,
+                'unique' => true,
+                'writeOnce' => true,
+            ],
+            'client_secret' => [
+                'type' => self::STR,
+                'default' => \XF::generateRandomString(15),
+                'maxLength' => 255,
+            ],
+            'options' => ['type' => self::SERIALIZED_ARRAY]
+        ];
+        $structure->relations = [
+            'User' => [
+                'entity' => 'XF:User',
+                'type' => self::TO_ONE,
+                'conditions' => 'user_id',
+                'primary' => true
+            ]
+        ];
+
+        return $structure;
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postDelete()
+    {
+        $db = $this->db();
+
+        $db->delete('xf_bdapi_auth_code', 'client_id = ?', $this->client_id);
+        $db->delete('xf_bdapi_refresh_token', 'client_id = ?', $this->client_id);
+        $db->delete('xf_bdapi_token', 'client_id = ?', $this->client_id);
+        $db->delete('xf_bdapi_user_scope', 'client_id = ?', $this->client_id);
+
+        $this
+            ->app()
+            ->jobManager()
+            ->enqueueUnique('bdapi_' . $this->client_id, 'Xfrocks\Api\Job\ClientDelete', [
+                'clientId' => $this->client_id
+            ]);
+    }
+}
diff --git a/Entity/Log.php b/Entity/Log.php
new file mode 100644
index 00000000..89357983
--- /dev/null
+++ b/Entity/Log.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Structure;
+
+/**
+ * COLUMNS
+ * @property int|null log_id
+ * @property string client_id
+ * @property int user_id
+ * @property string ip_address
+ * @property int request_date
+ * @property string request_method
+ * @property string request_uri
+ * @property array request_data
+ * @property int response_code
+ * @property array response_output
+ *
+ * RELATIONS
+ * @property \XF\Entity\User User
+ */
+class Log extends Entity
+{
+    /**
+     * @param string $columnName
+     * @return null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->request_uri;
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        $structure->table = 'xf_bdapi_log';
+        $structure->primaryKey = 'log_id';
+        $structure->shortName = 'Xfrocks\Api:Log';
+        $structure->columns = [
+            'log_id' => ['type' => self::UINT, 'nullable' => true, 'autoIncrement' => true],
+            'client_id' => ['type' => self::STR, 'maxLength' => 255, 'default' => ''],
+            'user_id' => ['type' => self::UINT, 'required' => true],
+            'ip_address' => ['type' => self::STR, 'maxLength' => 50, 'required' => true],
+            'request_date' => ['type' => self::UINT, 'default' => \XF::$time],
+            'request_method' => ['type' => self::STR, 'maxLength' => 10, 'required' => true],
+            'request_uri' => ['type' => self::STR, 'required' => true],
+            'request_data' => ['type' => self::SERIALIZED_ARRAY, 'default' => []],
+            'response_code' => ['type' => self::UINT, 'default' => 0],
+            'response_output' => ['type' => self::SERIALIZED_ARRAY, 'default' => []]
+        ];
+
+        $structure->relations = [
+            'User' => [
+                'type' => self::TO_ONE,
+                'entity' => 'XF:User',
+                'conditions' => 'user_id',
+                'primary' => true
+            ]
+        ];
+
+        return $structure;
+    }
+}
diff --git a/Entity/RefreshToken.php b/Entity/RefreshToken.php
new file mode 100644
index 00000000..399e61ab
--- /dev/null
+++ b/Entity/RefreshToken.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Structure;
+use Xfrocks\Api\OAuth2\Server;
+
+/**
+ * COLUMNS
+ * @property int|null refresh_token_id
+ * @property string refresh_token_text
+ * @property string client_id
+ * @property int user_id
+ * @property int expire_date
+ * @property string scope
+ *
+ * GETTERS
+ * @property string[] scopes
+ *
+ * RELATIONS
+ * @property \XF\Entity\User User
+ * @property \Xfrocks\Api\Entity\Client Client
+ */
+class RefreshToken extends TokenWithScope
+{
+    public function getText()
+    {
+        return $this->refresh_token_text;
+    }
+
+    /**
+     * @param string $columnName
+     * @return \XF\Phrase|null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        switch ($columnName) {
+            case 'client_id':
+            case 'expire_date':
+            case 'refresh_token_text':
+            case 'scope':
+                return \XF::phrase('bdapi_' . $columnName);
+            case 'user_id':
+                return \XF::phrase('user_name');
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->refresh_token_text;
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        /** @var Server $apiServer */
+        $apiServer = \XF::app()->container('api.server');
+
+        $structure->table = 'xf_bdapi_refresh_token';
+        $structure->shortName = 'Xfrocks\Api:RefreshToken';
+        $structure->primaryKey = 'refresh_token_id';
+        $structure->columns = [
+            'refresh_token_id' => ['type' => self::UINT, 'autoIncrement' => true, 'nullable' => true],
+            'refresh_token_text' => [
+                'type' => self::STR,
+                'maxLength' => 255,
+                'default' => $apiServer->generateSecureKey(),
+                'writeOnce' => true,
+            ],
+            'client_id' => ['type' => self::STR, 'maxLength' => 255, 'required' => true],
+            'user_id' => ['type' => self::UINT, 'default' => \XF::visitor()->user_id],
+            'expire_date' => ['type' => self::UINT, 'default' => \XF::$time + $apiServer->getOptionRefreshTokenTTL()],
+        ];
+        $structure->relations = [
+            'User' => [
+                'entity' => 'XF:User',
+                'type' => self::TO_ONE,
+                'conditions' => 'user_id',
+                'primary' => true
+            ],
+            'Client' => [
+                'entity' => 'Xfrocks\Api:Client',
+                'type' => self::TO_ONE,
+                'conditions' => 'client_id',
+                'primary' => true
+            ]
+        ];
+
+        self::addDefaultTokenElements($structure);
+
+        return $structure;
+    }
+}
diff --git a/Entity/Subscription.php b/Entity/Subscription.php
new file mode 100644
index 00000000..a86d5fbe
--- /dev/null
+++ b/Entity/Subscription.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Structure;
+
+/**
+ * COLUMNS
+ * @property int|null subscription_id
+ * @property string client_id
+ * @property string callback
+ * @property string topic
+ * @property int subscribe_date
+ * @property int expire_date
+ *
+ * RELATIONS
+ * @property \Xfrocks\Api\Entity\Client Client
+ */
+class Subscription extends Entity
+{
+    const OPTION_UPDATE_CALLBACKS = 'updateCallbacks';
+
+    /**
+     * @param string $columnName
+     * @return \XF\Phrase|null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        switch ($columnName) {
+            case 'client_id':
+            case 'callback':
+            case 'expire_date':
+            case 'subscribe_date':
+                return \XF::phrase('bdapi_' . $columnName);
+            case 'topic':
+                return \XF::phrase('bdapi_subscription_' . $columnName);
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->topic;
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        $structure->table = 'xf_bdapi_subscription';
+        $structure->primaryKey = 'subscription_id';
+        $structure->shortName = 'Xfrocks\Api:Subscription';
+
+        $structure->columns = [
+            'subscription_id' => ['type' => self::UINT, 'nullable' => true, 'autoIncrement' => true],
+            'client_id' => ['type' => self::STR, 'required' => true, 'maxLength' => 255],
+            'callback' => ['type' => self::STR, 'required' => true],
+            'topic' => ['type' => self::STR, 'required' => true, 'maxLength' => 255, 'writeOnce' => true],
+            'subscribe_date' => ['type' => self::UINT, 'default' => \XF::$time],
+            'expire_date' => ['type' => self::UINT, 'default' => 0]
+        ];
+
+        $structure->options = [
+            self::OPTION_UPDATE_CALLBACKS => true
+        ];
+
+        $structure->relations = [
+            'Client' => [
+                'entity' => 'Xfrocks\Api:Client',
+                'type' => self::TO_ONE,
+                'conditions' => 'client_id',
+                'primary' => true
+            ]
+        ];
+
+        return $structure;
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postSave()
+    {
+        if ($this->getOption(self::OPTION_UPDATE_CALLBACKS) === true) {
+            $this->subscriptionRepo()->updateCallbacksForTopic($this->topic);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postDelete()
+    {
+        if ($this->getOption(self::OPTION_UPDATE_CALLBACKS) === true) {
+            $this->subscriptionRepo()->updateCallbacksForTopic($this->topic);
+        }
+    }
+
+    /**
+     * @return \Xfrocks\Api\Repository\Subscription
+     */
+    protected function subscriptionRepo()
+    {
+        /** @var \Xfrocks\Api\Repository\Subscription $subRepo */
+        $subRepo = $this->repository('Xfrocks\Api:Subscription');
+
+        return $subRepo;
+    }
+}
diff --git a/Entity/Token.php b/Entity/Token.php
new file mode 100644
index 00000000..d2542141
--- /dev/null
+++ b/Entity/Token.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Structure;
+use Xfrocks\Api\OAuth2\Server;
+
+/**
+ * COLUMNS
+ * @property int|null token_id
+ * @property string token_text
+ * @property string client_id
+ * @property int user_id
+ * @property int expire_date
+ * @property int issue_date
+ * @property string scope
+ *
+ * GETTERS
+ * @property string[] scopes
+ *
+ * RELATIONS
+ * @property \XF\Entity\User User
+ * @property \Xfrocks\Api\Entity\Client Client
+ */
+class Token extends TokenWithScope
+{
+    public function getText()
+    {
+        return $this->token_text;
+    }
+
+    /**
+     * @param string $columnName
+     * @return \XF\Phrase|null
+     */
+    public function getEntityColumnLabel($columnName)
+    {
+        switch ($columnName) {
+            case 'client_id':
+            case 'expire_date':
+            case 'scope':
+            case 'token_text':
+                return \XF::phrase('bdapi_' . $columnName);
+            case 'user_id':
+                return \XF::phrase('user_name');
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntityLabel()
+    {
+        return $this->token_text;
+    }
+
+    /**
+     * @return void
+     * @throws \XF\Db\Exception
+     */
+    protected function _postSave()
+    {
+        if ($this->isChanged('scope')) {
+            $this->updateUserScopes();
+        }
+    }
+
+    /**
+     * @return void
+     * @throws \XF\Db\Exception
+     */
+    protected function updateUserScopes()
+    {
+        $db = $this->db();
+
+        $values = [];
+        foreach ($this->getScopes() as $scope) {
+            $values[] = sprintf(
+                '(%s, %d, %s, %d)',
+                $db->quote($this->get('client_id')),
+                $this->get('user_id'),
+                $db->quote($scope),
+                \XF::$time
+            );
+        }
+        if (count($values) === 0) {
+            return;
+        }
+
+        $db->query('
+            INSERT IGNORE INTO `xf_bdapi_user_scope`
+            (`client_id`, `user_id`, `scope`, `accept_date`)
+            VALUES ' . implode(', ', $values) . ' 
+        ');
+    }
+
+    public static function getStructure(Structure $structure)
+    {
+        /** @var Server $apiServer */
+        $apiServer = \XF::app()->container('api.server');
+
+        $structure->table = 'xf_bdapi_token';
+        $structure->shortName = 'Xfrocks\Api:Token';
+        $structure->primaryKey = 'token_id';
+        $structure->columns = [
+            'token_id' => ['type' => self::UINT, 'autoIncrement' => true, 'nullable' => true],
+            'token_text' => [
+                'type' => self::STR,
+                'maxLength' => 255,
+                'default' => $apiServer->generateSecureKey(),
+                'writeOnce' => true,
+            ],
+            'client_id' => ['type' => self::STR, 'maxLength' => 255, 'required' => true],
+            'user_id' => ['type' => self::UINT, 'default' => \XF::visitor()->user_id],
+            'expire_date' => ['type' => self::UINT, 'default' => \XF::$time + $apiServer->getOptionAccessTokenTTL()],
+            'issue_date' => ['type' => self::UINT, 'default' => \XF::$time],
+        ];
+        $structure->relations = [
+            'User' => [
+                'entity' => 'XF:User',
+                'type' => self::TO_ONE,
+                'conditions' => 'user_id',
+                'primary' => true
+            ],
+            'Client' => [
+                'entity' => 'Xfrocks\Api:Client',
+                'type' => self::TO_ONE,
+                'conditions' => 'client_id',
+                'primary' => true
+            ]
+        ];
+
+        self::addDefaultTokenElements($structure);
+
+        return $structure;
+    }
+}
diff --git a/Entity/TokenWithScope.php b/Entity/TokenWithScope.php
new file mode 100644
index 00000000..dfe47be2
--- /dev/null
+++ b/Entity/TokenWithScope.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Structure;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Server;
+
+/**
+ * COLUMNS
+ * @property string scope
+ *
+ * GETTERS
+ * @property array scopes
+ */
+abstract class TokenWithScope extends Entity
+{
+    /**
+     * @return string
+     */
+    abstract public function getText();
+
+    /**
+     * @param string $newScope
+     * @return bool
+     */
+    public function associateScope($newScope)
+    {
+        $existingScopes = $this->scopes;
+        if (in_array($newScope, $existingScopes, true)) {
+            return false;
+        }
+
+        $scopes = $existingScopes + [$newScope];
+        sort($scopes);
+
+        $this->set('scope', implode(Listener::$scopeDelimiter, $scopes));
+        return true;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getScopes()
+    {
+        $scopes = preg_split('#\s#', $this->scope, -1, PREG_SPLIT_NO_EMPTY);
+        if (!is_array($scopes)) {
+            return [];
+        }
+
+        return array_map('trim', $scopes);
+    }
+
+    /**
+     * @param string $scope
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        $scopes = $this->scopes;
+        return in_array($scope, $scopes, true);
+    }
+
+    /**
+     * @param array $scopes
+     * @return void
+     */
+    public function setScopes(array $scopes)
+    {
+        $this->set('scope', implode(Listener::$scopeDelimiter, $scopes));
+        unset($this->_getterCache['scopes']);
+    }
+
+    /**
+     * @param Structure $structure
+     * @return Structure
+     */
+    protected static function addDefaultTokenElements(Structure $structure)
+    {
+        $structure->columns['scope'] = ['type' => self::STR, 'default' => Server::SCOPE_READ];
+        $structure->getters['scopes'] = true;
+
+        return $structure;
+    }
+}
diff --git a/Entity/UserScope.php b/Entity/UserScope.php
new file mode 100644
index 00000000..71ac6ae2
--- /dev/null
+++ b/Entity/UserScope.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Xfrocks\Api\Entity;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Structure;
+
+/**
+ * COLUMNS
+ * @property string client_id
+ * @property int user_id
+ * @property string scope
+ * @property int accept_date
+ *
+ * RELATIONS
+ * @property \Xfrocks\Api\Entity\Client Client
+ */
+class UserScope extends Entity
+{
+    public static function getStructure(Structure $structure)
+    {
+        $structure->table = 'xf_bdapi_user_scope';
+        $structure->shortName = 'Xfrocks\Api:UserScope';
+        $structure->primaryKey = ['client_id', 'user_id', 'scope'];
+        $structure->columns = [
+            'client_id' => ['type' => self::STR, 'maxLength' => 255, 'readOnly' => true],
+            'user_id' => ['type' => self::UINT, 'readOnly' => true],
+            'scope' => ['type' => self::STR, 'maxLength' => 255, 'readOnly' => true],
+            'accept_date' => ['type' => self::UINT, 'readOnly' => true]
+        ];
+
+        $structure->relations = [
+            'Client' => [
+                'type' => self::TO_ONE,
+                'entity' => 'Xfrocks\Api:Client',
+                'conditions' => 'client_id',
+                'primary' => true,
+            ]
+        ];
+
+        return $structure;
+    }
+}
diff --git a/Finder/AuthCode.php b/Finder/AuthCode.php
new file mode 100644
index 00000000..7de455af
--- /dev/null
+++ b/Finder/AuthCode.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class AuthCode extends \XF\Mvc\Entity\Finder
+{
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->with(['Client', 'User']);
+        $this->setDefaultOrder('auth_code_id', 'desc');
+
+        return $filters;
+    }
+
+    /**
+     * @param string $match
+     * @param bool $prefixMatch
+     * @return AuthCode
+     */
+    public function entityDoXfFilter($match, $prefixMatch = false)
+    {
+        if (strlen($match) > 0) {
+            $this->where(
+                $this->columnUtf8('auth_code_text'),
+                'LIKE',
+                $this->escapeLike($match, $prefixMatch ? '?%' : '%?%')
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/Finder/Client.php b/Finder/Client.php
new file mode 100644
index 00000000..7a539eda
--- /dev/null
+++ b/Finder/Client.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class Client extends \XF\Mvc\Entity\Finder
+{
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->with('User');
+
+        return $filters;
+    }
+
+    /**
+     * @param string $match
+     * @param bool $prefixMatch
+     * @return Client
+     */
+    public function entityDoXfFilter($match, $prefixMatch = false)
+    {
+        if (strlen($match) > 0) {
+            $this->where(
+                $this->columnUtf8('name'),
+                'LIKE',
+                $this->escapeLike($match, $prefixMatch ? '?%' : '%?%')
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/Finder/Log.php b/Finder/Log.php
new file mode 100644
index 00000000..2bbd69ed
--- /dev/null
+++ b/Finder/Log.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use XF\Mvc\Entity\Finder;
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class Log extends Finder
+{
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->setDefaultOrder('request_date', 'DESC');
+
+        return $filters;
+    }
+}
diff --git a/Finder/RefreshToken.php b/Finder/RefreshToken.php
new file mode 100644
index 00000000..962f398f
--- /dev/null
+++ b/Finder/RefreshToken.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class RefreshToken extends \XF\Mvc\Entity\Finder
+{
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->with(['Client', 'User']);
+        $this->setDefaultOrder('refresh_token_id', 'desc');
+
+        return $filters;
+    }
+
+    /**
+     * @param string $match
+     * @param bool $prefixMatch
+     * @return RefreshToken
+     */
+    public function entityDoXfFilter($match, $prefixMatch = false)
+    {
+        if (strlen($match) > 0) {
+            $this->where(
+                $this->columnUtf8('refresh_token_text'),
+                'LIKE',
+                $this->escapeLike($match, $prefixMatch ? '?%' : '%?%')
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/Finder/Subscription.php b/Finder/Subscription.php
new file mode 100644
index 00000000..cb59548c
--- /dev/null
+++ b/Finder/Subscription.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use XF\Mvc\Entity\Finder;
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class Subscription extends Finder
+{
+    /**
+     * @return Subscription
+     */
+    public function active()
+    {
+        $this->whereOr(
+            ['expire_date', 0],
+            ['expire_date', '>', \XF::$time]
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->with(['Client']);
+        $this->setDefaultOrder('subscription_id', 'desc');
+
+        return $filters;
+    }
+
+    /**
+     * @param string $match
+     * @param bool $prefixMatch
+     * @return Subscription
+     */
+    public function entityDoXfFilter($match, $prefixMatch = false)
+    {
+        if (strlen($match) > 0) {
+            $this->where(
+                $this->columnUtf8('topic'),
+                'LIKE',
+                $this->escapeLike($match, $prefixMatch ? '?%' : '%?%')
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/Finder/Token.php b/Finder/Token.php
new file mode 100644
index 00000000..abb2c43f
--- /dev/null
+++ b/Finder/Token.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Xfrocks\Api\Finder;
+
+use Xfrocks\Api\Admin\Controller\Entity;
+
+class Token extends \XF\Mvc\Entity\Finder
+{
+    /**
+     * @param Entity $controller
+     * @param array $filters
+     * @return array
+     */
+    public function entityDoListData($controller, array $filters)
+    {
+        $this->with(['Client', 'User']);
+        $this->setDefaultOrder('token_id', 'desc');
+
+        return $filters;
+    }
+
+    /**
+     * @param string $match
+     * @param bool $prefixMatch
+     * @return Token
+     */
+    public function entityDoXfFilter($match, $prefixMatch = false)
+    {
+        if (strlen($match) > 0) {
+            $this->where(
+                $this->columnUtf8('token_text'),
+                'LIKE',
+                $this->escapeLike($match, $prefixMatch ? '?%' : '%?%')
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/Job/ClientDelete.php b/Job/ClientDelete.php
new file mode 100644
index 00000000..ea021af0
--- /dev/null
+++ b/Job/ClientDelete.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Xfrocks\Api\Job;
+
+use XF\Job\AbstractJob;
+use XF\Timer;
+
+class ClientDelete extends AbstractJob
+{
+    /**
+     * @return bool
+     */
+    public function canTriggerByChoice()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function canCancel()
+    {
+        return false;
+    }
+
+    /**
+     * @param mixed $maxRunTime
+     * @return \XF\Job\JobResult
+     */
+    public function run($maxRunTime)
+    {
+        if (!isset($this->data['clientId'])) {
+            return $this->complete();
+        }
+
+        $timer = new Timer($maxRunTime);
+        $finder = $this->app
+            ->finder('Xfrocks\Api:Subscription')
+            ->where('client_id', $this->data['clientId']);
+
+        foreach ($finder->limit(100)->fetch() as $subscription) {
+            if ($timer->limitExceeded()) {
+                break;
+            }
+
+            $subscription->delete();
+        }
+
+        $remainTotal = $finder->total();
+        if ($remainTotal > 0) {
+            return $this->resume();
+        }
+
+        return $this->complete();
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatusMessage()
+    {
+        return '';
+    }
+}
diff --git a/Job/PingQueue.php b/Job/PingQueue.php
new file mode 100644
index 00000000..fb6e9fde
--- /dev/null
+++ b/Job/PingQueue.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Xfrocks\Api\Job;
+
+use XF\Job\AbstractJob;
+
+class PingQueue extends AbstractJob
+{
+    /**
+     * @return bool
+     */
+    public function canTriggerByChoice()
+    {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function canCancel()
+    {
+        return false;
+    }
+
+    /**
+     * @param mixed $maxRunTime
+     * @return \XF\Job\JobResult
+     */
+    public function run($maxRunTime)
+    {
+        /** @var \Xfrocks\Api\Repository\PingQueue $pingQueueRepo */
+        $pingQueueRepo = \XF::repository('Xfrocks\Api:PingQueue');
+
+        if ($pingQueueRepo->run($maxRunTime)) {
+            $resume = $this->resume();
+            $resume->continueDate = \XF::$time;
+
+            return $resume;
+        }
+
+        return $this->complete();
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatusMessage()
+    {
+        return '';
+    }
+}
diff --git a/Listener.php b/Listener.php
new file mode 100644
index 00000000..ef9992be
--- /dev/null
+++ b/Listener.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Xfrocks\Api;
+
+class Listener
+{
+    /**
+     * @var string
+     */
+    public static $accessTokenParamKey = 'oauth_token';
+
+    /**
+     * @var string
+     */
+    public static $apiDirName = 'api';
+
+    /**
+     * @var string
+     */
+    public static $routerType = 'XfrocksApi';
+
+    /**
+     * @var string
+     */
+    public static $scopeDelimiter = ' ';
+
+    /**
+     * @param \XF\App $app
+     * @return \Closure
+     */
+    public static function apiServer($app)
+    {
+        return function () use ($app) {
+            $class = $app->extendClass('Xfrocks\Api\OAuth2\Server');
+            return new $class($app);
+        };
+    }
+
+    /**
+     * @param \XF\App $app
+     * @return void
+     */
+    public static function appSetup($app)
+    {
+        $container = $app->container();
+
+        $apiConfig = $app->config('api');
+        if (is_array($apiConfig)) {
+            foreach ($apiConfig as $apiConfigKey => $apiConfigValue) {
+                switch ($apiConfigKey) {
+                    case 'accessTokenParamKey':
+                    case 'apiDirName':
+                    case 'routerType':
+                    case 'scopeDelimiter':
+                        // @phpstan-ignore-next-line
+                        self::$$apiConfigKey = $apiConfigValue;
+                        break;
+                }
+            }
+        }
+
+        if (!$container->offsetExists('api.server')) {
+            // this may have been done earlier by Xfrocks\Api\App
+            $container['api.server'] = self::apiServer($app);
+        }
+
+        $container['api.transformer'] = function () use ($app) {
+            $class = $app->extendClass('Xfrocks\Api\Transformer');
+            return new $class($app);
+        };
+
+        $container['router.' . self::$routerType] = function () use ($app) {
+            $class = $app->extendClass('Xfrocks\Api\Mvc\Router');
+            return new $class($app);
+        };
+
+        $addOnCache = $container['addon.cache'];
+        $extension = $app->extension();
+        if (isset($addOnCache['XFRM'])) {
+            $extension->addClassExtension('Xfrocks\Api\Controller\Search', 'Xfrocks\Api\XFRM\Controller\Search');
+            $extension->addClassExtension('Xfrocks\Api\Data\Modules', 'Xfrocks\Api\XFRM\Data\Modules');
+        }
+    }
+
+    /**
+     * @param \XF\Mvc\Dispatcher $dispatcher
+     * @param \XF\Mvc\RouteMatch $match
+     * @return void
+     */
+    public static function apiOnlyDispatcherMatch($dispatcher, &$match)
+    {
+        if ($match->getController() !== 'Xfrocks:Error') {
+            $request = $dispatcher->getRequest();
+
+            $action = $match->getAction();
+            $method = strtolower($request->getServer('REQUEST_METHOD'));
+            if ($method === 'get' && \XF::$debugMode) {
+                $methodDebug = $request->filter('_xfApiMethod', 'str');
+                if ($methodDebug !== '') {
+                    $method = strtolower($methodDebug);
+                }
+            }
+
+            switch ($method) {
+                case 'head':
+                    $method = 'get';
+                    break;
+                case 'options':
+                    $match->setParam('action', $match->getAction());
+                    $action = 'generic';
+                    break;
+            }
+
+            $match->setAction(sprintf('%s/%s', $method, $action));
+        }
+    }
+
+    /**
+     * @param \XF\Service\User\ContentChange $changeService
+     * @param array $updates
+     * @return void
+     */
+    public static function userContentChangeInit($changeService, array &$updates)
+    {
+        $updates['xf_bdapi_client'] = ['user_id'];
+    }
+}
diff --git a/Mvc/Reply/Api.php b/Mvc/Reply/Api.php
new file mode 100644
index 00000000..1ef43b0c
--- /dev/null
+++ b/Mvc/Reply/Api.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Xfrocks\Api\Mvc\Reply;
+
+class Api extends \XF\Mvc\Reply\View
+{
+    /**
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        parent::__construct('', '', $data);
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->params;
+    }
+
+    /**
+     * @param array $data
+     * @param bool $merge
+     * @return void
+     */
+    public function setData(array $data, $merge = true)
+    {
+        $this->setParams($data, $merge);
+    }
+}
diff --git a/Mvc/Router.php b/Mvc/Router.php
new file mode 100644
index 00000000..ed031e7a
--- /dev/null
+++ b/Mvc/Router.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Xfrocks\Api\Mvc;
+
+use XF\App;
+use Xfrocks\Api\Data\Modules;
+use Xfrocks\Api\Listener;
+
+class Router extends \XF\Mvc\Router
+{
+    /**
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * @param App $app
+     */
+    public function __construct($app)
+    {
+        $this->app = $app;
+
+        /** @var Modules $modules */
+        $modules = $app->data('Xfrocks\Api:Modules');
+
+        parent::__construct([$this, 'formatApiLink'], $modules->getRoutes());
+        $this->setPather($app->container('request.pather'));
+    }
+
+    /**
+     * @param mixed $link
+     * @param mixed|null $data
+     * @param array $parameters
+     * @param mixed|null $hash
+     * @return string
+     */
+    public function buildLink($link, $data = null, array $parameters = [], $hash = null)
+    {
+        if (!isset($parameters[Listener::$accessTokenParamKey])) {
+            /** @var mixed $session */
+            $session = $this->app->session();
+            $getTokenText = [$session, 'getTokenText'];
+            if (is_callable($getTokenText)) {
+                $parameters[Listener::$accessTokenParamKey] = call_user_func($getTokenText);
+            }
+        }
+
+        return parent::buildLink($link, $data, $parameters, $hash);
+    }
+
+    /**
+     * @param string $route
+     * @param string $queryString
+     * @return string
+     */
+    protected function formatApiLink($route, $queryString)
+    {
+        $suffix = $route . (strlen($queryString) > 0 ? '&' . $queryString : '');
+        return sprintf('%s/index.php%s', Listener::$apiDirName, strlen($suffix) > 0 ? ('?' . $suffix) : '');
+    }
+}
diff --git a/Mvc/Session/InMemoryStorage.php b/Mvc/Session/InMemoryStorage.php
new file mode 100644
index 00000000..e0628f25
--- /dev/null
+++ b/Mvc/Session/InMemoryStorage.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Xfrocks\Api\Mvc\Session;
+
+use XF\Session\StorageInterface;
+
+class InMemoryStorage implements StorageInterface
+{
+    /**
+     * @param mixed $sessionId
+     * @return bool
+     */
+    public function getSession($sessionId)
+    {
+        return false;
+    }
+
+    /**
+     * @param mixed $sessionId
+     * @return void
+     */
+    public function deleteSession($sessionId)
+    {
+        // no op
+    }
+
+    /**
+     * @param mixed $sessionId
+     * @param array $data
+     * @param mixed $lifetime
+     * @param mixed $existing
+     * @return void
+     */
+    public function writeSession($sessionId, array $data, $lifetime, $existing)
+    {
+        // no op
+    }
+
+    /**
+     * @return void
+     */
+    public function deleteExpiredSessions()
+    {
+        // no op
+    }
+}
diff --git a/OAuth2/Entity/AccessTokenHybrid.php b/OAuth2/Entity/AccessTokenHybrid.php
new file mode 100644
index 00000000..e81f5289
--- /dev/null
+++ b/OAuth2/Entity/AccessTokenHybrid.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use Xfrocks\Api\Entity\Token;
+
+class AccessTokenHybrid extends AccessTokenEntity
+{
+    /**
+     * @var Token
+     */
+    protected $xfToken;
+
+    /**
+     * @param AbstractServer $server
+     * @param Token $xfToken
+     */
+    public function __construct($server, $xfToken)
+    {
+        parent::__construct($server);
+
+        $this->xfToken = $xfToken;
+        $this->setId($xfToken->token_text);
+        $this->setExpireTime($xfToken->expire_date);
+    }
+
+    /**
+     * @return Token
+     */
+    public function getXfToken()
+    {
+        return $this->xfToken;
+    }
+}
diff --git a/OAuth2/Entity/AuthCodeHybrid.php b/OAuth2/Entity/AuthCodeHybrid.php
new file mode 100644
index 00000000..9ed4b0a4
--- /dev/null
+++ b/OAuth2/Entity/AuthCodeHybrid.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use Xfrocks\Api\Entity\AuthCode;
+
+class AuthCodeHybrid extends AuthCodeEntity
+{
+    /**
+     * @var AuthCode
+     */
+    protected $xfAuthCode;
+
+    /**
+     * @param AbstractServer $server
+     * @param AuthCode $xfAuthCode
+     */
+    public function __construct($server, $xfAuthCode)
+    {
+        parent::__construct($server);
+
+        $this->xfAuthCode = $xfAuthCode;
+        $this->setId($xfAuthCode->auth_code_text);
+        $this->setRedirectUri($xfAuthCode->redirect_uri);
+        $this->setExpireTime($xfAuthCode->expire_date);
+    }
+
+    /**
+     * @return AuthCode
+     */
+    public function getXfAuthCode()
+    {
+        return $this->xfAuthCode;
+    }
+}
diff --git a/OAuth2/Entity/ClientHybrid.php b/OAuth2/Entity/ClientHybrid.php
new file mode 100644
index 00000000..0bee2c5e
--- /dev/null
+++ b/OAuth2/Entity/ClientHybrid.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Entity\ClientEntity;
+use Xfrocks\Api\Entity\Client;
+
+class ClientHybrid extends ClientEntity
+{
+    /**
+     * @var Client
+     */
+    protected $xfClient;
+
+    /**
+     * @param AbstractServer $server
+     * @param Client $xfClient
+     */
+    public function __construct($server, $xfClient)
+    {
+        parent::__construct($server);
+
+        $this->xfClient = $xfClient;
+        $this->hydrate([
+            'id' => $xfClient->client_id,
+            'name' => $xfClient->name
+        ]);
+    }
+
+    /**
+     * @return Client
+     */
+    public function getXfClient()
+    {
+        return $this->xfClient;
+    }
+}
diff --git a/OAuth2/Entity/RefreshTokenHybrid.php b/OAuth2/Entity/RefreshTokenHybrid.php
new file mode 100644
index 00000000..cc34b597
--- /dev/null
+++ b/OAuth2/Entity/RefreshTokenHybrid.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Entity;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use Xfrocks\Api\Entity\RefreshToken;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\OAuth2\Storage\AccessTokenStorage;
+
+class RefreshTokenHybrid extends RefreshTokenEntity
+{
+    /**
+     * @var RefreshToken
+     */
+    protected $xfRefreshToken;
+
+    /**
+     * @param AbstractServer $server
+     * @param RefreshToken $xfRefreshToken
+     */
+    public function __construct($server, $xfRefreshToken)
+    {
+        parent::__construct($server);
+
+        $this->xfRefreshToken = $xfRefreshToken;
+        $this->setId($xfRefreshToken->refresh_token_text);
+        $this->setExpireTime($xfRefreshToken->expire_date);
+
+        /** @var AccessTokenStorage $accessTokenStorage */
+        $accessTokenStorage = $server->getAccessTokenStorage();
+        $fakeTokenText = $accessTokenStorage->generateFakeTokenText();
+
+        $xfApp = $xfRefreshToken->app();
+        /** @var Token $fakeAccessToken */
+        $fakeAccessToken = $xfApp->em()->instantiateEntity('Xfrocks\Api:Token', [
+            'token_id' => 0,
+            'token_text' => $fakeTokenText,
+            'client_id' => $xfRefreshToken->client_id,
+            'user_id' => $xfRefreshToken->user_id,
+            'scope' => $xfRefreshToken->scope
+        ]);
+        $accessToken = new AccessTokenHybrid($server, $fakeAccessToken);
+        $this->setAccessToken($accessToken);
+    }
+
+    /**
+     * @return RefreshToken
+     */
+    public function getXfRefreshToken()
+    {
+        return $this->xfRefreshToken;
+    }
+}
diff --git a/OAuth2/Grant/ImplicitGrant.php b/OAuth2/Grant/ImplicitGrant.php
new file mode 100644
index 00000000..2c034397
--- /dev/null
+++ b/OAuth2/Grant/ImplicitGrant.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Grant;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Grant\AbstractGrant;
+
+class ImplicitGrant extends AbstractGrant
+{
+    protected $identifier = 'implicit';
+
+    protected $responseType = 'token';
+
+    /**
+     * @param AccessTokenEntity $accessToken
+     * @param array $authParams
+     * @return mixed|string
+     */
+    public function authorize($accessToken, $authParams = [])
+    {
+        $redirectUri = $authParams['redirect_uri'];
+
+        $queryDelimiter = '#';
+        $redirectUri .= (strstr($authParams['redirect_uri'], $queryDelimiter) === false) ? $queryDelimiter : '&';
+
+        $redirectUri .= http_build_query([
+            'access_token' => $accessToken->getId(),
+            'token_type' => 'Bearer',
+            'expires_in' => $accessToken->getExpireTime() - time(),
+            'state' => $authParams['state'],
+        ]);
+
+        return $redirectUri;
+    }
+
+    public function completeFlow()
+    {
+        throw new \LogicException('This grant does not used this method');
+    }
+}
diff --git a/OAuth2/Server.php b/OAuth2/Server.php
new file mode 100644
index 00000000..d613ea0e
--- /dev/null
+++ b/OAuth2/Server.php
@@ -0,0 +1,585 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\AuthorizationServer;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Grant\AuthCodeGrant;
+use League\OAuth2\Server\Grant\ClientCredentialsGrant;
+use League\OAuth2\Server\Grant\PasswordGrant;
+use League\OAuth2\Server\Grant\RefreshTokenGrant;
+use League\OAuth2\Server\ResourceServer;
+use League\OAuth2\Server\Util\SecureKey;
+use Symfony\Component\HttpFoundation\Request;
+use XF\Container;
+use XF\Mvc\Controller;
+use Xfrocks\Api\App;
+use Xfrocks\Api\Controller\OAuth2;
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\Entity\RefreshToken;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Entity\AccessTokenHybrid;
+use Xfrocks\Api\OAuth2\Entity\ClientHybrid;
+use Xfrocks\Api\OAuth2\Entity\RefreshTokenHybrid;
+use Xfrocks\Api\OAuth2\Grant\ImplicitGrant;
+use Xfrocks\Api\OAuth2\Storage\AccessTokenStorage;
+use Xfrocks\Api\OAuth2\Storage\AuthCodeStorage;
+use Xfrocks\Api\OAuth2\Storage\ClientStorage;
+use Xfrocks\Api\OAuth2\Storage\RefreshTokenStorage;
+use Xfrocks\Api\OAuth2\Storage\ScopeStorage;
+use Xfrocks\Api\OAuth2\Storage\SessionStorage;
+use Xfrocks\Api\OAuth2\TokenType\BearerWithScope;
+use Xfrocks\Api\Util\Crypt;
+use Xfrocks\Api\Util\OneTimeToken;
+use Xfrocks\Api\XF\Pub\Controller\Account;
+
+class Server
+{
+    const SCOPE_READ = 'read';
+    const SCOPE_POST = 'post';
+    const SCOPE_MANAGE_ACCOUNT_SETTINGS = 'usercp';
+    const SCOPE_PARTICIPATE_IN_CONVERSATIONS = 'conversate';
+    const SCOPE_MANAGE_SYSTEM = 'admincp';
+
+    /**
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * @var Container
+     */
+    protected $container;
+
+    /**
+     * @var bool
+     */
+    protected $parsedRequest = false;
+
+    /**
+     * @param App $app
+     */
+    public function __construct($app)
+    {
+        require_once(dirname(__DIR__) . '/vendor/autoload.php');
+
+        $this->app = $app;
+
+        $this->container = new Container();
+
+        $this->container['grant.auth_code'] = function () {
+            $authCode = new AuthCodeGrant();
+            $authCode->setAuthTokenTTL($this->getOptionAuthCodeTTL());
+
+            return $authCode;
+        };
+
+        $this->container['grant.client_credentials'] = function () {
+            return new ClientCredentialsGrant();
+        };
+
+        $this->container['grant.implicit'] = function () {
+            return new ImplicitGrant();
+        };
+
+        $this->container['grant.password'] = function () {
+            return new PasswordGrant();
+        };
+
+        $this->container['grant.refresh_token'] = function () {
+            $refreshToken = new RefreshTokenGrant();
+            $refreshToken->setRefreshTokenTTL($this->getOptionRefreshTokenTTL());
+
+            return $refreshToken;
+        };
+
+        $this->container['request'] = function (Container $c) {
+            $request = Request::createFromGlobals();
+
+            // TODO: verify whether using token from query for all requests violates OAuth2 spec
+            $queryAccessToken = $request->query->get(Listener::$accessTokenParamKey, '');
+            if (strlen($queryAccessToken) > 0) {
+                $bodyAccessToken = $request->request->get(Listener::$accessTokenParamKey, '');
+                if ($bodyAccessToken === '') {
+                    $request->request->set(Listener::$accessTokenParamKey, $queryAccessToken);
+                }
+            }
+
+            return $request;
+        };
+
+        $this->container['server.auth'] = function (Container $c) {
+            $authorizationServer = new AuthorizationServer();
+            $authorizationServer->setAccessTokenTTL($this->getOptionAccessTokenTTL())
+                ->setDefaultScope(self::SCOPE_READ)
+                ->setScopeDelimiter(Listener::$scopeDelimiter)
+                ->addGrantType($c['grant.auth_code'])
+                ->addGrantType($c['grant.client_credentials'])
+                ->addGrantType($c['grant.password'])
+                ->addGrantType($c['grant.implicit'])
+                ->addGrantType($c['grant.refresh_token'])
+                ->setAccessTokenStorage($c['storage.access_token'])
+                ->setAuthCodeStorage($c['storage.auth_code'])
+                ->setClientStorage($c['storage.client'])
+                ->setRefreshTokenStorage($c['storage.refresh_token'])
+                ->setRequest($c['request'])
+                ->setScopeStorage($c['storage.scope'])
+                ->setSessionStorage($c['storage.session']);
+
+            $authorizationServer->setTokenType(new BearerWithScope());
+
+            return $authorizationServer;
+        };
+
+        $this->container['server.resource'] = function (Container $c) {
+            $resourceServer = new ResourceServer(
+                $c['storage.session'],
+                $c['storage.access_token'],
+                $c['storage.client'],
+                $c['storage.scope']
+            );
+            $resourceServer->setIdKey(Listener::$accessTokenParamKey)
+                ->setRequest($c['request']);
+
+            return $resourceServer;
+        };
+
+        $this->container['storage.access_token'] = function () {
+            return new AccessTokenStorage($this->app);
+        };
+
+        $this->container['storage.auth_code'] = function () {
+            return new AuthCodeStorage($this->app);
+        };
+
+        $this->container['storage.client'] = function () {
+            return new ClientStorage($this->app);
+        };
+
+        $this->container['storage.refresh_token'] = function () {
+            return new RefreshTokenStorage($this->app);
+        };
+
+        $this->container['storage.scope'] = function () {
+            return new ScopeStorage($this->app);
+        };
+
+        $this->container['storage.session'] = function () {
+            return new SessionStorage($this->app);
+        };
+    }
+
+    /**
+     * @param string|null $key
+     * @return Container|mixed
+     */
+    public function container($key = null)
+    {
+        return $key === null ? $this->container : $this->container[$key];
+    }
+
+    /**
+     * @return string
+     */
+    public function generateSecureKey()
+    {
+        return SecureKey::generate();
+    }
+
+    /**
+     * @return int
+     */
+    public function getOptionAccessTokenTTL()
+    {
+        return $this->app->options()->bdApi_tokenTTL;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOptionAuthCodeTTL()
+    {
+        return $this->app->options()->bdApi_authCodeTTL;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOptionRefreshTokenTTL()
+    {
+        return $this->app->options()->bdApi_refreshTokenTTLDays * 86400;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getScopeDefaults()
+    {
+        $scopes = [];
+        $scopes[] = Server::SCOPE_READ;
+        $scopes[] = Server::SCOPE_POST;
+        $scopes[] = Server::SCOPE_MANAGE_ACCOUNT_SETTINGS;
+        $scopes[] = Server::SCOPE_PARTICIPATE_IN_CONVERSATIONS;
+
+        return $scopes;
+    }
+
+    /**
+     * @param string $scopeId
+     * @return null|\XF\Phrase
+     */
+    public function getScopeDescription($scopeId)
+    {
+        switch ($scopeId) {
+            case self::SCOPE_READ:
+            case self::SCOPE_POST:
+            case self::SCOPE_MANAGE_ACCOUNT_SETTINGS:
+            case self::SCOPE_PARTICIPATE_IN_CONVERSATIONS:
+            case self::SCOPE_MANAGE_SYSTEM:
+                break;
+            default:
+                return null;
+        }
+
+        return \XF::phrase('bdapi_scope_' . $scopeId);
+    }
+
+    /**
+     * @param array $scopes
+     * @param AbstractServer $server
+     * @return array
+     */
+    public function getScopeObjArrayFromStrArray(array $scopes, $server)
+    {
+        $result = [];
+
+        foreach ($scopes as $scope) {
+            if (!is_string($scope)) {
+                continue;
+            }
+
+            $description = $this->getScopeDescription($scope);
+            if ($description === null) {
+                continue;
+            }
+
+            $result[$scope] = (new ScopeEntity($server))->hydrate([
+                'id' => $scope,
+                'description' => $description
+            ]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array $scopes
+     * @return array
+     */
+    public function getScopeStrArrayFromObjArray(array $scopes)
+    {
+        $scopeIds = [];
+
+        /** @var ScopeEntity $scope */
+        foreach ($scopes as $scope) {
+            $scopeIds[] = $scope->getId();
+        }
+
+        return $scopeIds;
+    }
+
+    /**
+     * @param Account $controller
+     * @return array
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \League\OAuth2\Server\Exception\InvalidGrantException
+     */
+    public function grantAuthCodeCheckParams($controller)
+    {
+        /** @var AuthorizationServer $authorizationServer */
+        $authorizationServer = $this->container['server.auth'];
+
+        /** @var AuthCodeGrant $authCodeGrant */
+        $authCodeGrant = $authorizationServer->getGrantType('authorization_code');
+
+        try {
+            $params = $authCodeGrant->checkAuthorizeParams();
+
+            if (isset($params['client'])) {
+                /** @var ClientHybrid $client */
+                $client = $params['client'];
+                $params['client'] = $client->getXfClient();
+            }
+
+            if (isset($params['scopes'])) {
+                $scopes = $params['scopes'];
+                $params['scopes'] = $this->getScopeStrArrayFromObjArray($scopes);
+            }
+
+            return $params;
+        } catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+            throw $this->buildControllerException($controller, $e);
+        }
+    }
+
+    /**
+     * @param Account $controller
+     * @param array $params
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \League\OAuth2\Server\Exception\InvalidGrantException
+     * @throws \League\OAuth2\Server\Exception\UnsupportedResponseTypeException
+     * @throws \XF\PrintableException
+     */
+    public function grantAuthCodeNewAuthRequest($controller, array $params)
+    {
+        /** @var AuthorizationServer $authorizationServer */
+        $authorizationServer = $this->container['server.auth'];
+
+        $userId = $this->app->session()->get(SessionStorage::SESSION_KEY_USER_ID);
+        $responseType = isset($params['response_type']) ? $params['response_type'] : 'code';
+        switch ($responseType) {
+            case 'code':
+                /** @var AuthCodeGrant $authCodeGrant */
+                $authCodeGrant = $authorizationServer->getGrantType('authorization_code');
+                $authCodeType = SessionStorage::OWNER_TYPE_USER;
+                $authCodeTypeId = $userId;
+                $authCodeParams = $params;
+
+                if (isset($authCodeParams['client'])) {
+                    /** @var Client $xfClient */
+                    $xfClient = $authCodeParams['client'];
+                    $authCodeParams['client'] = $authorizationServer->getClientStorage()->get($xfClient->client_id);
+                }
+
+                if (isset($authCodeParams['scopes'])) {
+                    $scopes = $authCodeParams['scopes'];
+                    $authCodeParams['scopes'] = $this->getScopeObjArrayFromStrArray($scopes, $authorizationServer);
+                }
+
+                $redirectUri = $authCodeGrant->newAuthorizeRequest($authCodeType, $authCodeTypeId, $authCodeParams);
+                break;
+            case 'token':
+                $accessToken = $this->newAccessToken($userId, $params['client'], $params['scopes']);
+                /** @var ImplicitGrant $implicitGrant */
+                $implicitGrant = $authorizationServer->getGrantType('implicit');
+                $redirectUri = $implicitGrant->authorize($accessToken, $params);
+                break;
+            default:
+                throw new \League\OAuth2\Server\Exception\UnsupportedResponseTypeException(
+                    $responseType,
+                    $params['redirect_uri']
+                );
+        }
+
+        return $controller->redirect($redirectUri);
+    }
+
+    /**
+     * @param OAuth2 $controller
+     * @return array
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \League\OAuth2\Server\Exception\InvalidGrantException
+     * @throws \XF\PrintableException
+     */
+    public function grantFinalize($controller)
+    {
+        /** @var AuthorizationServer $authorizationServer */
+        $authorizationServer = $this->container['server.auth'];
+
+        $request = $authorizationServer->getRequest()->request;
+        $clientId = $request->get('client_id', '');
+        $password = $request->get('password', '');
+        $passwordAlgo = $request->get('password_algo', '');
+        if (strlen($clientId) > 0 && strlen($password) > 0 && strlen($passwordAlgo) > 0) {
+            /** @var Client|null $client */
+            $client = $this->app->find('Xfrocks\Api:Client', $clientId);
+            if ($client !== null) {
+                $decryptedPassword = Crypt::decrypt($password, $passwordAlgo, $client->client_secret);
+                if ($decryptedPassword !== false) {
+                    $request->set('client_secret', $client->client_secret);
+                    $request->set('password', $decryptedPassword);
+                    $request->set('password_algo', '');
+                }
+            }
+        }
+
+        $grantType = $request->get('grant_type', '');
+        if ($grantType === 'password') {
+            $scope = $request->get('scope', '');
+            if ($scope === '') {
+                $scopeDefaults = implode(Listener::$scopeDelimiter, $this->getScopeDefaults());
+                $request->set('scope', $scopeDefaults);
+            }
+        }
+
+        /** @var PasswordGrant $passwordGrant */
+        $passwordGrant = $authorizationServer->getGrantType('password');
+        $passwordGrant->setVerifyCredentialsCallback(function ($username, $password) use ($controller) {
+            return $controller->verifyCredentials($username, $password);
+        });
+
+        $db = $controller->app()->db();
+        $db->beginTransaction();
+        try {
+            $data = $authorizationServer->issueAccessToken();
+
+            $db->commit();
+
+            return $data;
+        } catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+            $db->rollback();
+
+            throw $this->buildControllerException($controller, $e);
+        }
+    }
+
+    /**
+     * @param mixed $userId
+     * @param Client $client
+     * @param string[] $scopes
+     * @return AccessTokenEntity
+     * @throws \XF\PrintableException
+     */
+    public function newAccessToken($userId, $client, array $scopes)
+    {
+        /** @var Token $xfToken */
+        $xfToken = $this->app->em()->create('Xfrocks\Api:Token');
+        $xfToken->client_id = $client->client_id;
+        $xfToken->expire_date = time() + $this->getOptionAccessTokenTTL();
+        $xfToken->user_id = intval($userId);
+        $xfToken->setScopes($scopes);
+        $xfToken->save();
+
+        /** @var AuthorizationServer $authorizationServer */
+        $authorizationServer = $this->container['server.auth'];
+
+        return new AccessTokenHybrid($authorizationServer, $xfToken);
+    }
+
+    /**
+     * @param mixed $userId
+     * @param Client $client
+     * @param string[] $scopes
+     * @return RefreshTokenHybrid
+     * @throws \XF\PrintableException
+     */
+    public function newRefreshToken($userId, $client, array $scopes)
+    {
+        /** @var RefreshToken $xfRefreshToken */
+        $xfRefreshToken = $this->app->em()->create('Xfrocks\Api:RefreshToken');
+        $xfRefreshToken->client_id = $client->client_id;
+        $xfRefreshToken->expire_date = time() + $this->getOptionRefreshTokenTTL();
+        $xfRefreshToken->user_id = intval($userId);
+        $xfRefreshToken->setScopes($scopes);
+        $xfRefreshToken->save();
+
+        /** @var AuthorizationServer $authorizationServer */
+        $authorizationServer = $this->container['server.auth'];
+
+        return new RefreshTokenHybrid($authorizationServer, $xfRefreshToken);
+    }
+
+    /**
+     * @return AccessTokenHybrid|null
+     */
+    public function parseRequest()
+    {
+        if ($this->parsedRequest) {
+            throw new \RuntimeException('Cannot parse request twice');
+        }
+
+        $this->parsedRequest = true;
+
+        /** @var ResourceServer $resourceServer */
+        $resourceServer = $this->container['server.resource'];
+
+        try {
+            $xfToken = OneTimeToken::parse($this, $resourceServer->determineAccessToken(false));
+            if ($xfToken !== null) {
+                return new AccessTokenHybrid($resourceServer, $xfToken);
+            }
+        } catch (\League\OAuth2\Server\Exception\InvalidRequestException $ire) {
+            // request does not have an access token, no need to go further
+            return null;
+        }
+
+        $accessDenied = false;
+        try {
+            $resourceServer->isValidRequest(false);
+        } catch (\League\OAuth2\Server\Exception\AccessDeniedException $ade) {
+            $accessDenied = true;
+        } catch (\League\OAuth2\Server\Exception\OAuthException $e) {
+            // ignore other exception
+        }
+
+        if ($accessDenied) {
+            return null;
+        }
+
+        /** @var AccessTokenHybrid|null $accessTokenHybrid */
+        $accessTokenHybrid = $resourceServer->getAccessToken();
+
+        return $accessTokenHybrid;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     */
+    public function setRequestQuery($key, $value)
+    {
+        $this->app->request()->set($key, $value);
+
+        /** @var Request $request */
+        $request = $this->container['request'];
+        $request->query->set($key, $value);
+    }
+
+    /**
+     * @param Controller $controller
+     * @param \League\OAuth2\Server\Exception\OAuthException $e
+     * @return \XF\Mvc\Reply\Exception
+     */
+    protected function buildControllerException($controller, $e)
+    {
+        $errors = [];
+        if ($e->errorType !== '') {
+            switch ($e->errorType) {
+                case 'access_denied':
+                case 'invalid_client':
+                case 'invalid_grant':
+                case 'invalid_scope':
+                case 'unauthorized_client':
+                case 'unsupported_grant_type':
+                case 'unsupported_response_type':
+                    $errors[] = \XF::phrase('bdapi_oauth2_error_' . $e->errorType);
+                    break;
+                case 'invalid_credentials':
+                    $errors[] = \XF::phrase('incorrect_password');
+                    break;
+                case 'server_error':
+                    $errors[] = \XF::phrase('server_error_occurred');
+                    break;
+            }
+        }
+        if (count($errors) === 0) {
+            $errors[] = $e->getMessage();
+        }
+
+        if ($e->httpStatusCode >= 500) {
+            \XF::logException($e, false, 'API:', true);
+        }
+
+        if ($e->shouldRedirect()) {
+            return $controller->exception($controller->redirect($e->getRedirectUri()));
+        }
+
+        // TODO: include $e->getHttpHeaders() data
+
+        return $controller->errorException($errors, $e->httpStatusCode);
+    }
+}
diff --git a/OAuth2/Storage/AbstractStorage.php b/OAuth2/Storage/AbstractStorage.php
new file mode 100644
index 00000000..d7f4c296
--- /dev/null
+++ b/OAuth2/Storage/AbstractStorage.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\AbstractServer;
+use League\OAuth2\Server\Storage\StorageInterface;
+use Xfrocks\Api\App;
+use Xfrocks\Api\Entity\TokenWithScope;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Server;
+
+abstract class AbstractStorage implements StorageInterface
+{
+    /**
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * @var AbstractServer
+     */
+    protected $server;
+
+    /**
+     * @var array
+     */
+    protected $xfEntities = [];
+
+    /**
+     * @param App $app
+     */
+    public function __construct($app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * @param AbstractServer $server
+     * @return void
+     */
+    final public function setServer(AbstractServer $server)
+    {
+        $this->server = $server;
+    }
+
+    /**
+     * @param TokenWithScope $xfEntity
+     * @return bool
+     * @throws \Exception
+     * @throws \XF\PrintableException
+     */
+    protected function doXfEntityDelete($xfEntity)
+    {
+        $deleted = $xfEntity->delete(true, false);
+
+        if ($deleted) {
+            $text = $xfEntity->getText();
+            if (isset($this->xfEntities[$text])) {
+                unset($this->xfEntities[$text]);
+            }
+        }
+
+        return $deleted;
+    }
+
+    /**
+     * @param string $shortName
+     * @param string $textColumn
+     * @param string $text
+     * @return TokenWithScope|null
+     */
+    protected function doXfEntityFind($shortName, $textColumn, $text)
+    {
+        if (isset($this->xfEntities[$text])) {
+            return $this->xfEntities[$text];
+        }
+
+        $with = $this->getXfEntityWith();
+
+        /** @var TokenWithScope|null $xfEntity */
+        $xfEntity = $this->app->em()->findOne($shortName, [$textColumn => $text], $with);
+        if ($xfEntity !== null) {
+            $this->xfEntities[$text] = $xfEntity;
+        }
+
+        return $xfEntity;
+    }
+
+    /**
+     * @param TokenWithScope $xfEntity
+     * @return bool
+     * @throws \Exception
+     * @throws \XF\PrintableException
+     */
+    protected function doXfEntitySave($xfEntity)
+    {
+        $saved = $xfEntity->save(true, false);
+
+        if ($saved) {
+            $text = $xfEntity->getText();
+            $this->xfEntities[$text] = $xfEntity;
+        }
+
+        return $saved;
+    }
+
+    /**
+     * @param array $scopes
+     * @return string
+     */
+    protected function scopeBuildStrFromObjArray(array $scopes)
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+        $scopeIds = $apiServer->getScopeStrArrayFromObjArray($scopes);
+
+        return implode(Listener::$scopeDelimiter, $scopeIds);
+    }
+
+    /**
+     * @param array $scopes
+     * @return array
+     */
+    protected function scopeBuildObjArrayFromStrArray(array $scopes)
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+        return $apiServer->getScopeObjArrayFromStrArray($scopes, $this->server);
+    }
+
+    /**
+     * @return array
+     */
+    protected function getXfEntityWith()
+    {
+        return [];
+    }
+}
diff --git a/OAuth2/Storage/AccessTokenStorage.php b/OAuth2/Storage/AccessTokenStorage.php
new file mode 100644
index 00000000..9b9ff8cd
--- /dev/null
+++ b/OAuth2/Storage/AccessTokenStorage.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Storage\AccessTokenInterface;
+use League\OAuth2\Server\Util\SecureKey;
+use XF\Repository\User;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\OAuth2\Entity\AccessTokenHybrid;
+
+class AccessTokenStorage extends AbstractStorage implements AccessTokenInterface
+{
+    /**
+     * @var array
+     */
+    protected $fakeTokenTexts = [];
+
+    /**
+     * @param AccessTokenEntity $token
+     * @param ScopeEntity $scope
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function associateScope(AccessTokenEntity $token, ScopeEntity $scope)
+    {
+        $hybrid = $this->getHybrid($token);
+        if ($hybrid === null) {
+            throw new \RuntimeException('Access token cloud not be found ' . $token->getId());
+        }
+
+        $xfToken = $hybrid->getXfToken();
+        if ($xfToken->associateScope($scope->getId())) {
+            $this->doXfEntitySave($xfToken);
+        }
+    }
+
+    /**
+     * @param string $token
+     * @param int $expireTime
+     * @param int|string $sessionId
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function create($token, $expireTime, $sessionId)
+    {
+        /** @var SessionStorage $sessionStorage */
+        $sessionStorage = $this->server->getSessionStorage();
+        /** @var array $sessionCache */
+        $sessionCache = $sessionStorage->getInMemoryCache($sessionId, true);
+
+        /** @var Token $xfToken */
+        $xfToken = $this->app->em()->create('Xfrocks\Api:Token');
+        $xfToken->bulkSet([
+            'client_id' => $sessionCache[SessionStorage::SESSION_KEY_CLIENT_ID],
+            'token_text' => $token,
+            'expire_date' => $expireTime,
+            'user_id' => $sessionCache[SessionStorage::SESSION_KEY_USER_ID]
+        ]);
+        $xfToken->setScopes($sessionCache[SessionStorage::SESSION_KEY_SCOPES]);
+
+        $this->doXfEntitySave($xfToken);
+    }
+
+    /**
+     * @param AccessTokenEntity $token
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function delete(AccessTokenEntity $token)
+    {
+        if (isset($this->fakeTokenTexts[$token->getId()])) {
+            return;
+        }
+
+        $hybrid = $this->getHybrid($token);
+        if ($hybrid === null) {
+            return;
+        }
+
+        $this->doXfEntityDelete($hybrid->getXfToken());
+    }
+
+    /**
+     * @return string
+     */
+    public function generateFakeTokenText()
+    {
+        $tokenText = SecureKey::generate();
+
+        $this->fakeTokenTexts[$tokenText] = true;
+
+        return $tokenText;
+    }
+
+    /**
+     * @param string $token
+     * @return AccessTokenHybrid|null
+     */
+    public function get($token)
+    {
+        /** @var Token|null $xfToken */
+        $xfToken = $this->doXfEntityFind('Xfrocks\Api:Token', 'token_text', $token);
+        if ($xfToken === null) {
+            return null;
+        }
+
+        return new AccessTokenHybrid($this->server, $xfToken);
+    }
+
+    public function getScopes(AccessTokenEntity $token)
+    {
+        /** @var AccessTokenHybrid $accessTokenHybrid */
+        $accessTokenHybrid = $token;
+        return $this->scopeBuildObjArrayFromStrArray($accessTokenHybrid->getXfToken()->scopes);
+    }
+
+    /**
+     * @param AccessTokenEntity $token
+     * @return AccessTokenHybrid|null
+     */
+    protected function getHybrid($token)
+    {
+        if ($token instanceof AccessTokenHybrid) {
+            return $token;
+        }
+
+        return $this->get($token->getId());
+    }
+
+    protected function getXfEntityWith()
+    {
+        /** @var User $userRepo */
+        $userRepo = $this->app->repository('XF:User');
+        $userWith = $userRepo->getVisitorWith();
+
+        $with = array_map(function ($with) {
+            return 'User.' . $with;
+        }, $userWith);
+
+        return $with;
+    }
+}
diff --git a/OAuth2/Storage/AuthCodeStorage.php b/OAuth2/Storage/AuthCodeStorage.php
new file mode 100644
index 00000000..c3d0fa7e
--- /dev/null
+++ b/OAuth2/Storage/AuthCodeStorage.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Storage\AuthCodeInterface;
+use Xfrocks\Api\Entity\AuthCode;
+use Xfrocks\Api\OAuth2\Entity\AuthCodeHybrid;
+
+class AuthCodeStorage extends AbstractStorage implements AuthCodeInterface
+{
+    /**
+     * @param AuthCodeEntity $token
+     * @param ScopeEntity $scope
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function associateScope(AuthCodeEntity $token, ScopeEntity $scope)
+    {
+        $hybrid = $this->getHybrid($token);
+        if ($hybrid === null) {
+            return;
+        }
+
+        $xfAuthCode = $hybrid->getXfAuthCode();
+        if ($xfAuthCode->associateScope($scope->getId())) {
+            $this->doXfEntitySave($xfAuthCode);
+        }
+    }
+
+    /**
+     * @param string $token
+     * @param int $expireTime
+     * @param int $sessionId
+     * @param string $redirectUri
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function create($token, $expireTime, $sessionId, $redirectUri)
+    {
+        /** @var SessionStorage $sessionStorage */
+        $sessionStorage = $this->server->getSessionStorage();
+        /** @var array $sessionCache */
+        $sessionCache = $sessionStorage->getInMemoryCache($sessionId, true);
+
+        /** @var AuthCode $xfAuthCode */
+        $xfAuthCode = $this->app->em()->create('Xfrocks\Api:AuthCode');
+        $xfAuthCode->bulkSet([
+            'client_id' => $sessionCache[SessionStorage::SESSION_KEY_CLIENT_ID],
+            'auth_code_text' => $token,
+            'redirect_uri' => $redirectUri,
+            'expire_date' => $expireTime,
+            'user_id' => $sessionCache[SessionStorage::SESSION_KEY_USER_ID]
+        ]);
+        $xfAuthCode->setScopes($sessionCache[SessionStorage::SESSION_KEY_SCOPES]);
+
+        $this->doXfEntitySave($xfAuthCode);
+    }
+
+    /**
+     * @param AuthCodeEntity $token
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function delete(AuthCodeEntity $token)
+    {
+        $hybrid = $this->getHybrid($token);
+        if ($hybrid !== null) {
+            $this->doXfEntityDelete($hybrid->getXfAuthCode());
+        }
+    }
+
+    /**
+     * @param string $code
+     * @return AuthCodeHybrid|null
+     */
+    public function get($code)
+    {
+        /** @var AuthCode|null $xfAuthCode */
+        $xfAuthCode = $this->doXfEntityFind('Xfrocks\Api:AuthCode', 'auth_code_text', $code);
+        if ($xfAuthCode === null) {
+            return null;
+        }
+
+        return new AuthCodeHybrid($this->server, $xfAuthCode);
+    }
+
+    public function getScopes(AuthCodeEntity $token)
+    {
+        $hybrid = $this->getHybrid($token);
+        if ($hybrid === null) {
+            return [];
+        }
+
+        return $this->scopeBuildObjArrayFromStrArray($hybrid->getXfAuthCode()->scopes);
+    }
+
+    /**
+     * @param AuthCodeEntity $token
+     * @return AuthCodeHybrid|null
+     */
+    protected function getHybrid($token)
+    {
+        if ($token instanceof AuthCodeHybrid) {
+            return $token;
+        }
+
+        return $this->get($token->getId());
+    }
+}
diff --git a/OAuth2/Storage/ClientStorage.php b/OAuth2/Storage/ClientStorage.php
new file mode 100644
index 00000000..85ce6c83
--- /dev/null
+++ b/OAuth2/Storage/ClientStorage.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Storage\ClientInterface;
+use Xfrocks\Api\OAuth2\Entity\ClientHybrid;
+
+class ClientStorage extends AbstractStorage implements ClientInterface
+{
+    public function get($clientId, $clientSecret = null, $redirectUri = null, $grantType = null)
+    {
+        /** @var \Xfrocks\Api\Entity\Client|null $xfClient */
+        $xfClient = $this->doXfEntityFind('Xfrocks\Api:Client', 'client_id', $clientId);
+        if ($xfClient === null) {
+            return null;
+        }
+
+        if ($clientSecret !== null && $xfClient->client_secret !== $clientSecret) {
+            return null;
+        }
+
+        if ($redirectUri !== null && !$xfClient->isValidRedirectUri($redirectUri)) {
+            return null;
+        }
+
+        return new ClientHybrid($this->server, $xfClient);
+    }
+
+    public function getBySession(SessionEntity $session)
+    {
+        /** @var SessionStorage $sessionStorage */
+        $sessionStorage = $this->server->getSessionStorage();
+        $sessionCache = $sessionStorage->getInMemoryCache($session->getId());
+        if (!isset($sessionCache[SessionStorage::SESSION_KEY_CLIENT_ID])) {
+            return null;
+        }
+
+        return $this->get($sessionCache[SessionStorage::SESSION_KEY_CLIENT_ID]);
+    }
+}
diff --git a/OAuth2/Storage/RefreshTokenStorage.php b/OAuth2/Storage/RefreshTokenStorage.php
new file mode 100644
index 00000000..4d3964c9
--- /dev/null
+++ b/OAuth2/Storage/RefreshTokenStorage.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\RefreshTokenEntity;
+use League\OAuth2\Server\Storage\RefreshTokenInterface;
+use Xfrocks\Api\Entity\RefreshToken;
+use Xfrocks\Api\OAuth2\Entity\AccessTokenHybrid;
+use Xfrocks\Api\OAuth2\Entity\RefreshTokenHybrid;
+
+class RefreshTokenStorage extends AbstractStorage implements RefreshTokenInterface
+{
+    /**
+     * @param string $token
+     * @return RefreshTokenHybrid|null
+     */
+    public function get($token)
+    {
+        /** @var RefreshToken|null $xfRefreshToken */
+        $xfRefreshToken = $this->doXfEntityFind('Xfrocks\Api:RefreshToken', 'refresh_token_text', $token);
+        if ($xfRefreshToken === null) {
+            return null;
+        }
+
+        return new RefreshTokenHybrid($this->server, $xfRefreshToken);
+    }
+
+    /**
+     * @param string $token
+     * @param int $expireTime
+     * @param string $accessToken
+     * @return RefreshTokenHybrid
+     * @throws \XF\PrintableException
+     */
+    public function create($token, $expireTime, $accessToken)
+    {
+        /** @var AccessTokenHybrid $accessTokenHybrid */
+        $accessTokenHybrid = $this->server->getAccessTokenStorage()->get($accessToken);
+        $xfToken = $accessTokenHybrid->getXfToken();
+
+        /** @var RefreshToken $xfRefreshToken */
+        $xfRefreshToken = $this->app->em()->create('Xfrocks\Api:RefreshToken');
+        $xfRefreshToken->bulkSet([
+            'client_id' => $xfToken->client_id,
+            'refresh_token_text' => $token,
+            'expire_date' => $expireTime,
+            'user_id' => $xfToken->user_id,
+            'scope' => $xfToken->scope
+        ]);
+
+        $this->doXfEntitySave($xfRefreshToken);
+
+        return new RefreshTokenHybrid($this->server, $xfRefreshToken);
+    }
+
+    /**
+     * @param RefreshTokenEntity $token
+     * @return void
+     * @throws \XF\PrintableException
+     */
+    public function delete(RefreshTokenEntity $token)
+    {
+        /** @var RefreshTokenHybrid $hybrid */
+        $hybrid = $token;
+
+        if (!$token instanceof RefreshTokenHybrid) {
+            $hybrid = $this->get($token->getId());
+            if ($hybrid === null) {
+                return;
+            }
+        }
+
+        $this->doXfEntityDelete($hybrid->getXfRefreshToken());
+    }
+}
diff --git a/OAuth2/Storage/ScopeStorage.php b/OAuth2/Storage/ScopeStorage.php
new file mode 100644
index 00000000..13f539eb
--- /dev/null
+++ b/OAuth2/Storage/ScopeStorage.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Storage\ScopeInterface;
+use Xfrocks\Api\OAuth2\Server;
+
+class ScopeStorage extends AbstractStorage implements ScopeInterface
+{
+    public function get($scope, $grantType = null, $clientId = null)
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+        $description = $apiServer->getScopeDescription($scope);
+        if ($description === null) {
+            return null;
+        }
+
+        $result = new ScopeEntity($this->server);
+        $result->hydrate([
+            'id' => $scope,
+            'description' => $description
+        ]);
+
+        return $result;
+    }
+}
diff --git a/OAuth2/Storage/SessionStorage.php b/OAuth2/Storage/SessionStorage.php
new file mode 100644
index 00000000..2e18b90a
--- /dev/null
+++ b/OAuth2/Storage/SessionStorage.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\Storage;
+
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\AuthCodeEntity;
+use League\OAuth2\Server\Entity\ScopeEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
+use League\OAuth2\Server\Storage\SessionInterface;
+use Xfrocks\Api\OAuth2\Entity\AccessTokenHybrid;
+use Xfrocks\Api\OAuth2\Entity\AuthCodeHybrid;
+
+class SessionStorage extends AbstractStorage implements SessionInterface
+{
+    const OWNER_TYPE_CLIENT = 'client';
+    const OWNER_TYPE_USER = 'user';
+
+    const SESSION_KEY_CLIENT_ID = 'clientId';
+    const SESSION_KEY_SCOPES = 'scopes';
+    const SESSION_KEY_USER_ID = 'userId';
+
+    /**
+     * @var array
+     */
+    protected $sessions = [];
+
+    /**
+     * @param int|string $sessionId
+     * @param bool $throw
+     * @return array|null
+     */
+    public function getInMemoryCache($sessionId, $throw = false)
+    {
+        if (!isset($this->sessions[$sessionId])) {
+            if ($throw) {
+                throw new \InvalidArgumentException('Session could not be found ' . $sessionId);
+            }
+            return null;
+        }
+
+        return $this->sessions[$sessionId];
+    }
+
+    public function getByAccessToken(AccessTokenEntity $accessToken)
+    {
+        /** @var AccessTokenHybrid $accessTokenHybrid */
+        $accessTokenHybrid = $accessToken;
+        $xfToken = $accessTokenHybrid->getXfToken();
+
+        $result = new SessionEntity($this->server);
+
+        $sessionId = md5($xfToken->token_text);
+        $result->setId($sessionId);
+
+        $userId = $xfToken->user_id;
+        $result->setOwner(self::OWNER_TYPE_USER, strval($userId));
+
+        $this->sessions[$sessionId] = [
+            self::SESSION_KEY_CLIENT_ID => $xfToken->client_id,
+            self::SESSION_KEY_SCOPES => $xfToken->scopes,
+            self::SESSION_KEY_USER_ID => $userId
+        ];
+
+        return $result;
+    }
+
+    public function getByAuthCode(AuthCodeEntity $authCode)
+    {
+        /** @var AuthCodeHybrid $authCodeHybrid */
+        $authCodeHybrid = $authCode;
+        $xfAuthCode = $authCodeHybrid->getXfAuthCode();
+
+        $session = new SessionEntity($this->server);
+
+        $sessionId = md5($xfAuthCode->auth_code_text);
+        $session->setId($sessionId);
+
+        $userId = $xfAuthCode->user_id;
+        $session->setOwner(self::OWNER_TYPE_USER, strval($userId));
+
+        $this->sessions[$sessionId] = [
+            self::SESSION_KEY_CLIENT_ID => $xfAuthCode->client_id,
+            self::SESSION_KEY_SCOPES => $xfAuthCode->scopes,
+            self::SESSION_KEY_USER_ID => $userId
+        ];
+
+        return $session;
+    }
+
+    public function getScopes(SessionEntity $session)
+    {
+        $sessionId = strval($session->getId());
+        if ($sessionId === '') {
+            return [];
+        }
+
+        $cache = $this->getInMemoryCache($sessionId);
+        if (!is_array($cache) || !isset($cache[self::SESSION_KEY_SCOPES])) {
+            return [];
+        }
+
+        return $this->scopeBuildObjArrayFromStrArray($cache[self::SESSION_KEY_SCOPES]);
+    }
+
+    public function create($ownerType, $ownerId, $clientId, $clientRedirectUri = null)
+    {
+        $sessionId = count($this->sessions) + 1;
+
+        $cache = [
+            self::SESSION_KEY_CLIENT_ID => $clientId,
+            self::SESSION_KEY_SCOPES => []
+        ];
+
+        if ($ownerType === self::OWNER_TYPE_USER) {
+            $cache[self::SESSION_KEY_USER_ID] = $ownerId;
+        } else {
+            $cache[self::SESSION_KEY_USER_ID] = 0;
+        }
+
+        $this->sessions[$sessionId] = $cache;
+
+        return $sessionId;
+    }
+
+    public function associateScope(SessionEntity $session, ScopeEntity $scope)
+    {
+        $sessionId = $session->getId();
+        $cache = $this->getInMemoryCache($sessionId, true);
+
+        if (!isset($cache[self::SESSION_KEY_SCOPES])) {
+            $cache[self::SESSION_KEY_SCOPES] = [];
+        }
+        $scopesRef =& $cache[self::SESSION_KEY_SCOPES];
+
+        $scopeId = $scope->getId();
+        if (in_array($scopeId, $scopesRef, true)) {
+            return;
+        }
+
+        $scopesRef[] = $scopeId;
+        $this->sessions[$sessionId] = $cache;
+    }
+}
diff --git a/OAuth2/TokenType/BearerWithScope.php b/OAuth2/TokenType/BearerWithScope.php
new file mode 100644
index 00000000..c8700e9c
--- /dev/null
+++ b/OAuth2/TokenType/BearerWithScope.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Xfrocks\Api\OAuth2\TokenType;
+
+use League\OAuth2\Server\TokenType\Bearer;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Storage\SessionStorage;
+
+class BearerWithScope extends Bearer
+{
+    public function generateResponse()
+    {
+        $response = parent::generateResponse();
+
+        if ($this->session !== null) {
+            $scopes = $this->session->getScopes();
+            $scopeIds = [];
+            foreach ($scopes as $scope) {
+                $scopeIds[] = $scope->getId();
+            }
+            $response['scope'] = implode(Listener::$scopeDelimiter, $scopeIds);
+
+            if ($this->session->getOwnerType() === SessionStorage::OWNER_TYPE_USER) {
+                $response['user_id'] = intval($this->session->getOwnerId());
+            }
+        }
+
+        return $response;
+    }
+}
diff --git a/Option/ColumnOption.php b/Option/ColumnOption.php
new file mode 100644
index 00000000..b8ffce8a
--- /dev/null
+++ b/Option/ColumnOption.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Xfrocks\Api\Option;
+
+class ColumnOption extends \XF\Option\AbstractOption
+{
+    /**
+     * @param int $value
+     * @param \XF\Entity\Option $option
+     * @return bool
+     * @throws \XF\PrintableException
+     */
+    public static function verifyOnOffOption(&$value, $option)
+    {
+        if ($value === 0) {
+            // no verify when disable the option
+            return true;
+        }
+
+        $subscriptionTopicType = preg_replace('/^.+subscription/', '', $option->option_id);
+        switch ($subscriptionTopicType) {
+            case 'User':
+                $table = 'xf_user_option';
+                break;
+            case 'UserNotification':
+                $table = 'xf_user_option';
+                break;
+            case 'ThreadPost':
+                $table = 'xf_thread';
+                break;
+            default:
+                throw new \XF\PrintableException(sprintf('Unsupported option %s', $subscriptionTopicType));
+        }
+
+        $column = \XF::app()
+            ->options()
+            ->offsetGet('bdApi_subscriptionColumn' . $subscriptionTopicType);
+
+        if (!self::checkColumnExists($table, $column, $option)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $value
+     * @param \XF\Entity\Option $option
+     * @return bool
+     * @throws \XF\PrintableException
+     */
+    public static function verifyTextboxOption(&$value, $option)
+    {
+        $subscriptionTopicType = preg_replace('/^.+subscriptionColumn/', '', $option->option_id);
+        switch ($subscriptionTopicType) {
+            case 'User':
+                $table = 'xf_user_option';
+                break;
+            case 'UserNotification':
+                $table = 'xf_user_option';
+                break;
+            case 'ThreadPost':
+                $table = 'xf_thread';
+                break;
+            default:
+                throw new \XF\PrintableException(sprintf('Unsupported option %s', $subscriptionTopicType));
+        }
+
+        if (strlen($value) > 0 && !self::checkColumnExists($table, $value, $option)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $table
+     * @param string $column
+     * @param \XF\Entity\Option $option
+     * @return bool
+     */
+    protected static function checkColumnExists($table, $column, $option)
+    {
+        $existed = \XF::db()->fetchOne(sprintf('SHOW COLUMNS FROM `%s` LIKE "%s"', $table, $column));
+        if (!$existed) {
+            $option->error(\XF::phrase('bdapi_column_x_table_y_not_found_for_field_z', [
+                'column' => $column,
+                'table' => $table,
+                'field' => $option->option_id,
+            ]));
+
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Pub/View/Misc/ApiData.php b/Pub/View/Misc/ApiData.php
new file mode 100644
index 00000000..ffbab24e
--- /dev/null
+++ b/Pub/View/Misc/ApiData.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Xfrocks\Api\Pub\View\Misc;
+
+use Xfrocks\Api\Util\Cors;
+
+class ApiData extends \XF\Mvc\View
+{
+    /**
+     * @return string|false
+     */
+    public function renderRaw()
+    {
+        Cors::addHeaders($this->response);
+
+        if (isset($this->params['callback']) && strlen($this->params['callback']) > 0) {
+            $this->response->contentType('application/x-javascript');
+            return sprintf('%s(%s);', $this->params['callback'], json_encode($this->params['data']));
+        } else {
+            $this->response->contentType('application/json');
+            return json_encode($this->params['data']);
+        }
+    }
+}
diff --git a/Pub/View/Subscription/Post.php b/Pub/View/Subscription/Post.php
new file mode 100644
index 00000000..b06aef4f
--- /dev/null
+++ b/Pub/View/Subscription/Post.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Xfrocks\Api\Pub\View\Subscription;
+
+use XF\Mvc\View;
+
+class Post extends View
+{
+    /**
+     * @return string
+     */
+    public function renderRaw()
+    {
+        if (isset($this->params['httpResponseCode'])) {
+            $this->response->httpCode($this->params['httpResponseCode']);
+        }
+
+        if (isset($this->params['message'])) {
+            return $this->params['message'];
+        } else {
+            return '';
+        }
+    }
+}
diff --git a/Repository/AuthCode.php b/Repository/AuthCode.php
new file mode 100644
index 00000000..ad5f7c86
--- /dev/null
+++ b/Repository/AuthCode.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+
+class AuthCode extends Repository
+{
+    /**
+     * @return int
+     */
+    public function deleteExpiredAuthCodes()
+    {
+        return $this->db()->delete('xf_bdapi_auth_code', 'expire_date < ?', \XF::$time);
+    }
+
+    /**
+     * @param string $clientId
+     * @param int $userId
+     * @return int
+     */
+    public function deleteAuthCodes($clientId, $userId)
+    {
+        return $this->db()->delete(
+            'xf_bdapi_auth_code',
+            'client_id = ? AND user_id = ?',
+            [$clientId, $userId]
+        );
+    }
+}
diff --git a/Repository/Client.php b/Repository/Client.php
new file mode 100644
index 00000000..4d600604
--- /dev/null
+++ b/Repository/Client.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+
+class Client extends Repository
+{
+    /**
+     * @param int $userId
+     * @return \XF\Mvc\Entity\Finder
+     */
+    public function findUserClients($userId)
+    {
+        $finder = $this->finder('Xfrocks\Api:Client');
+        $finder->where('user_id', $userId);
+
+        return $finder;
+    }
+}
diff --git a/Repository/Log.php b/Repository/Log.php
new file mode 100644
index 00000000..c5dc19ba
--- /dev/null
+++ b/Repository/Log.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+use Xfrocks\Api\Transform\LazyTransformer;
+use Xfrocks\Api\XF\ApiOnly\Session\Session;
+
+class Log extends Repository
+{
+    /**
+     * @var int
+     */
+    protected static $logging = 1;
+
+    /**
+     * @return void
+     */
+    public function pauseLogging()
+    {
+        self::$logging--;
+    }
+
+    /**
+     * @return void
+     */
+    public function resumeLogging()
+    {
+        self::$logging++;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function pruneExpired()
+    {
+        $days = $this->options()->bdApi_logRetentionDays;
+        $cutoff = \XF::$time - $days * 86400;
+
+        return $this->db()->delete('xf_bdapi_log', 'request_date < ?', $cutoff);
+    }
+
+    /**
+     * @param string $requestMethod
+     * @param string $requestUri
+     * @param array $requestData
+     * @param int $responseCode
+     * @param array $responseOutput
+     * @param array $bulkSet
+     * @return bool
+     * @throws \XF\PrintableException
+     */
+    public function logRequest(
+        $requestMethod,
+        $requestUri,
+        array $requestData,
+        $responseCode,
+        array $responseOutput,
+        array $bulkSet = []
+    ) {
+        if (self::$logging < 1) {
+            return false;
+        }
+
+        $days = $this->options()->bdApi_logRetentionDays;
+        if ($days == 0) {
+            return false;
+        }
+
+        /** @var \Xfrocks\Api\Entity\Log $log */
+        $log = $this->em->create('Xfrocks\Api:Log');
+
+        $log->bulkSet($bulkSet);
+        if (!isset($bulkSet['client_id'])) {
+            /** @var Session $session */
+            $session = $this->app()->session();
+            $token = $session->getToken();
+            $log->client_id = '';
+
+            if ($token !== null) {
+                $log->client_id = $token->client_id;
+            }
+        }
+
+        if (!isset($bulkSet['user_id'])) {
+            $log->user_id = \XF::visitor()->user_id;
+        }
+
+        if (!isset($bulkSet['ip_address'])) {
+            $log->ip_address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '';
+        }
+
+        $log->request_method = $requestMethod;
+        $log->request_uri = $requestUri;
+        $log->request_data = $this->filterData($requestData);
+        $log->response_code = $responseCode;
+        $log->response_output = $this->filterData($responseOutput);
+
+        return $log->save(false, false);
+    }
+
+    /**
+     * @param array $data
+     * @param int $level
+     * @return array
+     */
+    protected function filterData(array &$data, $level = 0)
+    {
+        $filtered = array();
+
+        foreach ($data as $key => &$value) {
+            $keyFirstChar = substr($key, 0, 1);
+            if ($keyFirstChar === '.'
+                || $keyFirstChar === '_'
+            ) {
+                continue;
+            }
+
+            if (is_array($value)) {
+                if ($level < 3) {
+                    $filtered[$key] = $this->filterData($value, $level + 1);
+                } else {
+                    $filtered[$key] = '(array)';
+                }
+            } else {
+                if (is_bool($value) || is_string($value) || is_numeric($value)) {
+                    $filtered[$key] = $value;
+                } elseif (is_object($value)) {
+                    if ($value instanceof \XF\Phrase) {
+                        $filtered[$key] = $value->getName();
+                    } elseif ($value instanceof LazyTransformer) {
+                        $filtered[$key] = $value->getLogData();
+                    } else {
+                        $filtered[$key] = get_class($value);
+                    }
+                } else {
+                    $filtered[$key] = '?';
+                }
+            }
+        }
+
+        return $filtered;
+    }
+}
diff --git a/Repository/PingQueue.php b/Repository/PingQueue.php
new file mode 100644
index 00000000..27023de2
--- /dev/null
+++ b/Repository/PingQueue.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use GuzzleHttp\Exception\ClientException;
+use XF\Mvc\Entity\Repository;
+use XF\Util\Php;
+
+class PingQueue extends Repository
+{
+    /**
+     * @param string $callback
+     * @param string $objectType
+     * @param array $data
+     * @param int $expireDate
+     * @param int $queueDate
+     * @return void
+     */
+    public function insertQueue($callback, $objectType, array $data, $expireDate = 0, $queueDate = 0)
+    {
+        $this->db()->insert('xf_bdapi_ping_queue', array(
+            'callback_md5' => md5($callback),
+            'callback' => $callback,
+            'object_type' => $objectType,
+            'data' => serialize($data),
+            'queue_date' => $queueDate,
+            'expire_date' => $expireDate,
+        ));
+
+        $triggerDate = null;
+        if ($queueDate > 0) {
+            $triggerDate = $queueDate;
+        }
+
+        $this->app()
+            ->jobManager()
+            ->enqueueLater(__CLASS__, $triggerDate, 'Xfrocks\Api\Job\PingQueue', [], false);
+    }
+
+    /**
+     * @param array $records
+     * @return void
+     */
+    public function reInsertQueue(array $records)
+    {
+        foreach ($records as $record) {
+            $data = $record['data'];
+
+            if (!isset($data['_retries'])) {
+                $data['_retries'] = 0;
+            } else {
+                $data['_retries']++;
+            }
+            if ($data['_retries'] > 5) {
+                // too many tries
+                continue;
+            }
+
+            $queueDate = time() + intval(60 * pow(2, $data['_retries'] - 1));
+
+            $this->insertQueue($record['callback'], $record['object_type'], $data, $record['expire_date'], $queueDate);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasQueue()
+    {
+        $minId = $this->db()->fetchOne('
+            SELECT MIN(ping_queue_id)
+			FROM xf_bdapi_ping_queue
+			WHERE queue_date < ?
+        ', \XF::$time);
+
+        return (bool)$minId;
+    }
+
+    /**
+     * @param int $limit
+     * @return array
+     */
+    public function getQueue($limit = 20)
+    {
+        $queueRecords = $this->db()->fetchAllKeyed($this->db()->limit('
+            SELECT *
+			FROM xf_bdapi_ping_queue
+			WHERE queue_date < ?
+			ORDER BY callback_md5
+        ', $limit), 'ping_queue_id', [\XF::$time]);
+
+        foreach ($queueRecords as &$record) {
+            $record['data'] = Php::safeUnserialize($record['data']);
+        }
+
+        return $queueRecords;
+    }
+
+    /**
+     * @param int $maxRunTime
+     * @return bool
+     */
+    public function run($maxRunTime)
+    {
+        $s = microtime(true);
+
+        do {
+            $queueRecords = $this->getQueue($maxRunTime > 0 ? 20 : 0);
+
+            $this->ping($queueRecords);
+
+            if ($maxRunTime > 0 && microtime(true) - $s > $maxRunTime) {
+                break;
+            }
+        } while ($queueRecords);
+
+        return $this->hasQueue();
+    }
+
+    /**
+     * @param array $queueRecords
+     * @return void
+     */
+    public function ping(array $queueRecords)
+    {
+        while (count($queueRecords) > 0) {
+            $records = [];
+
+            foreach (array_keys($queueRecords) as $key) {
+                if (count($records) == 0
+                    || $queueRecords[$key]['callback'] === $records[0]['callback']
+                ) {
+                    $record = $queueRecords[$key];
+                    unset($queueRecords[$key]);
+
+                    if (!$this->db()->delete(
+                        'xf_bdapi_ping_queue',
+                        'ping_queue_id = ' . intval($record['ping_queue_id'])
+                    )
+                    ) {
+                        // already been deleted - run elsewhere
+                        continue;
+                    }
+
+                    if ($record['expire_date'] > 0 and $record['expire_date'] < \XF::$time) {
+                        // expired
+                        continue;
+                    }
+
+                    $records[] = $record;
+                }
+            }
+
+            $payloads = $this->preparePayloadsFromRecords($records);
+            if (count($payloads) === 0) {
+                continue;
+            }
+
+            $client = $this->app()->http()->client();
+            $reInserted = false;
+
+            try {
+                $response = $client->post($records[0]['callback'], [
+                    'json' => $payloads
+                ]);
+
+                $responseBody = $response->getBody()->getContents();
+                $responseCode = $response->getStatusCode();
+            } catch (ClientException $e) {
+                $response = null;
+                $responseBody = $e->getMessage();
+                $responseCode = 500;
+            }
+
+            if ($responseCode < 200 or $responseCode > 299) {
+                $this->reInsertQueue($records);
+                $reInserted = true;
+            }
+
+            if (\XF::$debugMode || $reInserted) {
+                /** @var Log $logRepo */
+                $logRepo = $this->repository('Xfrocks\Api:Log');
+                $logRepo->logRequest(
+                    'POST',
+                    $records[0]['callback'],
+                    $payloads,
+                    $responseCode,
+                    array('message' => $responseBody),
+                    array(
+                        'client_id' => '',
+                        'user_id' => 0,
+                        'ip_address' => '127.0.0.1',
+                    )
+                );
+            }
+        }
+    }
+
+    /**
+     * @param array $records
+     * @return array
+     */
+    protected function preparePayloadsFromRecords(array $records)
+    {
+        $dataByTypes = array();
+        foreach ($records as $key => $record) {
+            /** @var string $objectTypeRef */
+            $objectTypeRef =& $record['object_type'];
+
+            if (!isset($dataByTypes[$objectTypeRef])) {
+                $dataByTypes[$objectTypeRef] = array();
+            }
+            $dataRef =& $dataByTypes[$objectTypeRef];
+
+            $dataRef[$key] = $record['data'];
+        }
+
+        /** @var Subscription $subscriptionRepo */
+        $subscriptionRepo = $this->repository('Xfrocks\Api:Subscription');
+        $payloadsByTypes = [];
+        foreach ($dataByTypes as $objectType => &$dataManyRef) {
+            $payloadsByTypes[$objectType] = $subscriptionRepo->preparePingDataMany($objectType, $dataManyRef);
+        }
+
+        $payloads = array();
+        foreach ($records as $key => $record) {
+            $objectTypeRef =& $record['object_type'];
+
+            if (!isset($payloadsByTypes[$objectTypeRef])) {
+                continue;
+            }
+            $payloadsRef =& $payloadsByTypes[$objectTypeRef];
+
+            if (!isset($payloadsRef[$key])) {
+                continue;
+            }
+            $payloads[$key] = $payloadsRef[$key];
+        }
+
+        return $payloads;
+    }
+}
diff --git a/Repository/RefreshToken.php b/Repository/RefreshToken.php
new file mode 100644
index 00000000..f1563a74
--- /dev/null
+++ b/Repository/RefreshToken.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+
+class RefreshToken extends Repository
+{
+    /**
+     * @return int
+     */
+    public function deleteExpiredRefreshTokens()
+    {
+        return $this->db()->delete('xf_bdapi_refresh_token', 'expire_date < ?', \XF::$time);
+    }
+
+    /**
+     * @param string $clientId
+     * @param int $userId
+     * @return int
+     */
+    public function deleteRefreshTokens($clientId, $userId)
+    {
+        return $this->db()->delete(
+            'xf_bdapi_refresh_token',
+            'client_id = ? AND user_id = ?',
+            [$clientId, $userId]
+        );
+    }
+}
diff --git a/Repository/Search.php b/Repository/Search.php
new file mode 100644
index 00000000..df86aac0
--- /dev/null
+++ b/Repository/Search.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Entity\Forum;
+use XF\Http\Request;
+use XF\Mvc\Entity\Repository;
+use XF\PrintableException;
+use XF\Repository\Node;
+use Xfrocks\Api\Data\Params;
+
+class Search extends Repository
+{
+    const OPTION_SEARCH_TYPE = 'searchType';
+
+    /**
+     * @param Params $input
+     * @param string $contentType
+     * @param array $constraints
+     * @param array $options
+     * @return \XF\Entity\Search|null
+     * @throws PrintableException
+     */
+    public function search(Params $input, $contentType = '', array $constraints = [], array $options = [])
+    {
+        $httpRequest = new Request($this->app()->inputFilterer(), $input->getFilteredValues());
+
+        $searcher = $this->app()->search();
+        $query = $searcher->getQuery();
+
+        if ($contentType !== '') {
+            $typeHandler = $searcher->handler($contentType);
+            $urlConstraints = [];
+
+            $query->forTypeHandler($typeHandler, $httpRequest, $urlConstraints);
+        }
+
+        if (isset($input['q']) && strlen($input['q']) > 0) {
+            $query->withKeywords($input['q']);
+        }
+
+        if (isset($input['user_id']) && $input['user_id'] > 0) {
+            $query->byUserId($input['user_id']);
+        }
+
+        if (isset($options[self::OPTION_SEARCH_TYPE])) {
+            $query->inType($options[self::OPTION_SEARCH_TYPE]);
+        }
+
+        if (isset($input['forum_id']) && $input['forum_id'] > 0) {
+            /** @var Node $nodeRepo */
+            $nodeRepo = $this->repository('XF:Node');
+            /** @var Forum|null $forum */
+            $forum = $this->em->find('XF:Forum', $input['forum_id']);
+            $nodeIds = [];
+
+            if ($forum != null) {
+                $node = $forum->Node;
+                if ($node !== null) {
+                    $nodeIds = $nodeRepo->findChildren($node, false)->fetch()->keys();
+                    $nodeIds[] = $forum->node_id;
+                }
+            }
+
+            $query->withMetadata('node', count($nodeIds) > 0 ? $nodeIds : $input['forum_id']);
+        }
+
+        if (isset($input['thread_id']) && $input['thread_id'] > 0) {
+            $query->withMetadata('thread', $input['thread_id'])
+                ->inTitleOnly(false);
+        }
+
+        if ($query->getErrors()) {
+            $errors = $query->getErrors();
+
+            throw new PrintableException(reset($errors));
+        }
+
+        /** @var \XF\Repository\Search $xfSearchRepo */
+        $xfSearchRepo = $this->repository('XF:Search');
+        /** @var \XF\Entity\Search|null $search */
+        $search = $xfSearchRepo->runSearch($query, $constraints);
+
+        return $search;
+    }
+}
diff --git a/Repository/Subscription.php b/Repository/Subscription.php
new file mode 100644
index 00000000..30b37291
--- /dev/null
+++ b/Repository/Subscription.php
@@ -0,0 +1,813 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use GuzzleHttp\Exception\ClientException;
+use XF\Entity\ConversationMessage;
+use XF\Entity\Post;
+use XF\Entity\Thread;
+use XF\Entity\User;
+use XF\Entity\UserAlert;
+use XF\Mvc\Entity\Repository;
+use XF\Util\Php;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Transformer;
+use Xfrocks\Api\XF\ApiOnly\Session\Session;
+
+class Subscription extends Repository
+{
+    const TYPE_NOTIFICATION = 'user_notification';
+    const TYPE_THREAD_POST = 'thread_post';
+
+    const TYPE_USER = 'user';
+    const TYPE_USER_0_SIMPLE_CACHE = 'apiUser0';
+
+    const TYPE_CLIENT = '__client__';
+    const TYPE_CLIENT_DATA_REGISTRY = 'apiSubs';
+
+    /**
+     * @return array
+     */
+    public function getClientSubscriptionsData()
+    {
+        $data = $this->app()->registry()->get(self::TYPE_CLIENT_DATA_REGISTRY);
+
+        if (!is_array($data)) {
+            $data = array();
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param string $type
+     * @param int|string $id
+     * @return int|null
+     */
+    public function deleteSubscriptionsForTopic($type, $id)
+    {
+        $topic = self::getTopic($type, $id);
+        $deleted = $this->db()->delete('xf_bdapi_subscription', 'topic = ?', $topic);
+
+        return $deleted;
+    }
+
+    /**
+     * @param string $clientId
+     * @param string $type
+     * @param int|string $id
+     * @return int
+     */
+    public function deleteSubscriptions($clientId, $type, $id)
+    {
+        $topic = self::getTopic($type, $id);
+        $deleted = $this->db()->delete(
+            'xf_bdapi_subscription',
+            'client_id = ? AND topic = ?',
+            [$clientId, $topic]
+        );
+
+        if ($deleted > 0) {
+            $this->updateCallbacksForTopic($topic);
+        }
+
+        return $deleted;
+    }
+
+    /**
+     * @param string $topic
+     * @return void
+     */
+    public function updateCallbacksForTopic($topic)
+    {
+        list($type, $id) = self::parseTopic($topic);
+
+        /** @var \Xfrocks\Api\Finder\Subscription $finder */
+        $finder = $this->finder('Xfrocks\Api:Subscription');
+        $finder->active();
+        $finder->where('topic', $topic);
+
+        $apiRouter = $this->app()->router(Listener::$routerType);
+
+        $subscriptions = [];
+        /** @var \Xfrocks\Api\Entity\Subscription $subscription */
+        foreach ($finder->fetch() as $subscription) {
+            $subscriptions[$subscription->subscription_id] = $subscription->toArray();
+        }
+
+        switch ($type) {
+            case self::TYPE_NOTIFICATION:
+                if (count($subscriptions) > 0) {
+                    $userOption = [
+                        'topic' => $topic,
+                        'link' => $apiRouter->buildLink('notifications', null, ['oauth_token' => '']),
+                        'subscriptions' => $subscriptions,
+                    ];
+                } else {
+                    $userOption = [];
+                }
+
+                $this->db()->update(
+                    'xf_user_option',
+                    [self::getSubColumn($type) => serialize($userOption)],
+                    'user_id = ?',
+                    $id
+                );
+                break;
+            case self::TYPE_THREAD_POST:
+                if (count($subscriptions) > 0) {
+                    $threadOption = [
+                        'topic' => $topic,
+                        'link' => $apiRouter->buildLink('posts', null, ['thread_id' => $id, 'oauth_token' => '']),
+                        'subscriptions' => $subscriptions,
+                    ];
+                } else {
+                    $threadOption = [];
+                }
+
+                $this->db()->update(
+                    'xf_thread',
+                    [self::getSubColumn($type) => serialize($threadOption)],
+                    'thread_id = ?',
+                    $id
+                );
+                break;
+            case self::TYPE_USER:
+                if (count($subscriptions) > 0) {
+                    $userOption = [
+                        'topic' => $topic,
+                        'link' => $apiRouter->buildLink('users', ['user_id' => $id], ['oauth_token' => '']),
+                        'subscriptions' => $subscriptions,
+                    ];
+                } else {
+                    $userOption = [];
+                }
+
+                if ($id > 0) {
+                    $this->db()->update(
+                        'xf_user_option',
+                        [$this->options()->bdApi_subscriptionColumnUser => serialize($userOption)],
+                        'user_id = ?',
+                        $id
+                    );
+                } else {
+                    $this->app()
+                        ->simpleCache()
+                        ->setValue('Xfrocks/Api', self::TYPE_USER_0_SIMPLE_CACHE, $userOption);
+                }
+                break;
+            case self::TYPE_CLIENT:
+                if (count($subscriptions) > 0) {
+                    $data = [
+                        'topic' => $topic,
+                        'link' => '',
+                        'subscriptions' => $subscriptions,
+                    ];
+                } else {
+                    $data = [];
+                }
+
+                $this->app()->registry()->set(self::TYPE_CLIENT_DATA_REGISTRY, $data);
+                break;
+        }
+    }
+
+    /**
+     * @param string $callback
+     * @param string $mode
+     * @param string $topic
+     * @param int $leaseSeconds
+     * @param array $extraParams
+     * @return bool
+     */
+    public function verifyIntentOfSubscriber($callback, $mode, $topic, $leaseSeconds, array $extraParams = [])
+    {
+        $challenge = md5(\XF::$time . $callback . $mode . $topic . $leaseSeconds);
+        $challenge = md5($challenge . $this->app()->config('globalSalt'));
+
+        $client = $this->app()->http()->client();
+
+        $requestData = array_merge(array(
+            'hub.mode' => $mode,
+            'hub.topic' => $topic,
+            'hub.lease_seconds' => $leaseSeconds,
+            'hub.challenge' => $challenge,
+        ), $extraParams);
+
+        try {
+            $uri = $callback;
+            foreach ($requestData as $key => $value) {
+                $uri .= sprintf('%s%s=%s', strpos($uri, '?') === false ? '?' : '&', $key, rawurlencode($value));
+            }
+            $response = $client->get($uri);
+
+            $body = trim($response->getBody()->getContents());
+            $httpCode = $response->getStatusCode();
+        } catch (ClientException $e) {
+            $body = $e->getMessage();
+            $httpCode = 500;
+        }
+
+        if (\XF::$debugMode) {
+            /** @var Log $logRepo */
+            $logRepo = $this->repository('Xfrocks\Api:Log');
+            $logRepo->logRequest(
+                'GET',
+                $callback,
+                $requestData,
+                $httpCode,
+                array('message' => $body),
+                array(
+                    'client_id' => '',
+                    'user_id' => 0,
+                    'ip_address' => '127.0.0.1',
+                )
+            );
+        }
+
+        if ($body !== $challenge) {
+            return false;
+        }
+
+        if ($httpCode < 200 or $httpCode > 299) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $topic
+     * @param User|null $user
+     * @return bool
+     */
+    public function isValidTopic(&$topic, User $user = null)
+    {
+        list($type, $id) = self::parseTopic($topic);
+
+        if ($type != self::TYPE_CLIENT && !self::getSubOption($type)) {
+            // subscription for this topic type has been disabled
+            return false;
+        }
+
+        $user = $user !== null ? $user : \XF::visitor();
+        /** @var Session $session */
+        $session = \XF::app()->session();
+        $token = $session->getToken();
+        $client = $token !== null ? $token->Client : null;
+
+        switch ($type) {
+            case self::TYPE_NOTIFICATION:
+                if ($id === 'me') {
+                    // now supports user_notification_me
+                    $id = $user->user_id;
+                    $topic = self::getTopic($type, $id);
+                }
+
+                return (($id > 0) and ($id == $user->user_id));
+            case self::TYPE_THREAD_POST:
+                /** @var Thread|null $thread */
+                $thread = $this->em->find('XF:Thread', $id);
+                if ($thread === null) {
+                    return false;
+                }
+
+                return $thread->user_id == $user->user_id;
+            case self::TYPE_USER:
+                if ($id === 'me') {
+                    // now supports user_me
+                    $id = $user->user_id;
+                    $topic = self::getTopic($type, $id);
+                }
+
+                if ($id === '0' && $client !== null) {
+                    if (!isset($client->options['allow_user_0_subscription']) ||
+                        $client->options['allow_user_0_subscription'] < 1
+                    ) {
+                        return false;
+                    }
+                }
+
+                return (intval($id) === intval($user->user_id));
+            case self::TYPE_CLIENT:
+                return $client !== null;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array $params
+     * @param string $topicType
+     * @param int|string $topicId
+     * @param string $selfLink
+     * @param array|string $subscriptionOption
+     * @return bool
+     */
+    public function prepareDiscoveryParams(array &$params, $topicType, $topicId, $selfLink, $subscriptionOption)
+    {
+        if (!self::getSubOption($topicType)) {
+            return false;
+        }
+
+        $response = $this->app()->response();
+
+        $hubLink = $this->app()->router(Listener::$routerType)->buildLink('subscriptions', null, [
+            'hub.topic' => self::getTopic($topicType, $topicId),
+            'oauth_token' => ''
+        ]);
+
+        $response->header('Link', sprintf('<%s>; rel=hub', $hubLink), false);
+        if ($selfLink !== '') {
+            $response->header('Link', sprintf('<%s>; rel=self', $selfLink), false);
+        }
+
+        /** @var Session $session */
+        $session = $this->app()->session();
+        $token = $session->getToken();
+        $clientId = $token !== null ? $token->client_id : '';
+        if (is_string($subscriptionOption)) {
+            $subscriptionOption = Php::safeUnserialize($subscriptionOption);
+        }
+        if (is_array($subscriptionOption)
+            && $clientId !== ''
+            && isset($subscriptionOption['subscriptions'])
+        ) {
+            foreach ($subscriptionOption['subscriptions'] as $subscription) {
+                if ($subscription['client_id'] == $clientId) {
+                    $params['subscription_callback'] = $subscription['callback'];
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $option
+     * @param string $action
+     * @param string $objectType
+     * @param mixed $objectData
+     * @return bool
+     */
+    public function ping(array $option, $action, $objectType, $objectData)
+    {
+        if (!isset($option['topic']) || !isset($option['subscriptions'])) {
+            return false;
+        }
+
+        $pingedClientIds = array();
+
+        foreach ($option['subscriptions'] as $subscription) {
+            if ($subscription['expire_date'] > 0
+                && $subscription['expire_date'] < \XF::$time
+            ) {
+                // expired
+                continue;
+            }
+
+            if (in_array($subscription['client_id'], $pingedClientIds, true)) {
+                // duplicated subscription
+                continue;
+            }
+            $pingedClientIds[] = $subscription['client_id'];
+
+            $pingData = array(
+                'client_id' => $subscription['client_id'],
+                'topic' => $option['topic'],
+                'action' => $action,
+                'object_data' => $objectData,
+            );
+
+            if (isset($option['link'])) {
+                $pingData['link'] = $option['link'];
+            }
+
+            /** @var PingQueue $pingQueueRepo */
+            $pingQueueRepo = $this->repository('Xfrocks\Api:PingQueue');
+            $pingQueueRepo->insertQueue(
+                $subscription['callback'],
+                $objectType,
+                $pingData,
+                $subscription['expire_date']
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $action
+     * @param ConversationMessage $message
+     * @param User $alertedUser
+     * @param User|null $triggerUser
+     * @return bool
+     */
+    public function pingConversationMessage(
+        $action,
+        ConversationMessage $message,
+        User $alertedUser,
+        User $triggerUser = null
+    ) {
+        $type = self::TYPE_NOTIFICATION;
+        if ($this->options()->bdApi_userNotificationConversation < 1 || !self::getSubOption($type)) {
+            return false;
+        }
+
+        $userOption = $alertedUser->Option;
+        if ($userOption === null) {
+            return false;
+        }
+
+        if ($action === 'reply') {
+            // XF has removed reply alert. So use own action to prevent conflict
+            $action = 'bdapi_reply';
+        }
+
+        $templater = $this->app()->templater();
+        $conversation = $message->Conversation;
+        $triggerUser = $triggerUser !== null ? $triggerUser : $message->User;
+        if ($triggerUser === null) {
+            return false;
+        }
+
+        $extraData = [
+            'object_data' => [
+                'notification_id' => 0,
+                'notification_html' => ''
+            ]
+        ];
+
+        $extraData['object_data']['message'] = [
+            'conversation_id' => $message->conversation_id,
+            'title' => $conversation !== null ? $conversation->title : '',
+            'message_id' => $message->message_id,
+            'message' => $templater->func('snippet', [$message->message, 140, ['stripQuote' => true]])
+        ];
+
+        $fakeAlert = [
+            'alert_id' => 0,
+            'alerted_user_id' => $alertedUser->user_id,
+            'user_id' => $triggerUser->user_id,
+            'username' => $triggerUser->username,
+            'content_type' => 'conversation_message',
+            'content_id' => $message->message_id,
+            'action' => $action,
+            'event_date' => \XF::$time,
+            'view_date' => 0,
+            'extra_data' => serialize($extraData)
+        ];
+
+        /** @var mixed $userOptionValue */
+        $userOptionValue = $userOption->getValue(self::getSubColumn($type));
+        if (!is_array($userOptionValue) || count($userOptionValue) === 0) {
+            return false;
+        }
+
+        return $this->ping($userOptionValue, $action, $type, $fakeAlert);
+    }
+
+    /**
+     * @param string $action
+     * @param Post $post
+     * @return bool
+     */
+    public function pingThreadPost($action, Post $post)
+    {
+        $type = self::TYPE_THREAD_POST;
+        if (!self::getSubOption($type)) {
+            return false;
+        }
+
+        $thread = $post->Thread;
+        if ($thread === null) {
+            return false;
+        }
+
+        /** @var array|null $threadOptionValue */
+        $threadOptionValue = $thread->getValue(self::getSubColumn($type));
+        if ($threadOptionValue === null || count($threadOptionValue) === 0) {
+            return false;
+        }
+
+        return $this->ping($threadOptionValue, $action, $type, $post->post_id);
+    }
+
+    /**
+     * @param string $action
+     * @param User $user
+     * @return bool
+     */
+    public function pingUser($action, User $user)
+    {
+        $type = self::TYPE_USER;
+        if (!self::getSubOption($type)) {
+            return false;
+        }
+
+        if ($action === 'insert') {
+            $user0Option = $this->app()->simpleCache()->getValue('Xfrocks/Api', self::TYPE_USER_0_SIMPLE_CACHE);
+            if (is_array($user0Option) && count($user0Option) > 0) {
+                $this->ping($user0Option, $action, $type, $user->user_id);
+            }
+        }
+
+        $userOption = $user->Option;
+        if ($userOption === null) {
+            return false;
+        }
+
+        /** @var array $userOptionValue */
+        $userOptionValue = $userOption->getValue(self::getSubColumn($type));
+        if (count($userOptionValue) === 0) {
+            return false;
+        }
+
+        return $this->ping($userOptionValue, $action, $type, $user->user_id);
+    }
+
+    /**
+     * @param string $objectType
+     * @param array $pingDataMany
+     * @return array
+     */
+    public function preparePingDataMany($objectType, array $pingDataMany)
+    {
+        if (!self::getSubOption($objectType)) {
+            return array();
+        }
+
+        switch ($objectType) {
+            case self::TYPE_NOTIFICATION:
+                return $this->preparePingDataManyNotification($pingDataMany);
+            case self::TYPE_THREAD_POST:
+                return $this->preparePingDataManyPost($pingDataMany);
+            case self::TYPE_USER:
+                return $this->preparePingDataManyUser($pingDataMany);
+        }
+
+        return array();
+    }
+
+    /**
+     * @param array $pingDataMany
+     * @return array
+     */
+    protected function preparePingDataManyNotification(array $pingDataMany)
+    {
+        $alertIds = array();
+        $alerts = array();
+        foreach ($pingDataMany as $key => &$pingDataRef) {
+            if (is_numeric($pingDataRef['object_data'])) {
+                $alertIds[] = $pingDataRef['object_data'];
+            } elseif (is_array($pingDataRef['object_data'])
+                && isset($pingDataRef['object_data']['alert_id'])
+                && $pingDataRef['object_data']['alert_id'] == 0
+            ) {
+                $fakeAlertId = sprintf(md5($key));
+                $pingDataRef['object_data']['alert_id'] = $fakeAlertId;
+                $alertRaw = $pingDataRef['object_data'];
+
+                /** @var UserAlert $fakeAlert */
+                $fakeAlert = $this->em->create('XF:UserAlert');
+                $fakeAlert->alerted_user_id = $alertRaw['alerted_user_id'];
+                $fakeAlert->user_id = $alertRaw['user_id'];
+                $fakeAlert->username = $alertRaw['username'];
+                $fakeAlert->content_type = $alertRaw['content_type'];
+                $fakeAlert->content_id = $alertRaw['content_id'];
+                $fakeAlert->action = $alertRaw['action'];
+                $fakeAlert->event_date = $alertRaw['event_date'];
+                $fakeAlert->view_date = $alertRaw['view_date'];
+
+                if (isset($alertRaw['extra_data'])) {
+                    $fakeAlert->extra_data = is_array($alertRaw['extra_data'])
+                        ? $alertRaw['extra_data']
+                        : Php::safeUnserialize($alertRaw['extra_data']);
+                }
+
+                $fakeAlert->setReadOnly(true);
+
+                $alerts[$fakeAlertId] = $fakeAlert;
+                $pingDataRef['object_data'] = $fakeAlertId;
+            }
+        }
+
+        if (count($alertIds) > 0) {
+            $realAlerts = $this->em->findByIds('XF:UserAlert', $alertIds);
+            foreach ($realAlerts as $alertId => $alert) {
+                $alerts[$alertId] = $alert;
+            }
+        }
+
+        $userIds = array();
+        $alertsByUser = array();
+        foreach ($alerts as $alert) {
+            $userIds[] = $alert['alerted_user_id'];
+
+            if (!isset($alertsByUser[$alert['alerted_user_id']])) {
+                $alertsByUser[$alert['alerted_user_id']] = array();
+            }
+            $alertsByUser[$alert['alerted_user_id']][$alert['alert_id']] = $alert;
+        }
+
+        $viewingUsers = $this->preparePingDataGetViewingUsers($userIds);
+
+        foreach ($alertsByUser as $userId => &$userAlerts) {
+            if (!isset($viewingUsers[$userId])) {
+                // user not found
+                foreach (array_keys($userAlerts) as $userAlertId) {
+                    // delete the alert too
+                    unset($alerts[$userAlertId]);
+                }
+                continue;
+            }
+
+            foreach (array_keys($userAlerts) as $userAlertId) {
+                $alerts[$userAlertId] = $userAlerts[$userAlertId];
+            }
+        }
+
+        foreach (array_keys($pingDataMany) as $pingDataKey) {
+            $pingDataRef = &$pingDataMany[$pingDataKey];
+
+            if (!isset($pingDataRef['object_data'])) {
+                // no alert is attached to object data
+                continue;
+            }
+            $alertId = $pingDataRef['object_data'];
+
+            if (!isset($alerts[$alertId])) {
+                // alert not found
+                unset($pingDataMany[$pingDataKey]);
+                continue;
+            }
+            $alertRef =& $alerts[$alertId];
+
+            if ($alertRef instanceof UserAlert) {
+                $transformContext = new TransformContext();
+                /** @var Transformer $transformer */
+                $transformer = $this->app()->container('api.transformer');
+
+                /** @var User $visitor */
+                $visitor = \XF::visitor();
+                if ($visitor->user_id < 1 && isset($alertRef['alerted_user_id']) && $alertRef['alerted_user_id'] > 0) {
+                    /** @var User|null $visitor */
+                    $visitor = $this->em->find('XF:User', $alertRef['alerted_user_id']);
+                }
+
+                try {
+                    $pingDataRef['object_data'] = $visitor !== null
+                        ? \XF::asVisitor(
+                            $visitor,
+                            function () use ($transformer, $transformContext, $alertRef) {
+                                return $transformer->transformEntity($transformContext, null, $alertRef);
+                            }
+                        ) : [];
+                } catch (\Exception $e) {
+                    $pingDataRef['object_data'] = [];
+                }
+            }
+
+            if (!is_numeric($alertRef['alert_id']) && isset($alertRef['extra_data']['object_data'])) {
+                // fake alert, use the included object_data
+                $pingDataRef['object_data'] = array_merge(
+                    $pingDataRef['object_data'],
+                    $alertRef['extra_data']['object_data']
+                );
+            }
+
+            $alertedUserId = $alertRef['alerted_user_id'];
+            if (isset($viewingUsers[$alertedUserId])) {
+                $alertedUser = $viewingUsers[$alertedUserId];
+                if (isset($alertedUser['alerts_unread'])) {
+                    $pingDataRef['object_data']['user_unread_notification_count'] = $alertedUser['alerts_unread'];
+                }
+            }
+        }
+
+        return $pingDataMany;
+    }
+
+    /**
+     * @param array $userIds
+     * @return array
+     */
+    protected function preparePingDataGetViewingUsers(array $userIds)
+    {
+        static $allUsers = array();
+        $users = array();
+
+        $dbUserIds = array();
+        foreach ($userIds as $userId) {
+            if ($userId == \XF::visitor()->user_id) {
+                $users[$userId] = \XF::visitor();
+            } elseif ($userId == 0) {
+                /** @var \XF\Repository\User $userRepo */
+                $userRepo = $this->repository('XF:User');
+                $users[$userId] = $userRepo->getGuestUser();
+            } elseif (isset($allUsers[$userId])) {
+                $users[$userId] = $allUsers[$userId];
+            } else {
+                $dbUserIds[] = $userId;
+            }
+        }
+
+        if (count($dbUserIds) > 0) {
+            $dbUsers = $this->em->findByIds('XF:User', $dbUserIds, [
+                'Option',
+                'Profile',
+                'PermissionCombination',
+                'Privacy'
+            ]);
+
+            foreach ($dbUsers as $user) {
+                $allUsers[$user['user_id']] = $user;
+                $users[$user['user_id']] = $user;
+            }
+        }
+
+        return $users;
+    }
+
+    /**
+     * @param array $pingDataMany
+     * @return array
+     */
+    protected function preparePingDataManyPost(array $pingDataMany)
+    {
+        // TODO: do anything here?
+        return $pingDataMany;
+    }
+
+    /**
+     * @param array $pingDataMany
+     * @return array
+     */
+    protected function preparePingDataManyUser(array $pingDataMany)
+    {
+        // TODO: do anything here?
+        return $pingDataMany;
+    }
+
+    /**
+     * @param string $type
+     * @param int|string $id
+     * @return string
+     */
+    public static function getTopic($type, $id)
+    {
+        return sprintf('%s_%s', $type, $id);
+    }
+
+    /**
+     * @param string $topic
+     * @return array
+     */
+    public static function parseTopic($topic)
+    {
+        if ($topic === '') {
+            return array(self::TYPE_CLIENT, 0);
+        }
+
+        $parts = explode('_', $topic);
+        $id = array_pop($parts);
+        $type = implode('_', $parts);
+
+        return [$type, $id];
+    }
+
+    /**
+     * @param string $topicType
+     * @return bool
+     */
+    public static function getSubOption($topicType)
+    {
+        $options = \XF::options();
+        $topicTypeCamelCase = str_replace(' ', '', ucwords(str_replace('_', ' ', $topicType)));
+        $optionKey = 'bdApi_subscription' . $topicTypeCamelCase;
+
+        if (!$options->offsetExists($optionKey)) {
+            return false;
+        }
+
+        return intval($options->offsetGet($optionKey)) > 0;
+    }
+
+    /**
+     * @param string $topicType
+     * @return string
+     */
+    public static function getSubColumn($topicType)
+    {
+        $options = \XF::options();
+        $topicTypeCamelCase = str_replace(' ', '', ucwords(str_replace('_', ' ', $topicType)));
+        $optionKey = 'bdApi_subscriptionColumn' . $topicTypeCamelCase;
+
+        if (!$options->offsetExists($optionKey)) {
+            return '';
+        }
+
+        return strval($options->offsetGet($optionKey));
+    }
+}
diff --git a/Repository/Token.php b/Repository/Token.php
new file mode 100644
index 00000000..83d071f8
--- /dev/null
+++ b/Repository/Token.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+
+class Token extends Repository
+{
+    /**
+     * @return int
+     */
+    public function deleteExpiredTokens()
+    {
+        return $this->db()->delete('xf_bdapi_token', 'expire_date < ?', \XF::$time);
+    }
+
+    /**
+     * @param string $clientId
+     * @param int $userId
+     * @return int
+     */
+    public function deleteTokens($clientId, $userId)
+    {
+        return $this->db()->delete(
+            'xf_bdapi_token',
+            'client_id = ? AND user_id = ?',
+            [$clientId, $userId]
+        );
+    }
+}
diff --git a/Repository/UserScope.php b/Repository/UserScope.php
new file mode 100644
index 00000000..f59e3a2f
--- /dev/null
+++ b/Repository/UserScope.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Xfrocks\Api\Repository;
+
+use XF\Mvc\Entity\Repository;
+
+class UserScope extends Repository
+{
+    /**
+     * @param string $clientId
+     * @param int $userId
+     * @param string $scope
+     * @return int
+     */
+    public function deleteUserScope($clientId, $userId, $scope)
+    {
+        return $this->db()->delete(
+            'xf_bdapi_user_scope',
+            'client_id = ? AND user_id = ? AND scope = ?',
+            [$clientId, $userId, $scope]
+        );
+    }
+}
diff --git a/Setup.php b/Setup.php
new file mode 100644
index 00000000..11f5270d
--- /dev/null
+++ b/Setup.php
@@ -0,0 +1,274 @@
+<?php
+
+namespace Xfrocks\Api;
+
+use XF\Db\Schema\Alter;
+use XF\Db\Schema\Create;
+use XF\AddOn\AbstractSetup;
+use XF\AddOn\StepRunnerInstallTrait;
+use XF\AddOn\StepRunnerUpgradeTrait;
+use XF\AddOn\StepRunnerUninstallTrait;
+
+class Setup extends AbstractSetup
+{
+    use StepRunnerInstallTrait;
+    use StepRunnerUpgradeTrait;
+    use StepRunnerUninstallTrait;
+
+    /**
+     * @return void
+     */
+    public function installStep1()
+    {
+        $sm = $this->schemaManager();
+
+        foreach ($this->getTables() as $tableName => $closure) {
+            $sm->createTable($tableName, $closure);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function uninstallStep1()
+    {
+        $sm = $this->schemaManager();
+
+        foreach (array_keys($this->getTables()) as $tableName) {
+            $sm->dropTable($tableName);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function upgrade2000012Step1()
+    {
+        $sm = $this->schemaManager();
+
+        $sm->alterTable('xf_bdapi_auth_code', function (Alter $table) {
+            $table->changeColumn('client_id', 'varbinary')->length(255);
+            $table->changeColumn('auth_code_text', 'varbinary')->length(255);
+        });
+
+        $sm->alterTable('xf_bdapi_client', function (Alter $table) {
+            $table->changeColumn('client_id', 'varbinary')->length(255);
+            $table->changeColumn('client_secret', 'varbinary')->length(255);
+            $table->changeColumn('name', 'text');
+
+            $table->convertCharset('utf8mb4');
+        });
+
+        $sm->alterTable('xf_bdapi_refresh_token', function (Alter $table) {
+            $table->changeColumn('client_id', 'varbinary')->length(255);
+            $table->changeColumn('refresh_token_text', 'varbinary')->length(255);
+            $table->changeColumn('scope', 'blob');
+        });
+
+        $sm->alterTable('xf_bdapi_token', function (Alter $table) {
+            $table->changeColumn('client_id', 'varbinary')->length(255);
+            $table->changeColumn('token_text', 'varbinary')->length(255);
+            $table->changeColumn('scope', 'blob');
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function upgrade2000013Step1()
+    {
+        $sm = $this->schemaManager();
+
+        $sm->alterTable('xf_bdapi_auth_code', function (Alter $table) {
+            $table->addIndex()->type('key')->columns('expire_date');
+        });
+
+        $sm->alterTable('xf_bdapi_client', function (Alter $table) {
+            $table->addIndex()->type('key')->columns('user_id');
+        });
+
+        $sm->alterTable('xf_bdapi_refresh_token', function (Alter $table) {
+            $table->addIndex()->type('key')->columns('expire_date');
+        });
+
+        $sm->alterTable('xf_bdapi_token', function (Alter $table) {
+            $table->addIndex()->type('key')->columns('client_id');
+            $table->addIndex()->type('key')->columns('expire_date');
+            $table->addIndex()->type('key')->columns('user_id');
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function upgrade2000014Step1()
+    {
+        $sm = $this->schemaManager();
+
+        foreach ($this->getTables2() as $tableName => $closure) {
+            $sm->createTable($tableName, $closure);
+        }
+
+        $sm->alterTable('xf_bdapi_user_scope', function (Alter $table) {
+            $table->changeColumn('client_id', 'varbinary')->length(255);
+            $table->changeColumn('scope', 'varbinary')->length(255);
+
+            $table->addIndex()->type('unique')->columns(['client_id', 'user_id', 'scope']);
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function upgrade2000015Step1()
+    {
+        $sm = $this->schemaManager();
+
+        foreach ($this->getTables3() as $tableName => $closure) {
+            $sm->createTable($tableName, $closure);
+        }
+    }
+
+    public function upgrade2000135Step1()
+    {
+        $this->schemaManager()->alterTable('xf_bdapi_token', function (Alter $table) {
+            $table->addColumn('issue_date', 'int')->setDefault(0);
+        });
+    }
+
+    /**
+     * @return array
+     */
+    private function getTables()
+    {
+        $tables = [];
+
+        $tables += $this->getTables1();
+        $tables += $this->getTables2();
+        $tables += $this->getTables3();
+
+        return $tables;
+    }
+
+    /**
+     * @return array
+     */
+    private function getTables1()
+    {
+        $tables = [];
+
+        $tables['xf_bdapi_auth_code'] = function (Create $table) {
+            $table->addColumn('auth_code_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('auth_code_text', 'varbinary')->length(255);
+            $table->addColumn('redirect_uri', 'text');
+            $table->addColumn('expire_date', 'int');
+            $table->addColumn('user_id', 'int');
+            $table->addColumn('scope', 'text');
+
+            $table->addUniqueKey('auth_code_text');
+        };
+
+        $tables['xf_bdapi_client'] = function (Create $table) {
+            $table->addColumn('client_id', 'varbinary')->length(255)->primaryKey();
+            $table->addColumn('client_secret', 'varbinary')->length(255);
+            $table->addColumn('redirect_uri', 'text');
+            $table->addColumn('name', 'text');
+            $table->addColumn('description', 'text');
+            $table->addColumn('user_id', 'int');
+            $table->addColumn('options', 'mediumblob')->nullable(true);
+        };
+
+        $tables['xf_bdapi_refresh_token'] = function (Create $table) {
+            $table->addColumn('refresh_token_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('refresh_token_text', 'varbinary')->length(255);
+            $table->addColumn('expire_date', 'int');
+            $table->addColumn('user_id', 'int');
+            $table->addColumn('scope', 'blob');
+
+            $table->addUniqueKey('refresh_token_text');
+        };
+
+        $tables['xf_bdapi_token'] = function (Create $table) {
+            $table->addColumn('token_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('token_text', 'varbinary')->length(255);
+            $table->addColumn('expire_date', 'int');
+            $table->addColumn('user_id', 'int');
+            $table->addColumn('scope', 'blob');
+            $table->addColumn('issue_date', 'int')->setDefault(0);
+
+            $table->addUniqueKey('token_text');
+        };
+
+        return $tables;
+    }
+
+    /**
+     * @return array
+     */
+    private function getTables2()
+    {
+        $tables = [];
+
+        $tables['xf_bdapi_user_scope'] = function (Create $table) {
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('user_id', 'int');
+            $table->addColumn('scope', 'varbinary')->length(255);
+            $table->addColumn('accept_date', 'int');
+
+            $table->addKey('user_id');
+            $table->addUniqueKey(['client_id', 'user_id', 'scope']);
+        };
+
+        return $tables;
+    }
+
+    /**
+     * @return array
+     */
+    private function getTables3()
+    {
+        $tables = [];
+
+        $tables['xf_bdapi_subscription'] = function (Create $table) {
+            $table->addColumn('subscription_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('callback', 'text');
+            $table->addColumn('topic', 'varbinary')->length(255);
+            $table->addColumn('subscribe_date', 'int')->unsigned();
+            $table->addColumn('expire_date', 'int')->unsigned()->setDefault(0);
+
+            $table->addKey('client_id');
+            $table->addKey('topic');
+        };
+
+        $tables['xf_bdapi_log'] = function (Create $table) {
+            $table->addColumn('log_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('client_id', 'varbinary')->length(255);
+            $table->addColumn('user_id', 'int')->unsigned();
+            $table->addColumn('ip_address', 'varbinary')->length(50);
+            $table->addColumn('request_date', 'int')->unsigned();
+            $table->addColumn('request_method', 'varbinary')->length(10);
+            $table->addColumn('request_uri', 'text');
+            $table->addColumn('request_data', 'mediumblob');
+            $table->addColumn('response_code', 'int')->unsigned();
+            $table->addColumn('response_output', 'mediumblob');
+        };
+
+        $tables['xf_bdapi_ping_queue'] = function (Create $table) {
+            $table->addColumn('ping_queue_id', 'int')->autoIncrement()->primaryKey();
+            $table->addColumn('callback_md5', 'varbinary')->length(32);
+            $table->addColumn('callback', 'text');
+            $table->addColumn('object_type', 'varbinary', 25);
+            $table->addColumn('data', 'mediumblob');
+            $table->addColumn('queue_date', 'int')->unsigned();
+            $table->addColumn('expire_date', 'int')->unsigned()->setDefault(0);
+
+            $table->addKey('callback_md5');
+        };
+
+        return $tables;
+    }
+}
diff --git a/Transform/AbstractHandler.php b/Transform/AbstractHandler.php
new file mode 100644
index 00000000..46508745
--- /dev/null
+++ b/Transform/AbstractHandler.php
@@ -0,0 +1,427 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+use XF\App;
+use XF\Mvc\Entity\AbstractCollection;
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Finder;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\Transformer;
+
+abstract class AbstractHandler
+{
+    const KEY_LINKS = 'links';
+    const KEY_PERMISSIONS = 'permissions';
+
+    const DYNAMIC_KEY_ATTACHMENTS = 'attachments';
+    const DYNAMIC_KEY_FIELDS = 'fields';
+
+    const LINK_ATTACHMENTS = 'attachments';
+    const LINK_DETAIL = 'detail';
+    const LINK_FOLLOWERS = 'followers';
+    const LINK_LIKES = 'likes';
+    const LINK_PERMALINK = 'permalink';
+    const LINK_REPORT = 'report';
+
+    const PERM_DELETE = 'delete';
+    const PERM_EDIT = 'edit';
+    const PERM_FOLLOW = 'follow';
+    const PERM_LIKE = 'like';
+    const PERM_REPORT = 'report';
+    const PERM_VIEW = 'view';
+
+    /**
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * @var Transformer
+     */
+    protected $transformer;
+
+    /**
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * @var array
+     */
+    protected static $entitiesToAddAttachmentsTo = [];
+
+    /**
+     * @param App $app
+     * @param Transformer $transformer
+     * @param string $type
+     */
+    public function __construct($app, $transformer, $type)
+    {
+        $this->app = $app;
+        $this->transformer = $transformer;
+        $this->type = $type;
+    }
+
+    /**
+     * @return void
+     */
+    public function addAttachmentsToQueuedEntities()
+    {
+        /** @var \XF\Repository\Attachment $attachmentRepo */
+        $attachmentRepo = $this->app->repository('XF:Attachment');
+
+        foreach (self::$entitiesToAddAttachmentsTo as $q) {
+            $attachmentRepo->addAttachmentsToContent(
+                $q['entities'],
+                $q['contentType'],
+                $q['countKey'],
+                $q['relationKey']
+            );
+        }
+
+        self::$entitiesToAddAttachmentsTo = [];
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string $key
+     * @return mixed
+     */
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        return null;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return bool
+     */
+    public function canView(TransformContext $context)
+    {
+        /** @var callable $callable */
+        $callable = [$context->getSource(), 'canView'];
+
+        // we do not check is_callable here, PHP will just complain (loudly) if it doesn't work
+        return call_user_func($callable);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array|null
+     */
+    public function collectLinks(TransformContext $context)
+    {
+        return null;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array|null
+     */
+    public function collectPermissions(TransformContext $context)
+    {
+        return null;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array
+     */
+    public function getMappings(TransformContext $context)
+    {
+        return [];
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array
+     */
+    public function onNewContext(TransformContext $context)
+    {
+        $context->makeSureSelectorIsNotNull($this->type);
+
+        return [];
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param Finder $finder
+     * @return Finder
+     */
+    public function onTransformFinder(TransformContext $context, Finder $finder)
+    {
+        foreach ($context->getOnTransformFinderCallbacks() as $callback) {
+            call_user_func_array($callback, [$context, $finder]);
+        }
+
+        return $finder;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param Entity[] $entities
+     * @return Entity[]
+     */
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        foreach ($context->getOnTransformEntitiesCallbacks() as $callback) {
+            call_user_func_array($callback, [$context, $entities]);
+        }
+
+        return $entities;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param array $data
+     * @return void
+     */
+    public function onTransformed(TransformContext $context, array &$data)
+    {
+        foreach ($context->getOnTransformedCallbacks() as $callback) {
+            $params = [$context, &$data];
+            call_user_func_array($callback, $params);
+        }
+    }
+
+    /**
+     * @param string $link
+     * @param mixed $data
+     * @param array $parameters
+     * @return string
+     */
+    protected function buildApiLink($link, $data = null, array $parameters = [])
+    {
+        $apiRouter = $this->app->router(Listener::$routerType);
+        return $apiRouter->buildLink($link, $data, $parameters);
+    }
+
+    /**
+     * @param string $link
+     * @param mixed $data
+     * @param array $parameters
+     * @return string
+     */
+    protected function buildPublicLink($link, $data = null, array $parameters = [])
+    {
+        $publicRouter = $this->app->router('public');
+        return $publicRouter->buildLink($link, $data, $parameters);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param Entity[]|AbstractCollection $entities
+     * @param string|null $contextKey
+     * @param string $relationKey
+     * @return void
+     */
+    protected function callOnTransformEntitiesForRelation(
+        TransformContext $context,
+        $entities,
+        $contextKey,
+        $relationKey
+    ) {
+        if ($entities instanceof AbstractCollection) {
+            if ($entities->count() === 0) {
+                return;
+            }
+
+            $firstEntity = $entities->first();
+        } else {
+            $firstEntity = reset($entities);
+        }
+
+        if ($firstEntity === false) {
+            return;
+        }
+
+        $entityStructure = $firstEntity->structure();
+        if (!isset($entityStructure->relations[$relationKey])) {
+            return;
+        }
+
+        $relationConfig = $entityStructure->relations[$relationKey];
+        if (!is_array($relationConfig) ||
+            !isset($relationConfig['type']) ||
+            !isset($relationConfig['entity'])
+        ) {
+            return;
+        }
+
+        $subHandler = $this->transformer->handler($relationConfig['entity']);
+        $subContext = $context->getSubContext($contextKey, $subHandler);
+
+        $subEntities = [];
+        foreach ($entities as $entity) {
+            if ($relationConfig['type'] === Entity::TO_ONE) {
+                /** @var Entity $subEntity */
+                $subEntity = $entity->getRelation($relationKey);
+                $subEntities[$subEntity->getEntityId()] = $subEntity;
+            } else {
+                /** @var Entity[] $_subEntities */
+                $_subEntities = $entity->getRelation($relationKey);
+                foreach ($_subEntities as $subEntity) {
+                    $subEntities[$subEntity->getEntityId()] = $subEntity;
+                }
+            }
+        }
+
+        $subHandler->onTransformEntities($subContext, $subEntities);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param Finder $finder
+     * @param string|null $contextKey
+     * @param string $relationKey
+     * @param string|null $shortName
+     * @return void
+     */
+    protected function callOnTransformFinderForRelation(
+        TransformContext $context,
+        Finder $finder,
+        $contextKey,
+        $relationKey,
+        $shortName = null
+    ) {
+        $finder->with($relationKey);
+
+        if ($shortName === null) {
+            $shortName = $this->type;
+        }
+
+        $em = $this->app->em();
+        $entityStructure = $em->getEntityStructure($shortName);
+        if (!isset($entityStructure->relations[$relationKey])) {
+            return;
+        }
+
+        $relationConfig = $entityStructure->relations[$relationKey];
+        if (!is_array($relationConfig) || !isset($relationConfig['entity'])) {
+            return;
+        }
+
+        $subHandler = $this->transformer->handler($relationConfig['entity']);
+        $subContext = $context->getSubContext($contextKey, $subHandler);
+
+        $relationStructure = $em->getEntityStructure($relationConfig['entity']);
+        $finderClass = \XF::stringToClass($shortName, '%s\Finder\%s');
+        try {
+            $finderClass = $this->app->extendClass($finderClass, '\XF\Mvc\Entity\Finder');
+        } catch (\Exception $e) {
+            // ignore
+        }
+        if (!$finderClass || !class_exists($finderClass)) {
+            $finderClass = '\XF\Mvc\Entity\Finder';
+        }
+        /** @var Finder $relationFinder */
+        $relationFinder = new $finderClass($em, $relationStructure);
+        $relationFinder->setParentFinder($finder, $relationKey);
+
+        $subHandler->onTransformFinder($subContext, $relationFinder);
+    }
+
+    /**
+     * @param string $contentType
+     * @param Entity $entity
+     * @return bool
+     */
+    protected function checkAttachmentCanManage($contentType, $entity)
+    {
+        /** @var \XF\Repository\Attachment $attachmentRepo */
+        $attachmentRepo = $this->app->repository('XF:Attachment');
+        $attachmentHandler = $attachmentRepo->getAttachmentHandler($contentType);
+        if ($attachmentHandler === null) {
+            return false;
+        }
+
+        $attachmentContext = $attachmentHandler->getContext($entity);
+        return $attachmentHandler->canManageAttachments($attachmentContext);
+    }
+
+    /**
+     * @param string $scope
+     * @return bool
+     */
+    protected function checkSessionScope($scope)
+    {
+        /** @var mixed $session */
+        $session = $this->app->session();
+        $callable = [$session, 'hasScope'];
+        return is_callable($callable) && boolval(call_user_func($callable, $scope));
+    }
+
+    /**
+     * @param Entity[] $entities
+     * @param string $contentType
+     * @param string $countKey
+     * @param string $relationKey
+     * @return void
+     */
+    protected function enqueueEntitiesToAddAttachmentsTo(
+        $entities,
+        $contentType,
+        $countKey = 'attach_count',
+        $relationKey = 'Attachments'
+    ) {
+        $key = sprintf('%s_%s_%s', $contentType, $countKey, $relationKey);
+        if (!isset(self::$entitiesToAddAttachmentsTo[$key])) {
+            self::$entitiesToAddAttachmentsTo[$key] = [
+                'entities' => [],
+                'contentType' => $contentType,
+                'countKey' => $countKey,
+                'relationKey' => $relationKey,
+            ];
+        }
+        $ref =& self::$entitiesToAddAttachmentsTo[$key];
+
+        foreach ($entities as $entityId => $entity) {
+            $ref['entities'][$entityId] = $entity;
+        }
+    }
+
+    /**
+     * @return \XF\Template\Templater
+     */
+    protected function getTemplater()
+    {
+        return $this->app->templater();
+    }
+
+    /**
+     * @param string $key
+     * @param string $string
+     * @param mixed $content
+     * @param array $options
+     * @return string
+     */
+    protected function renderBbCodeHtml($key, $string, $content, array $options = [])
+    {
+        $string = utf8_trim($string);
+        if (strlen($string) === 0) {
+            return '';
+        }
+
+        $options['lightbox'] = false;
+
+        $context = 'api:' . $key;
+        return $this->app->bbCode()->render($string, 'html', $context, $content, $options);
+    }
+
+    /**
+     * @param string $string
+     * @param array $options
+     * @return string
+     */
+    protected function renderBbCodePlainText($string, array $options = [])
+    {
+        $string = utf8_trim($string);
+        if (strlen($string) === 0) {
+            return '';
+        }
+
+        $formatter = $this->app->stringFormatter();
+        return $formatter->stripBbCode($string, $options);
+    }
+}
diff --git a/Transform/AttachmentParent.php b/Transform/AttachmentParent.php
new file mode 100644
index 00000000..4ca434bb
--- /dev/null
+++ b/Transform/AttachmentParent.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+interface AttachmentParent
+{
+    /**
+     * @param TransformContext $context
+     * @param string $key
+     * @return mixed
+     */
+    public function attachmentCalculateDynamicValue(TransformContext $context, $key);
+
+    /**
+     * @param TransformContext $context
+     * @param array $links
+     * @return void
+     */
+    public function attachmentCollectLinks(TransformContext $context, array &$links);
+
+    /**
+     * @param TransformContext $context
+     * @param array $permissions
+     * @return void
+     */
+    public function attachmentCollectPermissions(TransformContext $context, array &$permissions);
+
+    /**
+     * @param TransformContext $context
+     * @param array $mappings
+     * @return void
+     */
+    public function attachmentGetMappings(TransformContext $context, array &$mappings);
+}
diff --git a/Transform/BatchJobReply.php b/Transform/BatchJobReply.php
new file mode 100644
index 00000000..57b80bce
--- /dev/null
+++ b/Transform/BatchJobReply.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+class BatchJobReply extends AbstractHandler
+{
+    const DYNAMIC_KEY_ERROR = '_job_error';
+    const DYNAMIC_KEY_MESSAGE = '_job_message';
+    const DYNAMIC_KEY_RESPONSE = '_job_response';
+    const DYNAMIC_KEY_RESULT = '_job_result';
+    const DYNAMIC_KEY_URL = '_job_url';
+
+    const RESULT_ERROR = 'error';
+    const RESULT_MESSAGE = 'message';
+    const RESULT_REDIRECT = 'redirect';
+    const RESULT_OK = 'ok';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Mvc\Reply\AbstractReply|null $reply */
+        $reply = $context->data('reply');
+        if ($reply === null) {
+            return null;
+        }
+
+        if ($reply instanceof \XF\Mvc\Reply\Error) {
+            switch ($key) {
+                case self::DYNAMIC_KEY_ERROR:
+                    return implode(', ', $reply->getErrors());
+                case self::DYNAMIC_KEY_RESULT:
+                    return self::RESULT_ERROR;
+            }
+        } elseif ($reply instanceof \XF\Mvc\Reply\Message) {
+            switch ($key) {
+                case self::DYNAMIC_KEY_MESSAGE:
+                    return $reply->getMessage();
+                case self::DYNAMIC_KEY_RESULT:
+                    return self::RESULT_MESSAGE;
+            }
+        } elseif ($reply instanceof \XF\Mvc\Reply\Redirect) {
+            switch ($key) {
+                case self::DYNAMIC_KEY_RESULT:
+                    return self::RESULT_REDIRECT;
+                case self::DYNAMIC_KEY_URL:
+                    return $reply->getUrl();
+            }
+        } elseif ($reply instanceof \Xfrocks\Api\Mvc\Reply\Api) {
+            switch ($key) {
+                case self::DYNAMIC_KEY_RESULT:
+                    return self::RESULT_OK;
+            }
+        } else {
+            switch ($key) {
+                case self::DYNAMIC_KEY_RESPONSE:
+                    $response = \XF::app()->dispatcher()->render($reply, $reply->getResponseType());
+                    $response->compressIfAble(false);
+                    $response->includeContentLength(false);
+
+                    ob_start();
+                    try {
+                        $response->sendBody();
+                    } catch (\Exception $e) {
+                        // ignore any errors
+                    }
+                    $responseBody = ob_get_clean();
+                    if ($responseBody === false) {
+                        return null;
+                    }
+
+                    $mediaType = $response->contentType();
+                    if ($mediaType === 'text/html') {
+                        $data = $responseBody;
+                    } else {
+                        $base64Data = base64_encode($responseBody);
+                        $data = 'base64,' . $base64Data;
+                    }
+
+                    return sprintf('data:%s;%s', $mediaType, $data);
+                case self::DYNAMIC_KEY_RESULT:
+                    $responseCode = $reply->getResponseCode();
+                    if ($responseCode >= 200 && $responseCode < 300) {
+                        return self::RESULT_OK;
+                    }
+
+                    return self::RESULT_ERROR;
+            }
+        }
+
+        return null;
+    }
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            self::DYNAMIC_KEY_ERROR,
+            self::DYNAMIC_KEY_MESSAGE,
+            self::DYNAMIC_KEY_RESPONSE,
+            self::DYNAMIC_KEY_RESULT,
+            self::DYNAMIC_KEY_URL,
+        ];
+    }
+
+    public function onNewContext(TransformContext $context)
+    {
+        $data = parent::onNewContext($context);
+        $data['reply'] = null;
+
+        $reply = $context->getSource();
+        while ($data['reply'] === null) {
+            if ($reply instanceof \XF\Mvc\Reply\Exception) {
+                $data['reply'] = $reply->getReply();
+            } elseif ($reply instanceof \Xfrocks\Api\Mvc\Reply\Api) {
+                try {
+                    $data['transformed'] = $this->prepareJsonEncode(
+                        $this->transformer->transformArray($context, null, $reply->getData())
+                    );
+                    $data['reply'] = $reply;
+                } catch (\Exception $e) {
+                    if ($e instanceof \XF\Mvc\Reply\Exception) {
+                        $reply = $e;
+                    } elseif ($e instanceof \XF\PrintableException || \XF::$debugMode) {
+                        $reply = new \XF\Mvc\Reply\Message($e->getMessage());
+                    } else {
+                        $reply = new \XF\Mvc\Reply\Error(\XF::phrase('unexpected_error_occurred'));
+                    }
+                }
+            } elseif ($reply instanceof \XF\Mvc\Reply\AbstractReply) {
+                $data['reply'] = $reply;
+            }
+        }
+
+        return $data;
+    }
+
+    public function onTransformed(TransformContext $context, array &$data)
+    {
+        $transformed = $context->data('transformed');
+        if (is_array($transformed)) {
+            $data += $transformed;
+        }
+
+        parent::onTransformed($context, $data);
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     * @see \XF\Mvc\Renderer\Json::prepareJsonEncode()
+     */
+    protected function prepareJsonEncode($value)
+    {
+        if (is_array($value)) {
+            foreach ($value as &$innerValue) {
+                $innerValue = $this->prepareJsonEncode($innerValue);
+            }
+        } else {
+            if (is_object($value) && method_exists($value, 'jsonSerialize')) {
+                $value = $value->jsonSerialize();
+            } else {
+                if (is_object($value) && method_exists($value, '__toString')) {
+                    $value = $value->__toString();
+                }
+            }
+        }
+
+        return $value;
+    }
+}
diff --git a/Transform/CustomField.php b/Transform/CustomField.php
new file mode 100644
index 00000000..7551a389
--- /dev/null
+++ b/Transform/CustomField.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+use XF\CustomField\Definition;
+
+class CustomField extends AbstractHandler
+{
+    const DYNAMIC_KEY_CHOICES = 'choices';
+    const DYNAMIC_KEY_DESCRIPTION = 'description';
+    const DYNAMIC_KEY_ID = 'id';
+    const DYNAMIC_KEY_IS_MULTI_CHOICE = 'is_multi_choice';
+    const DYNAMIC_KEY_IS_REQUIRED = 'is_required';
+    const DYNAMIC_KEY_POSITION = 'position';
+    const DYNAMIC_KEY_TITLE = 'title';
+    const DYNAMIC_KEY_VALUE = 'value';
+    const DYNAMIC_KEY_VALUES = 'values';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var Definition|null $definition */
+        $definition = $context->data('definition');
+        if ($definition === null) {
+            return null;
+        }
+
+        /** @var array|string|null $valueData */
+        $valueData = $context->data('value');
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_CHOICES:
+                if ($valueData !== null) {
+                    return null;
+                }
+
+                if (!$this->hasChoices($definition)) {
+                    return null;
+                }
+
+                $choices = [];
+                foreach ($definition['field_choices'] as $choiceKey => $choiceValue) {
+                    $choices[] = ['key' => $choiceKey, 'value' => $choiceValue];
+                }
+
+                return $choices;
+            case self::DYNAMIC_KEY_DESCRIPTION:
+                return $definition['description'];
+            case self::DYNAMIC_KEY_ID:
+                return $definition['field_id'];
+            case self::DYNAMIC_KEY_IS_MULTI_CHOICE:
+                return $definition['type_group'] === 'multiple';
+            case self::DYNAMIC_KEY_IS_REQUIRED:
+                if ($valueData !== null) {
+                    return null;
+                }
+
+                return $definition->isRequired();
+            case self::DYNAMIC_KEY_POSITION:
+                return $definition['display_group'];
+            case self::DYNAMIC_KEY_TITLE:
+                return $definition['title'];
+            case self::DYNAMIC_KEY_VALUE:
+                if ($valueData === null || $this->hasChoices($definition)) {
+                    return null;
+                }
+
+                return utf8_trim(strval($valueData));
+            case self::DYNAMIC_KEY_VALUES:
+                if ($valueData === null || !$this->hasChoices($definition)) {
+                    return null;
+                }
+
+                $choices = $definition['field_choices'];
+                $choiceKeys = is_array($valueData) ? $valueData : [strval($valueData)];
+                $values = [];
+                foreach ($choiceKeys as $choiceKey) {
+                    if (!isset($choices[$choiceKey])) {
+                        continue;
+                    }
+
+                    $values[] = [
+                        'key' => $choiceKey,
+                        'value' => $choices[$choiceKey],
+                    ];
+                }
+
+                return $values;
+        }
+
+        return null;
+    }
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            self::DYNAMIC_KEY_CHOICES,
+            self::DYNAMIC_KEY_DESCRIPTION,
+            self::DYNAMIC_KEY_ID,
+            self::DYNAMIC_KEY_IS_MULTI_CHOICE,
+            self::DYNAMIC_KEY_IS_REQUIRED,
+            self::DYNAMIC_KEY_POSITION,
+            self::DYNAMIC_KEY_TITLE,
+            self::DYNAMIC_KEY_VALUE,
+            self::DYNAMIC_KEY_VALUES,
+        ];
+    }
+
+    public function onNewContext(TransformContext $context)
+    {
+        $data = parent::onNewContext($context);
+        $data['definition'] = null;
+        $data['value'] = null;
+
+        $source = $context->getSource();
+        if (is_array($source) && count($source) > 0) {
+            $data['definition'] = $source[0];
+
+            if (count($source) > 1) {
+                $data['value'] = $source[1];
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Definition $definition
+     * @return bool
+     */
+    protected function hasChoices($definition)
+    {
+        return in_array($definition['type_group'], ['single', 'multiple'], true);
+    }
+}
diff --git a/Transform/Exception.php b/Transform/Exception.php
new file mode 100644
index 00000000..b0d5cf02
--- /dev/null
+++ b/Transform/Exception.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+class Exception extends AbstractHandler
+{
+    const DYNAMIC_KEY_CODE = 'code';
+    const DYNAMIC_KEY_MESSAGE = 'message';
+    const DYNAMIC_KEY_TRACE = 'trace';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \Exception $exception */
+        $exception = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_CODE:
+                return $exception->getCode();
+            case self::DYNAMIC_KEY_MESSAGE:
+                return $exception->getMessage();
+            case self::DYNAMIC_KEY_TRACE:
+                if (!\XF::$debugMode) {
+                    return null;
+                }
+
+                return explode("\n", $exception->getTraceAsString());
+        }
+
+        return null;
+    }
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            self::DYNAMIC_KEY_CODE,
+            self::DYNAMIC_KEY_MESSAGE,
+            self::DYNAMIC_KEY_TRACE,
+        ];
+    }
+}
diff --git a/Transform/Generic.php b/Transform/Generic.php
new file mode 100644
index 00000000..6d81e617
--- /dev/null
+++ b/Transform/Generic.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+use XF\Mvc\Entity\Entity;
+
+class Generic extends AbstractHandler
+{
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        $source = $context->getSource();
+        if (!isset($source[$key])) {
+            return null;
+        }
+
+        $value = $source[$key];
+        if (!is_array($value) || !is_callable($value)) {
+            return $value;
+        }
+
+        return call_user_func($value, $this, $key);
+    }
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        $mappings = [];
+
+        $source = $context->getSource();
+        if ($source instanceof Entity) {
+            $primaryKey = $source->structure()->primaryKey;
+            if (is_string($primaryKey)) {
+                $mappings[$primaryKey] = $primaryKey;
+            } elseif (is_array($primaryKey)) {
+                foreach ($primaryKey as $column) {
+                    if (is_string($column)) {
+                        $mappings[$column] = $column;
+                    }
+                }
+            }
+        } elseif (is_array($source)) {
+            foreach (array_keys($source) as $key) {
+                if (is_array($source[$key])) {
+                    $mappings[] = $key;
+                } else {
+                    $mappings[$key] = $key;
+                }
+            }
+        }
+
+        return $mappings;
+    }
+}
diff --git a/Transform/LazyTransformer.php b/Transform/LazyTransformer.php
new file mode 100644
index 00000000..c4725479
--- /dev/null
+++ b/Transform/LazyTransformer.php
@@ -0,0 +1,205 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+use XF\Mvc\Entity\Entity;
+use XF\Mvc\Entity\Finder;
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Transformer;
+
+class LazyTransformer implements \JsonSerializable
+{
+    const SOURCE_TYPE_ENTITY = 'entity';
+    const SOURCE_TYPE_FINDER = 'finder';
+
+    /**
+     * @var callable[]
+     */
+    protected $callbacksFinderPostFetch = [];
+
+    /**
+     * @var callable[]
+     */
+    protected $callbacksPostTransform = [];
+
+    /**
+     * @var callable[]
+     */
+    protected $callbacksPreTransform = [];
+
+    /**
+     * @var AbstractController
+     */
+    protected $controller;
+
+    /**
+     * @var mixed|null
+     */
+    protected $source = null;
+
+    /**
+     * @var string
+     */
+    protected $sourceType = '';
+
+    /**
+     * @param AbstractController $controller
+     */
+    public function __construct($controller)
+    {
+        $this->controller = $controller;
+    }
+
+    /**
+     * @param callable $f
+     * @return void
+     */
+    public function addCallbackFinderPostFetch($f)
+    {
+        if ($this->sourceType !== self::SOURCE_TYPE_FINDER) {
+            throw new \LogicException('Source is not a Finder: ' . $this->sourceType);
+        }
+
+        $this->callbacksFinderPostFetch[] = $f;
+    }
+
+    /**
+     * @param callable $f
+     * @return void
+     */
+    public function addCallbackPostTransform($f)
+    {
+        $this->callbacksPostTransform[] = $f;
+    }
+
+    /**
+     * @param callable $f
+     * @return void
+     */
+    public function addCallbackPreTransform($f)
+    {
+        $this->callbacksPreTransform[] = $f;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function jsonSerialize()
+    {
+        return $this->transform();
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogData()
+    {
+        switch ($this->sourceType) {
+            case 'entity':
+                /** @var Entity $entity */
+                $entity = $this->source;
+                if (is_string($entity->structure()->primaryKey)) {
+                    $entityId = $entity->getEntityId();
+                } else {
+                    $entityId = [];
+                    foreach ($entity->structure()->primaryKey as $primaryKey) {
+                        $entityId[] = $entity->getValue($primaryKey);
+                    }
+
+                    $entityId = implode('-', $entityId);
+                }
+
+                return sprintf(
+                    'LazyTransformer(%s@%s)',
+                    \XF::stringToClass($entity->structure()->shortName, '%s\Entity\%s'),
+                    $entityId
+                );
+            case 'finder':
+                /** @var Finder $finder */
+                $finder = $this->source;
+                return sprintf(
+                    'LazyTransformer(%s) => %s',
+                    \XF::stringToClass($finder->getStructure()->shortName, '%s\Finder\%s'),
+                    $finder->getQuery()
+                );
+            default:
+                return 'LazyTransformer(' . $this->sourceType . ')';
+        }
+    }
+
+    /**
+     * @param Entity $entity
+     * @return void
+     */
+    public function setEntity(Entity $entity)
+    {
+        if ($this->source !== null) {
+            throw new \LogicException('Source has already been set: ' . $this->sourceType);
+        }
+
+        $this->source = $entity;
+        $this->sourceType = self::SOURCE_TYPE_ENTITY;
+    }
+
+    /**
+     * @param Finder $finder
+     * @return void
+     */
+    public function setFinder(Finder $finder)
+    {
+        if ($this->source !== null) {
+            throw new \LogicException('Source has already been set: ' . $this->sourceType);
+        }
+
+        $this->source = $finder;
+        $this->sourceType = self::SOURCE_TYPE_FINDER;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function transform()
+    {
+        $controller = $this->controller;
+        /** @var Transformer $transformer */
+        $transformer = $controller->app()->container('api.transformer');
+        $context = $controller->params()->getTransformContext();
+
+        foreach (array_reverse($this->callbacksPreTransform) as $f) {
+            $context = call_user_func($f, $context);
+            if ($context === null) {
+                return null;
+            }
+        }
+
+        switch ($this->sourceType) {
+            case self::SOURCE_TYPE_ENTITY:
+                /** @var Entity $entity */
+                $entity = $this->source;
+                $data = $transformer->transformEntity($context, null, $entity);
+                break;
+            case self::SOURCE_TYPE_FINDER:
+                /** @var Finder $finder */
+                $finder = $this->source;
+                $data = $transformer->transformFinder($context, null, $finder, function ($entities) {
+                    foreach (array_reverse($this->callbacksFinderPostFetch) as $f) {
+                        $entities = call_user_func($f, $entities);
+                    }
+
+                    return $entities;
+                });
+                break;
+            default:
+                throw new \LogicException('Unrecognized source type ' . $this->sourceType);
+        }
+
+        foreach (array_reverse($this->callbacksPostTransform) as $f) {
+            $data = call_user_func($f, $data);
+            if ($data === null) {
+                return null;
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/Transform/Selector.php b/Transform/Selector.php
new file mode 100644
index 00000000..6e5210c1
--- /dev/null
+++ b/Transform/Selector.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+class Selector
+{
+    const ACTION_EXCLUDE = 'exclude';
+    const ACTION_INCLUDE = 'include';
+    const ACTION_NONE = 'none';
+
+    /**
+     * @var string
+     */
+    protected $defaultAction = self::ACTION_NONE;
+
+    /**
+     * @var array
+     */
+    protected $rules = [];
+
+    /**
+     * @return bool
+     */
+    public function hasRules()
+    {
+        if ($this->defaultAction !== self::ACTION_NONE) {
+            return true;
+        }
+
+        if (count($this->rules) > 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $key
+     * @return Selector|null
+     */
+    public function getSubSelector($key)
+    {
+        if (!isset($this->rules[$key])) {
+            return null;
+        }
+
+        $rulesRef =& $this->rules[$key];
+        if (isset($rulesRef['selector'])) {
+            return $rulesRef['selector'];
+        }
+
+        $selector = new self();
+        $selector->parseRules($rulesRef['excludes'], $rulesRef['includes']);
+        $rulesRef['selector'] = $selector;
+
+        return $selector;
+    }
+
+    /**
+     * @param string|array $exclude
+     * @param string|array $include
+     * @return void
+     */
+    public function parseRules($exclude, $include)
+    {
+        $this->rules = [];
+
+        $this->parseRulesInclude($include);
+        $this->parseRulesExclude($exclude);
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function shouldExcludeField($key)
+    {
+        if ($this->defaultAction === self::ACTION_EXCLUDE) {
+            if (isset($this->rules[$key])) {
+                $rulesRef =& $this->rules[$key];
+                $action = is_string($rulesRef['action']) ? $rulesRef['action'] : $this->defaultAction;
+                if ($action === self::ACTION_INCLUDE || count($rulesRef['includes']) > 0) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        if (isset($this->rules[$key])) {
+            $rulesRef =& $this->rules[$key];
+            $action = is_string($rulesRef['action']) ? $rulesRef['action'] : $this->defaultAction;
+            if ($action === self::ACTION_EXCLUDE && count($rulesRef['includes']) === 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function shouldIncludeField($key)
+    {
+        if ($this->defaultAction !== self::ACTION_NONE) {
+            return !$this->shouldExcludeField($key);
+        }
+
+        if (isset($this->rules[$key])) {
+            $rulesRef =& $this->rules[$key];
+            $action = is_string($rulesRef['action']) ? $rulesRef['action'] : $this->defaultAction;
+            if ($action === self::ACTION_INCLUDE || count($rulesRef['includes']) > 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $key
+     * @return void
+     */
+    protected function makeSureRuleExists($key)
+    {
+        if (isset($this->rules[$key])) {
+            return;
+        }
+
+        $this->rules[$key] = [
+            'action' => null,
+            'excludes' => [],
+            'includes' => [],
+        ];
+    }
+
+    /**
+     * @param string|array $rules
+     * @return void
+     */
+    protected function parseRulesExclude($rules)
+    {
+        if (!is_array($rules)) {
+            $rules = explode(',', $rules);
+        }
+
+        foreach ($rules as $rule) {
+            $rule = trim($rule);
+            if ($rule === '') {
+                continue;
+            }
+
+            $parts = explode('.', $rule, 2);
+            $key = $parts[0];
+            if ($key === '') {
+                continue;
+            }
+
+            if ($key === '*') {
+                $this->defaultAction = self::ACTION_EXCLUDE;
+                continue;
+            }
+
+            $this->makeSureRuleExists($key);
+
+            if (isset($parts[1])) {
+                $this->rules[$key]['excludes'][] = $parts[1];
+            } else {
+                $this->rules[$key]['action'] = self::ACTION_EXCLUDE;
+            }
+        }
+    }
+
+    /**
+     * @param string|array $rules
+     * @return void
+     */
+    protected function parseRulesInclude($rules)
+    {
+        if (!is_array($rules)) {
+            $rules = explode(',', $rules);
+        }
+
+        foreach ($rules as $rule) {
+            $rule = trim($rule);
+            if ($rule === '') {
+                continue;
+            }
+
+            $parts = explode('.', $rule, 2);
+            $key = $parts[0];
+            if ($key === '') {
+                continue;
+            }
+
+            if ($key === '*') {
+                $this->defaultAction = self::ACTION_INCLUDE;
+                continue;
+            }
+
+            if ($this->defaultAction === self::ACTION_NONE) {
+                $this->defaultAction = self::ACTION_EXCLUDE;
+            }
+
+            $this->makeSureRuleExists($key);
+            $this->rules[$key]['action'] = self::ACTION_INCLUDE;
+
+            if (isset($parts[1])) {
+                $this->rules[$key]['includes'][] = $parts[1];
+            }
+        }
+    }
+}
diff --git a/Transform/TransformContext.php b/Transform/TransformContext.php
new file mode 100644
index 00000000..54248e9c
--- /dev/null
+++ b/Transform/TransformContext.php
@@ -0,0 +1,276 @@
+<?php
+
+namespace Xfrocks\Api\Transform;
+
+use Xfrocks\Api\Transformer;
+
+class TransformContext
+{
+    /**
+     * @var array
+     */
+    public $onTransformFinderCallbacks = [];
+
+    /**
+     * @var array
+     */
+    public $onTransformEntitiesCallbacks = [];
+
+    /**
+     * @var array
+     */
+    public $onTransformedCallbacks = [];
+
+    /**
+     * @var array
+     *
+     * @see AbstractHandler::onNewContext()
+     * @see Transformer::transform()
+     */
+    protected $contextData = [];
+
+    /**
+     * @var AbstractHandler|null
+     */
+    protected $handler;
+
+    /**
+     * @var TransformContext|null
+     */
+    protected $parentContext;
+
+    /**
+     * @var TransformContext
+     */
+    protected $rootContext;
+
+    /**
+     * @var Selector|null
+     */
+    protected $selector;
+
+    /**
+     * @var Selector[]
+     */
+    protected $selectorByTypes = [];
+
+    /**
+     * @var Selector|null
+     */
+    protected $selectorDefault = null;
+
+    /**
+     * @var mixed|null
+     */
+    protected $source;
+
+    /**
+     * @param AbstractHandler|null $handler
+     * @param mixed|null $source
+     * @param Selector|null $selector
+     */
+    public function __construct($handler = null, $source = null, $selector = null)
+    {
+        $this->handler = $handler;
+        $this->source = $source;
+        $this->selector = $selector;
+
+        $this->rootContext = $this;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function data($key)
+    {
+        if (!isset($this->contextData[$key])) {
+            return null;
+        }
+
+        return $this->contextData[$key];
+    }
+
+    /**
+     * @return AbstractHandler|null
+     */
+    public function getHandler()
+    {
+        return $this->handler;
+    }
+
+    /**
+     * @return array
+     */
+    public function getOnTransformedCallbacks()
+    {
+        return $this->rootContext->onTransformedCallbacks;
+    }
+
+    /**
+     * @return array
+     */
+    public function getOnTransformEntitiesCallbacks()
+    {
+        return $this->rootContext->onTransformEntitiesCallbacks;
+    }
+
+    /**
+     * @return array
+     */
+    public function getOnTransformFinderCallbacks()
+    {
+        return $this->rootContext->onTransformFinderCallbacks;
+    }
+
+    /**
+     * @return AbstractHandler|null
+     */
+    public function getParentHandler()
+    {
+        if ($this->parentContext === null) {
+            return null;
+        }
+
+        return $this->parentContext->getHandler();
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getParentSource()
+    {
+        if ($this->parentContext === null) {
+            return null;
+        }
+
+        return $this->parentContext->getSource();
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getParentSourceValue($key)
+    {
+        if ($this->parentContext === null) {
+            return null;
+        }
+
+        return $this->parentContext->getSourceValue($key);
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getSourceValue($key)
+    {
+        return $this->source !== null ? $this->source[$key] : null;
+    }
+
+    /**
+     * @param string|null $key
+     * @param AbstractHandler|null $subHandler
+     * @param mixed|null $subSource
+     * @return TransformContext
+     */
+    public function getSubContext($key = null, $subHandler = null, $subSource = null)
+    {
+        $subSelector = $this->selector;
+        if ($subSelector !== null && $key !== null) {
+            $subSelector = $subSelector->getSubSelector($key);
+        }
+
+        $subContext = new TransformContext($subHandler, $subSource, $subSelector);
+        $subContext->parentContext = $this;
+        $subContext->rootContext = $this->rootContext;
+
+        if ($key === null) {
+            $subContext->setData($this->contextData);
+        }
+
+        return $subContext;
+    }
+
+    /**
+     * @param string $handlerType
+     * @return Selector
+     */
+    public function makeSureSelectorIsNotNull($handlerType)
+    {
+        if ($this->selector === null) {
+            $this->selector = $this->getSelectorDefault();
+        }
+
+        if (!$this->selector->hasRules()) {
+            if (isset($this->rootContext->selectorByTypes[$handlerType])) {
+                $this->selector = $this->rootContext->selectorByTypes[$handlerType];
+            }
+        } else {
+            if (!isset($this->rootContext->selectorByTypes[$handlerType])) {
+                $this->rootContext->selectorByTypes[$handlerType] = $this->selector;
+            }
+        }
+
+        return $this->selector;
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function selectorShouldExcludeField($key)
+    {
+        return $this->selector !== null ? $this->selector->shouldExcludeField($key) : false;
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function selectorShouldIncludeField($key)
+    {
+        return $this->selector !== null ? $this->selector->shouldIncludeField($key) : false;
+    }
+
+    /**
+     * @param array|mixed $data
+     * @param mixed|null $key
+     * @return void
+     */
+    public function setData($data, $key = null)
+    {
+        if ($key === null) {
+            if (!is_array($data)) {
+                throw new \InvalidArgumentException('$data is not an array');
+            }
+
+            $this->contextData = array_merge($this->contextData, $data);
+        } else {
+            $this->contextData[$key] = $data;
+        }
+    }
+
+    /**
+     * @return Selector
+     */
+    protected function getSelectorDefault()
+    {
+        $rootContext = $this->rootContext;
+
+        if ($rootContext->selectorDefault === null) {
+            $rootContext->selectorDefault = new Selector();
+        }
+
+        return $rootContext->selectorDefault;
+    }
+}
diff --git a/Transformer.php b/Transformer.php
new file mode 100644
index 00000000..88e61f53
--- /dev/null
+++ b/Transformer.php
@@ -0,0 +1,329 @@
+<?php
+
+namespace Xfrocks\Api;
+
+use XF\Container;
+use XF\Mvc\Entity\Entity;
+use Xfrocks\Api\Data\Modules;
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Transformer
+{
+    /**
+     * @var \XF\App
+     */
+    protected $app;
+
+    /**
+     * @var Container
+     */
+    protected $container;
+
+    /**
+     * @param \XF\App $app
+     */
+    public function __construct($app)
+    {
+        $this->app = $app;
+        $this->container = new Container();
+
+        $this->container->factory('handler', function ($type) {
+            $class = \XF::stringToClass($type, '%s\Api\Transform\%s');
+            $class = $this->app->extendClass($class);
+
+            if (!class_exists($class)) {
+                /** @var Modules $modules */
+                $modules = $this->app->data('Xfrocks\Api:Modules');
+                $class = $modules->getTransformerClass($type);
+                $class = $this->app->extendClass($class);
+            }
+
+            if (!class_exists($class)) {
+                $class = 'Xfrocks\Api\Transform\Generic';
+            }
+
+            return new $class($this->app, $this, $type);
+        });
+    }
+
+    /**
+     * @param string $type
+     * @return AbstractHandler
+     */
+    public function handler($type = '')
+    {
+        return $this->container->create('handler', $type);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string|null $key
+     * @param array $values
+     * @return array
+     */
+    public function transformArray($context, $key, array $values)
+    {
+        $subContext = $context->getSubContext($key, $this->handler(), $values);
+        return $this->transform($subContext);
+    }
+
+    /**
+     * @param \XF\Mvc\Reply\AbstractReply $reply
+     * @return array
+     */
+    public function transformBatchJobReply($reply)
+    {
+        /** @var \Xfrocks\Api\Transform\BatchJobReply $handler */
+        $handler = $this->handler('Xfrocks:BatchJobReply');
+        $context = new TransformContext($handler, $reply);
+        return $this->transform($context);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param \XF\CustomField\DefinitionSet $set
+     * @param string $key
+     * @return array
+     */
+    public function transformCustomFieldDefinitionSet($context, $set, $key = AbstractHandler::DYNAMIC_KEY_FIELDS)
+    {
+        /** @var \Xfrocks\Api\Transform\CustomField $subHandler */
+        $subHandler = $this->handler('Xfrocks:CustomField');
+
+        $data = [];
+        foreach ($set->getIterator() as $definition) {
+            $subContext = $context->getSubContext($key, $subHandler, [$definition]);
+            $data[] = $this->transform($subContext);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param \XF\CustomField\Set $set
+     * @param string $key
+     * @return array
+     */
+    public function transformCustomFieldSet($context, $set, $key = AbstractHandler::DYNAMIC_KEY_FIELDS)
+    {
+        $definitionSet = $set->getDefinitionSet();
+        /** @var \Xfrocks\Api\Transform\CustomField $subHandler */
+        $subHandler = $this->handler('Xfrocks:CustomField');
+
+        $data = [];
+        foreach ($set->getIterator() as $field => $value) {
+            if (!isset($definitionSet[$field])) {
+                continue;
+            }
+            $definition = $definitionSet[$field];
+
+            $subContext = $context->getSubContext($key, $subHandler, [$definition, $value]);
+            $data[] = $this->transform($subContext);
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string|null $key
+     * @param Entity $subEntity
+     * @return array
+     */
+    public function transformEntity($context, $key, $subEntity)
+    {
+        $subHandler = $this->handler($subEntity->structure()->shortName);
+        $subContext = $context->getSubContext($key, $subHandler, $subEntity);
+        return $this->transform($subContext);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string|null $key
+     * @param Entity $entity
+     * @param string $relationKey
+     * @return array
+     */
+    public function transformEntityRelation($context, $key, $entity, $relationKey)
+    {
+        $entityStructure = $entity->structure();
+        if (!isset($entityStructure->relations[$relationKey])) {
+            return [];
+        }
+
+        $relationConfig = $entityStructure->relations[$relationKey];
+        if (!is_array($relationConfig) ||
+            !isset($relationConfig['type']) ||
+            !isset($relationConfig['entity'])
+        ) {
+            return [];
+        }
+
+        $relationData = $entity->getRelation($relationKey);
+        if ($relationConfig['type'] === Entity::TO_ONE) {
+            /** @var Entity $subEntity */
+            $subEntity = $relationData;
+            return $this->transformEntity($context, $key, $subEntity);
+        }
+
+        $subHandler = $this->handler($relationConfig['entity']);
+
+        $data = [];
+        /** @var Entity[] $subEntities */
+        $subEntities = $relationData;
+        $subContextTemp = $context->getSubContext($key, null, null);
+        $subEntities = $subHandler->onTransformEntities($subContextTemp, $subEntities);
+
+        foreach ($subEntities as $subEntity) {
+            $subContext = $context->getSubContext($key, $subHandler, $subEntity);
+            $subEntityData = $this->transform($subContext);
+            if (count($subEntityData) > 0) {
+                $data[] = $subEntityData;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param \Exception $exception
+     * @return array
+     */
+    public function transformException($exception)
+    {
+        $handler = $this->handler('Xfrocks:Exception');
+        $context = new TransformContext($handler, $exception);
+        return $this->transform($context);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string|null $key
+     * @param \XF\Mvc\Entity\Finder $finder
+     * @param callable|null $postFetchCallback
+     * @return array
+     */
+    public function transformFinder($context, $key, $finder, $postFetchCallback = null)
+    {
+        $handler = $this->handler($finder->getStructure()->shortName);
+        $finder = $handler->onTransformFinder($context, $finder);
+
+        $entities = $finder->fetch();
+        if ($postFetchCallback !== null) {
+            $entities = call_user_func($postFetchCallback, $entities);
+        }
+        if ($entities instanceof \XF\Mvc\Entity\ArrayCollection) {
+            $entities = $entities->toArray();
+        }
+        $entities = $handler->onTransformEntities($context, $entities);
+
+        $data = [];
+        foreach ($entities as $entity) {
+            $entityContext = $context->getSubContext(null, $handler, $entity);
+            $entityData = $this->transform($entityContext);
+            if (count($entityData) === 0) {
+                continue;
+            }
+
+            $data[] = $entityData;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param mixed $tags
+     * @return array
+     */
+    public function transformTags($context, $tags)
+    {
+        if (!is_array($tags) || count($tags) === 0) {
+            return [];
+        }
+
+        $data = [];
+
+        foreach ($tags as $tagId => $tag) {
+            $data[strval($tagId)] = $tag['tag'];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string $key
+     * @param array|null $values
+     * @param array $data
+     * @return void
+     */
+    protected function addArrayToData($context, $key, $values, array &$data)
+    {
+        if (!is_array($values) || count($values) === 0) {
+            return;
+        }
+
+        $transformed = $this->transformArray($context, $key, $values);
+        if (count($transformed) === 0) {
+            return;
+        }
+
+        $data[$key] = $transformed;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array
+     */
+    protected function transform($context)
+    {
+        $data = [];
+        $handler = $context->getHandler();
+        if ($handler === null) {
+            return $data;
+        }
+
+        $contextData = $handler->onNewContext($context);
+        $context->setData($contextData);
+
+        if (!$handler->canView($context)) {
+            return $data;
+        }
+
+        $handler->addAttachmentsToQueuedEntities();
+
+        $mappings = $handler->getMappings($context);
+        foreach ($mappings as $key => $mapping) {
+            if ($context->selectorShouldExcludeField($mapping)) {
+                continue;
+            }
+
+            $value = null;
+            if (is_string($key)) {
+                $value = $context->getSourceValue($key);
+            } else {
+                $value = $handler->calculateDynamicValue($context, $mapping);
+            }
+            if ($value !== null) {
+                $data[$mapping] = $value;
+            }
+        }
+
+        if (!$context->selectorShouldExcludeField(AbstractHandler::KEY_LINKS)) {
+            $links = $handler->collectLinks($context);
+            $this->addArrayToData($context, AbstractHandler::KEY_LINKS, $links, $data);
+        }
+
+        if (!$context->selectorShouldExcludeField(AbstractHandler::KEY_PERMISSIONS)) {
+            $permissions = $handler->collectPermissions($context);
+            $this->addArrayToData($context, AbstractHandler::KEY_PERMISSIONS, $permissions, $data);
+        }
+
+        $handler->onTransformed($context, $data);
+
+        return $data;
+    }
+}
diff --git a/Util/Cors.php b/Util/Cors.php
new file mode 100644
index 00000000..1074a109
--- /dev/null
+++ b/Util/Cors.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+class Cors
+{
+    /**
+     * @param \XF\Http\Response $response
+     * @return void
+     */
+    public static function addHeaders($response)
+    {
+        $app = \XF::app();
+        if (!$app->options()->bdApi_cors) {
+            return;
+        }
+
+        $request = $app->request();
+
+        $origin = $request->getServer('HTTP_ORIGIN');
+        if ($origin !== false) {
+            $response->header('Access-Control-Allow-Origin', $origin, true);
+            $response->header('Access-Control-Allow-Credentials', 'true', true);
+        } else {
+            $response->header('Access-Control-Allow-Origin', '*', true);
+        }
+
+        $method = $request->getServer('HTTP_ACCESS_CONTROL_REQUEST_METHOD');
+        if ($method !== false) {
+            $response->header('Access-Control-Allow-Methods', $method, true);
+        }
+
+        $headers = $request->getServer('HTTP_ACCESS_CONTROL_REQUEST_HEADERS');
+        if ($headers !== false) {
+            $response->header('Access-Control-Allow-Headers', $headers, true);
+        }
+    }
+}
diff --git a/Util/Crypt.php b/Util/Crypt.php
new file mode 100644
index 00000000..a9ee7d78
--- /dev/null
+++ b/Util/Crypt.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+use XF\PrintableException;
+use Xfrocks\Api\Entity\Token;
+
+class Crypt
+{
+    const ALGO_AES_128 = 'aes128';
+    const ALGO_AES_256 = 'aes256';
+
+    const OPENSSL_METHOD_AES128 = 'aes-128-ecb';
+    const OPENSSL_METHOD_AES256 = 'aes-256-cbc';
+    const OPENSSL_OPT_RAW_DATA = 1;
+
+    /**
+     * @return string
+     */
+    public static function getDefaultAlgo()
+    {
+        return self::ALGO_AES_128;
+    }
+
+    /**
+     * @param string $data
+     * @param string $algo
+     * @param string|false $key
+     * @return string
+     * @throws PrintableException
+     */
+    public static function encrypt($data, $algo, $key = false)
+    {
+        if ($key === false) {
+            $key = self::getKey();
+        }
+
+        switch ($algo) {
+            case self::ALGO_AES_128:
+                $encrypted = self::aes128Encrypt($data, $key);
+                break;
+            case self::ALGO_AES_256:
+                $encrypted = self::aes256Encrypt($data, $key);
+                break;
+            default:
+                throw new \InvalidArgumentException('Unknown algo');
+        }
+
+        if ($encrypted === false) {
+            throw new \InvalidArgumentException('Cannot encrypt data');
+        }
+
+        return base64_encode($encrypted);
+    }
+
+    /**
+     * @param string $data
+     * @param string $algo
+     * @param string|false $key
+     * @return string|false
+     * @throws PrintableException
+     */
+    public static function decrypt($data, $algo, $key = false)
+    {
+        if ($key === false) {
+            $key = self::getKey();
+        }
+
+        $decoded = base64_decode($data, true);
+        if ($decoded === false) {
+            throw new \InvalidArgumentException('Cannot decode data');
+        }
+
+        switch ($algo) {
+            case self::ALGO_AES_128:
+                return self::aes128Decrypt($decoded, $key);
+            case self::ALGO_AES_256:
+                return self::aes256Decrypt($decoded, $key);
+            default:
+                throw new \InvalidArgumentException('Unknown algo');
+        }
+    }
+
+    /**
+     * @param string $data
+     * @param int $timestamp
+     * @return string
+     * @throws PrintableException
+     */
+    public static function encryptTypeOne($data, $timestamp)
+    {
+        $algo = self::getDefaultAlgo();
+        $key = $timestamp . \XF::app()->config('globalSalt');
+        return self::encrypt($data, $algo, $key);
+    }
+
+    /**
+     * @param string $data
+     * @param int $timestamp
+     * @return string
+     * @throws PrintableException
+     */
+    public static function decryptTypeOne($data, $timestamp)
+    {
+        if ($timestamp < \XF::$time) {
+            throw new \InvalidArgumentException('$timestamp has expired');
+        }
+
+        $algo = self::getDefaultAlgo();
+        $key = $timestamp . \XF::app()->config('globalSalt');
+        $decrypted = self::decrypt($data, $algo, $key);
+
+        if ($decrypted === false || $decrypted === '') {
+            throw new \LogicException('$data could not be decrypted');
+        }
+
+        return $decrypted;
+    }
+
+    /**
+     * @return string
+     * @throws PrintableException
+     */
+    protected static function getKey()
+    {
+        /** @var mixed $session */
+        $session = \XF::app()->session();
+        $callable = [$session, 'getToken'];
+
+        $clientSecret = '';
+        if (is_callable($callable)) {
+            /** @var Token|null $token */
+            $token = call_user_func($callable);
+            $client = $token !== null ? $token->Client : null;
+            $clientSecret = $client !== null ? $client->client_secret : '';
+        }
+
+        if ($clientSecret === '') {
+            throw new PrintableException(\XF::phrase('bdapi_request_must_authorize_to_encrypt'));
+        }
+
+        return $clientSecret;
+    }
+
+    /**
+     * @param string $data
+     * @param string $key
+     * @return string|false
+     */
+    protected static function aes128Encrypt($data, $key)
+    {
+        $key = md5($key, true);
+        return openssl_encrypt($data, self::OPENSSL_METHOD_AES128, $key, self::OPENSSL_OPT_RAW_DATA);
+    }
+
+    /**
+     * @param string $data
+     * @param string $key
+     * @return string|false
+     */
+    protected static function aes128Decrypt($data, $key)
+    {
+        $key = md5($key, true);
+        return openssl_decrypt($data, self::OPENSSL_METHOD_AES128, $key, self::OPENSSL_OPT_RAW_DATA);
+    }
+
+    /**
+     * @param string $data
+     * @param string $key
+     * @return string|false
+     */
+    protected static function aes256Encrypt($data, $key)
+    {
+        $ivLength = openssl_cipher_iv_length(self::OPENSSL_METHOD_AES256);
+        if ($ivLength === false) {
+            throw new \InvalidArgumentException('Cannot encrypt data');
+        }
+
+        $iv = openssl_random_pseudo_bytes($ivLength);
+        if ($iv === false) {
+            throw new \InvalidArgumentException('Cannot encrypt data');
+        }
+
+        $encrypted = openssl_encrypt($data, self::OPENSSL_METHOD_AES256, $key, self::OPENSSL_OPT_RAW_DATA, $iv);
+        if ($encrypted === false) {
+            return false;
+        }
+
+        return self::ALGO_AES_256 . $iv . $encrypted;
+    }
+
+    /**
+     * @param string $data
+     * @param string $key
+     * @return string|false
+     */
+    protected static function aes256Decrypt($data, $key)
+    {
+        /** @var int|false $prefixLength */
+        $prefixLength = mb_strlen(self::ALGO_AES_256, '8bit');
+        if ($prefixLength === false) {
+            throw new \InvalidArgumentException('Cannot decrypt data');
+        }
+
+        $prefix = mb_substr($data, 0, $prefixLength);
+        if ($prefix === self::ALGO_AES_256) {
+            $ivLength = openssl_cipher_iv_length(self::OPENSSL_METHOD_AES256);
+            if ($ivLength === false) {
+                throw new \InvalidArgumentException('Cannot decrypt data');
+            }
+
+            $iv = mb_substr($data, $prefixLength, $ivLength, '8bit');
+            $encrypted = mb_substr($data, $prefixLength + $ivLength, null, '8bit');
+
+            return openssl_decrypt($encrypted, self::OPENSSL_METHOD_AES256, $key, self::OPENSSL_OPT_RAW_DATA, $iv);
+        }
+
+        return false;
+    }
+}
diff --git a/Util/Html.php b/Util/Html.php
new file mode 100644
index 00000000..af08e5b5
--- /dev/null
+++ b/Util/Html.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+class Html
+{
+    /**
+     * @param string $color
+     * @return array
+     */
+    public static function parseColor($color)
+    {
+        if (preg_match('/^#(([0-9a-f]{3}){1,2})$/i', $color, $matches) !== 1) {
+            return [0, 0, 0];
+        }
+
+        $code = $matches[1];
+        $codeLength = strlen($code);
+        $elementLength = intval($codeLength / 3);
+
+        $elements = [];
+        for ($i = 0; $i < 3; $i++) {
+            $hex = substr($code, $i * $elementLength, $elementLength);
+            $elements[$i] = hexdec($hex);
+        }
+
+        return $elements;
+    }
+
+    /**
+     * @param string $fontFamily
+     * @return string
+     */
+    public static function parseFontFamily($fontFamily)
+    {
+        $parts = explode(',', $fontFamily);
+        $font = strval(reset($parts));
+        $font = trim($font);
+
+        if (preg_match('#^(\'|")(.+)\\1$#', $font, $matches) === 1) {
+            $font = $matches[2];
+        }
+
+        return $font;
+    }
+}
diff --git a/Util/OneTimeToken.php b/Util/OneTimeToken.php
new file mode 100644
index 00000000..741a7932
--- /dev/null
+++ b/Util/OneTimeToken.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\OAuth2\Server;
+
+class OneTimeToken
+{
+    /**
+     * @param int $ttl
+     * @param Client $client
+     * @return string
+     */
+    public static function generate($ttl, $client)
+    {
+        $userId = 0;
+        $timestamp = time() + $ttl;
+        $tokenText = '';
+        $once = self::generateOnce($userId, $timestamp, $tokenText, $client->client_secret);
+        $ott = sprintf('%d,%d,%s,%s', $userId, $timestamp, $once, $client->client_id);
+
+        return $ott;
+    }
+
+    /**
+     * @param int $userId
+     * @param int $timestamp
+     * @param string $tokenText
+     * @param string $clientSecret
+     * @return string
+     */
+    public static function generateOnce($userId, $timestamp, $tokenText, $clientSecret)
+    {
+        return md5($userId . $timestamp . $tokenText . $clientSecret);
+    }
+
+    /**
+     * @param Server $server
+     * @param string $ott
+     * @return Token|null
+     */
+    public static function parse($server, $ott)
+    {
+        if (preg_match('/^(\d+),(\d+),(.{32}),(.+)$/', $ott, $matches) !== 1) {
+            return null;
+        }
+
+        $userId = intval($matches[1]);
+        $timestamp = intval($matches[2]);
+        $once = $matches[3];
+        $clientId = $matches[4];
+
+        if ($timestamp < time()) {
+            return null;
+        }
+
+        $app = \XF::app();
+        /** @var Token $token */
+        $token = $app->em()->create('Xfrocks\Api:Token');
+        $token->client_id = $clientId;
+        $token->token_text = $ott;
+        $token->expire_date = $timestamp;
+        $token->user_id = $userId;
+        $token->setScopes($server->getScopeDefaults());
+
+        $client = $token->Client;
+        if ($client === null) {
+            return null;
+        }
+
+        if ($userId === 0) {
+            if ($once !== self::generateOnce($userId, $timestamp, '', $client->client_secret)) {
+                return null;
+            }
+            return $token;
+        }
+
+        /** @var \XF\Repository\User $userRepo */
+        $userRepo = $app->repository('XF:User');
+        $userWith = $userRepo->getVisitorWith();
+        $with = array_map(function ($with) {
+            return 'User.' . $with;
+        }, $userWith);
+
+        $userTokenTexts = $app->finder('Xfrocks\Api:Token')
+            ->where('client_id', $client->client_id)
+            ->where('user_id', $userId)
+            ->with($with)
+            ->with('Client', true)
+            ->pluckFrom('expire_date', 'token_text')
+            ->fetch();
+
+        foreach ($userTokenTexts as $userTokenText => $expireDate) {
+            if ($once === self::generateOnce($userId, $timestamp, $userTokenText, $client->client_secret)) {
+                $token->expire_date = min($token->expire_date, $expireDate);
+                return $token;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/Util/PageNav.php b/Util/PageNav.php
new file mode 100644
index 00000000..1887ba89
--- /dev/null
+++ b/Util/PageNav.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+use Xfrocks\Api\Data\Params;
+
+class PageNav
+{
+    /**
+     * @param array $data
+     * @param Params $params
+     * @param int $total
+     * @param string $link
+     * @param mixed $linkData
+     * @param array $config
+     * @return array|null
+     */
+    public static function addLinksToData(
+        array &$data,
+        Params $params,
+        $total,
+        $link,
+        $linkData = null,
+        array $config = []
+    ) {
+        $filteredLimit = $params->getFilteredLimit();
+        $filteredPage = $params->getFilteredPage();
+        if (!is_array($filteredLimit) || !is_array($filteredPage)) {
+            return null;
+        }
+
+        $limit = $filteredLimit['value'];
+        if ($total <= $limit) {
+            return null;
+        }
+
+        $keyLinks = self::mapKey($config, 'links');
+        $keyNext = self::mapKey($config, 'next');
+        $keyPages = self::mapKey($config, 'pages');
+        $keyPrev = self::mapKey($config, 'prev');
+        $pageNav = [];
+        $pageNav[$keyPages] = ceil($total / $limit);
+        $pageMax = $filteredPage['max'];
+        if ($pageMax > 0) {
+            $pageNav[$keyPages] = min($pageNav[$keyPages], $pageMax);
+        }
+        if ($pageNav[$keyPages] < 2) {
+            return null;
+        }
+
+        $page = $filteredPage['value'];
+        $keyPage = $filteredPage['key'];
+        $pageNav[$keyPage] = max(1, min($page, $pageNav[$keyPages]));
+
+        $linkParams = [];
+        foreach ($params->getFilteredValues() as $linkParamKey => $linkParamValue) {
+            $paramFiltered = $params->getFiltered($linkParamKey);
+            if (!is_array($paramFiltered)) {
+                continue;
+            }
+            if ($linkParamValue === $paramFiltered['default']) {
+                continue;
+            }
+
+            $linkParams[$linkParamKey] = $linkParamValue;
+        }
+        ksort($linkParams);
+
+        if ($pageNav[$keyPage] > 1) {
+            $prevLinkParams = array_merge($linkParams, [$keyPage => $pageNav[$keyPage] - 1]);
+            $pageNav[$keyPrev] = $params->getController()->buildApiLink($link, $linkData, $prevLinkParams);
+        }
+
+        if ($pageNav[$keyPage] < $pageNav['pages']) {
+            $nextLinkParams = array_merge($linkParams, [$keyPage => $pageNav[$keyPage] + 1]);
+            $pageNav[$keyNext] = $params->getController()->buildApiLink($link, $linkData, $nextLinkParams);
+        }
+
+        if (!isset($data[$keyLinks])) {
+            $data[$keyLinks] = [];
+        }
+        $data[$keyLinks] = array_merge($data[$keyLinks], $pageNav);
+
+        return $pageNav;
+    }
+
+    /**
+     * @param array $config
+     * @param string $key
+     * @return string
+     */
+    protected static function mapKey(array $config, $key)
+    {
+        if (!isset($config['keys']) || !isset($config['keys'][$key])) {
+            return $key;
+        }
+        return $config['keys'][$key];
+    }
+}
diff --git a/Util/ParentFinder.php b/Util/ParentFinder.php
new file mode 100644
index 00000000..b76dd677
--- /dev/null
+++ b/Util/ParentFinder.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+class ParentFinder
+{
+    /**
+     * @var \XF\Mvc\Entity\Finder
+     */
+    protected $finder;
+
+    /**
+     * @var \XF\Mvc\Entity\Finder|null
+     */
+    protected $parentFinder;
+
+    /**
+     * @var string
+     */
+    protected $relationKey;
+
+    /**
+     * @param \XF\Mvc\Entity\Finder $finder
+     * @param string $relationKey
+     */
+    public function __construct($finder, $relationKey)
+    {
+        $structure = $finder->getStructure();
+
+        if (!isset($structure->relations[$relationKey])) {
+            throw new \InvalidArgumentException(
+                sprintf('%s does not have relation %s', $structure->shortName, $relationKey)
+            );
+        }
+
+        $relationConfig = $structure->relations[$relationKey];
+        if (!is_array($relationConfig) || !isset($relationConfig['entity'])) {
+            throw new \InvalidArgumentException(
+                sprintf('Relation %s.%s has invalid config', $structure->shortName, $relationKey)
+            );
+        }
+
+        $this->finder = $finder;
+        $this->parentFinder = self::getParentFinderOfType($finder, $relationConfig['entity']);
+        $this->relationKey = $relationKey;
+    }
+
+    /**
+     * @param string $name
+     * @return void
+     */
+    public function with($name)
+    {
+        if ($this->parentFinder !== null) {
+            $this->parentFinder->with($name);
+        } else {
+            $this->finder->with(sprintf('%s.%s', $this->relationKey, $name));
+        }
+    }
+
+    /**
+     * @param \XF\Mvc\Entity\Finder $finder
+     * @param string $shortName
+     * @return \XF\Mvc\Entity\Finder|null
+     */
+    public static function getParentFinderOfType($finder, $shortName)
+    {
+        while (true) {
+            if ($finder->getStructure()->shortName === $shortName) {
+                return $finder;
+            }
+
+            $finder = $finder->getParentFinder();
+            if (!$finder) {
+                break;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/Util/Token.php b/Util/Token.php
new file mode 100644
index 00000000..a9b1669a
--- /dev/null
+++ b/Util/Token.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Storage\SessionStorage;
+use Xfrocks\Api\OAuth2\TokenType\BearerWithScope;
+
+class Token
+{
+    /**
+     * @param \League\OAuth2\Server\Entity\AccessTokenEntity $accessToken
+     * @param \League\OAuth2\Server\Entity\RefreshTokenEntity|null $refreshToken
+     * @return array
+     *
+     * @see \League\OAuth2\Server\TokenType\Bearer::generateResponse()
+     * @see BearerWithScope::generateResponse()
+     */
+    public static function transformLibAccessTokenEntity($accessToken, $refreshToken = null)
+    {
+        $scopeIds = [];
+        foreach ($accessToken->getScopes() as $scope) {
+            $scopeIds[] = $scope->getId();
+        }
+
+        // TODO: find a better way to keep token response data in sync with BearerWithScope
+        $response = [
+            'access_token' => $accessToken->getId(),
+            'expires_in' => $accessToken->getExpireTime() - time(),
+            'scope' => implode(Listener::$scopeDelimiter, $scopeIds),
+            'token_type' => 'Bearer',
+        ];
+
+        if ($refreshToken !== null) {
+            $response['refresh_token'] = $refreshToken->getId();
+        }
+
+        /** @var \League\OAuth2\Server\Entity\SessionEntity|null $session */
+        $session = $accessToken->getSession();
+        if ($session !== null && $session->getOwnerType() === SessionStorage::OWNER_TYPE_USER) {
+            $response['user_id'] = intval($session->getOwnerId());
+        }
+
+        return $response;
+    }
+}
diff --git a/Util/Tree.php b/Util/Tree.php
new file mode 100644
index 00000000..a809d989
--- /dev/null
+++ b/Util/Tree.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Xfrocks\Api\Util;
+
+class Tree
+{
+    /**
+     * @param \XF\Tree $tree
+     * @param array $ids
+     * @return array
+     */
+    public static function getAllChildIds($tree, array $ids)
+    {
+        $i = 0;
+        while ($i < count($ids)) {
+            $childIds = $tree->childIds($ids[$i]);
+            $i++;
+
+            if (count($childIds) === 0) {
+                continue;
+            }
+
+            $ids = array_merge($ids, $childIds);
+        }
+
+        return $ids;
+    }
+}
diff --git a/View/Asset/Sdk.php b/View/Asset/Sdk.php
new file mode 100644
index 00000000..c675aff3
--- /dev/null
+++ b/View/Asset/Sdk.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Xfrocks\Api\View\Asset;
+
+class Sdk extends \XF\Mvc\View
+{
+    /**
+     * @return string
+     */
+    public function renderRaw()
+    {
+        $this->response->contentType('application/x-javascript');
+        $this->response->header('Cache-Control', 'public, max-age=31536000');
+
+        return $this->params['sdk'];
+    }
+}
diff --git a/View/User/DefaultAvatar.php b/View/User/DefaultAvatar.php
new file mode 100644
index 00000000..b80dd6a8
--- /dev/null
+++ b/View/User/DefaultAvatar.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Xfrocks\Api\View\User;
+
+use Xfrocks\Api\Util\Html;
+use Xfrocks\Api\XF\ApiOnly\Image\DriverInterface;
+use Xfrocks\Api\XF\ApiOnly\Template\Templater;
+
+class DefaultAvatar extends \XF\Mvc\View
+{
+    /**
+     * @return string
+     */
+    public function renderRaw()
+    {
+        $app = \XF::app();
+        /** @var \XF\Entity\User $user */
+        $user = $this->params['user'];
+
+        /** @var Templater $templater */
+        $templater = $app->templater();
+        $defaultAvatarStyling = $templater->getDefaultAvatarStylingForApi($user->username);
+
+        $manager = $app->imageManager();
+        /** @var DriverInterface $image */
+        $image = $manager->createImage($this->params['size'], $this->params['size']);
+
+        $bgColor = Html::parseColor($defaultAvatarStyling['bgColor']);
+        $image->setBackgroundColorForApi($bgColor[0], $bgColor[1], $bgColor[2]);
+
+        $color = Html::parseColor($defaultAvatarStyling['color']);
+        $font = Html::parseFontFamily($templater->func('property', ['avatarDynamicFont']));
+        $percent = intval($templater->func('property', ['avatarDynamicTextPercent']));
+        $text = $defaultAvatarStyling['innerContent'];
+
+        $fontFile = $this->findTtfFontPath($font);
+        if ($fontFile !== false) {
+            $image->putTextAtCenterForApi($percent, $color[0], $color[1], $color[2], $fontFile, $text);
+        }
+
+        $this->response->contentType('image/png', '');
+        $this->response->header('Cache-Control', 'public, max-age=31536000');
+
+        return '' . $image->output(IMAGETYPE_PNG);
+    }
+
+    /**
+     * @param string $font
+     * @return string|false
+     */
+    protected function findTtfFontPath($font)
+    {
+        static $candidates = null;
+
+        if ($candidates === null) {
+            /**
+             * Font installation guide for Debian:
+             *
+             * 1. Make sure contrib is enabled in /etc/apt/sources.list
+             * 2. apt-get update
+             * 3. apt-get install -y ttf-mscorefonts-installer
+             */
+            $candidates = [
+                '/usr/share/fonts/truetype',
+                '/usr/share/fonts/truetype/msttcorefonts',
+                \XF::getRootDirectory() . DIRECTORY_SEPARATOR . 'styles' . DIRECTORY_SEPARATOR . 'fonts',
+            ];
+        }
+
+        foreach ($candidates as $candidate) {
+            $fontFile = $candidate . DIRECTORY_SEPARATOR . $font . '.ttf';
+            if (file_exists($fontFile)) {
+                return $fontFile;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/XF/ApiOnly/BbCode/Renderer/Html.php b/XF/ApiOnly/BbCode/Renderer/Html.php
new file mode 100644
index 00000000..ee80ba19
--- /dev/null
+++ b/XF/ApiOnly/BbCode/Renderer/Html.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\BbCode\Renderer;
+
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\Util\Crypt;
+use Xfrocks\Api\XF\ApiOnly\Template\Templater;
+
+class Html extends XFCP_Html
+{
+    const CHR_TTL = 86400;
+
+    /** @var null|array */
+    private $XfrocksApiChr = null;
+
+    public function renderAst(array $ast, \XF\BbCode\RuleSet $rules, array $options = [])
+    {
+        /** @var Templater $templater */
+        $templater = $this->getTemplater();
+        $templater->requiredExternalsReset();
+
+        $rendered = parent::renderAst($ast, $rules, $options);
+
+        $requiredExternalsHtml = $templater->requiredExternalsGetHtml();
+        if (strlen($requiredExternalsHtml) > 0) {
+            $rendered = sprintf('<!--%s-->%s', $requiredExternalsHtml, $rendered);
+        }
+
+        return $rendered;
+    }
+
+    /**
+     * @param array $children
+     * @param mixed $option
+     * @param array $tag
+     * @param array $options
+     * @return string
+     * @throws \XF\PrintableException
+     */
+    public function renderTagMedia(array $children, $option, array $tag, array $options)
+    {
+        if ($this->XfrocksApiChr === null) {
+            return parent::renderTagMedia($children, $option, $tag, $options);
+        }
+
+        /** @var Templater $templater */
+        $templater = $this->getTemplater();
+        $backup = $templater->requiredExternalsReset();
+
+        $html = parent::renderTagMedia($children, $option, $tag, $options);
+        $requiredExternals = $templater->requiredExternalsReset($backup);
+
+        return $this->renderXfrocksApiChr($html, $requiredExternals);
+    }
+
+    /**
+     * @param string $html
+     * @param array $requiredExternals
+     * @return string
+     * @throws \XF\PrintableException
+     */
+    public function renderXfrocksApiChr($html, array $requiredExternals)
+    {
+        $requiredExternalsTrimmed = [];
+        foreach ($requiredExternals as $key => $value) {
+            if (is_array($value) && count($value) === 0) {
+                continue;
+            }
+            $requiredExternalsTrimmed[$key] = $value;
+        }
+
+        if (count($requiredExternalsTrimmed) === 0 && stripos($html, '<script ') === false) {
+            // no externals, no script
+            // skip CHR completely
+            return $html;
+        }
+
+        $timestamp = time() + self::CHR_TTL;
+        $linkParams = [
+            'html' => Crypt::encryptTypeOne($html, $timestamp),
+            'required_externals' => count($requiredExternalsTrimmed) > 0 ? Crypt::encryptTypeOne(
+                \GuzzleHttp\json_encode($requiredExternalsTrimmed),
+                $timestamp
+            ) : null,
+            'timestamp' => $timestamp,
+        ];
+        $templater = $this->getTemplater();
+        $link = $templater->fnLinkType($templater, $escape, Listener::$routerType, 'tools/chr', null, $linkParams);
+
+        $attributes = 'data-chr="true"';
+        $label = '';
+        if (preg_match('#https?://([^/]+)/#', $html, $domainMatches) === 1) {
+            $domain = htmlentities($domainMatches[1]);
+            $attributes .= sprintf(' data-chr-domain="%s"', $domain);
+            $label = $domain;
+        }
+        if ($label === '') {
+            $label = md5($html);
+        }
+
+        /** @noinspection HtmlUnknownAttribute, HtmlUnknownTarget */
+        return sprintf(
+            "<div class=\"XfrocksApiChr\"><a %s href=\"%s\">%s</a></div>\n",
+            $attributes,
+            htmlentities($link),
+            $label
+        );
+    }
+
+    public static function factory(\XF\App $app)
+    {
+        $renderer = parent::factory($app);
+
+        // get Api-Bb-Code-Chr header
+        $chrHeader = $app->request()->getServer('HTTP_API_BB_CODE_CHR');
+        if (is_string($chrHeader)) {
+            $parts = preg_split('/,/', $chrHeader, -1, PREG_SPLIT_NO_EMPTY);
+            if (is_array($parts) && count($parts) > 0) {
+                $renderer->XfrocksApiChr = $parts;
+            }
+        }
+
+        return $renderer;
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Html extends \XF\BbCode\Renderer\Html
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/ControllerPlugin/Error.php b/XF/ApiOnly/ControllerPlugin/Error.php
new file mode 100644
index 00000000..d64ea11e
--- /dev/null
+++ b/XF/ApiOnly/ControllerPlugin/Error.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\ControllerPlugin;
+
+use Xfrocks\Api\Transformer;
+
+/**
+ * @method \Xfrocks\Api\Mvc\Reply\Api api(array $data)
+ * @see \Xfrocks\Api\Controller\AbstractController::api()
+ */
+class Error extends XFCP_Error
+{
+    /**
+     * @return \XF\Mvc\Reply\Error
+     */
+    public function actionRegistrationRequired()
+    {
+        return $this->error(\XF::phrase('login_required'), 403);
+    }
+
+    /**
+     * @param mixed $exception
+     * @param mixed $showDetails
+     * @return \XF\Mvc\Reply\Error|\Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionException($exception, $showDetails = null)
+    {
+        if ($showDetails === null) {
+            $showDetails = (\XF::$debugMode || \XF::visitor()->is_admin);
+        }
+
+        if ($showDetails !== null) {
+            $app = $this->app;
+            /** @var Transformer $transformer */
+            $transformer = $app->container('api.transformer');
+            $data = ['exception' => $transformer->transformException($exception)];
+            $reply = $this->api($data);
+        } else {
+            $reply = $this->error(\XF::phrase('server_error_occurred'));
+        }
+
+        $reply->setResponseCode(500);
+        return $reply;
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Error extends \XF\ControllerPlugin\Error
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Entity/User.php b/XF/ApiOnly/Entity/User.php
new file mode 100644
index 00000000..24539dec
--- /dev/null
+++ b/XF/ApiOnly/Entity/User.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Entity;
+
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\XF\ApiOnly\Session\Session;
+
+class User extends XFCP_User
+{
+    /**
+     * @param mixed $sizeCode
+     * @param mixed $forceType
+     * @param mixed $canonical
+     * @return string
+     */
+    public function getAvatarUrl($sizeCode, $forceType = null, $canonical = false)
+    {
+        $url = parent::getAvatarUrl($sizeCode, $forceType, $canonical);
+
+        if ($url === null) {
+            $apiRouter = $this->app()->router(Listener::$routerType);
+            $url = $apiRouter->buildLink('users/default-avatar', $this, ['size' => $sizeCode]);
+        }
+
+        return $url;
+    }
+
+    /**
+     * @param mixed $permissionId
+     * @return bool
+     */
+    public function hasAdminPermission($permissionId)
+    {
+        /** @var Session $session */
+        $session = $this->app()->session();
+        if (!$session->hasScope(Server::SCOPE_MANAGE_SYSTEM)) {
+            return false;
+        }
+
+        return parent::hasAdminPermission($permissionId);
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_User extends \XF\Entity\User
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Image/DriverInterface.php b/XF/ApiOnly/Image/DriverInterface.php
new file mode 100644
index 00000000..64ce2a57
--- /dev/null
+++ b/XF/ApiOnly/Image/DriverInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Image;
+
+interface DriverInterface
+{
+    /**
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @return void
+     */
+    public function setBackgroundColorForApi($r, $g, $b);
+
+    /**
+     * @param float $percent
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @param string $fontFile
+     * @param string $text
+     * @return void
+     */
+    public function putTextAtCenterForApi($percent, $r, $g, $b, $fontFile, $text);
+
+    /**
+     * @param mixed|null $format
+     * @param mixed|null $quality
+     * @return string
+     */
+    public function output($format = null, $quality = null);
+}
diff --git a/XF/ApiOnly/Image/Gd.php b/XF/ApiOnly/Image/Gd.php
new file mode 100644
index 00000000..a6909123
--- /dev/null
+++ b/XF/ApiOnly/Image/Gd.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Image;
+
+class Gd extends XFCP_Gd implements DriverInterface
+{
+    public function setBackgroundColorForApi($r, $g, $b)
+    {
+        $color = imagecolorallocate($this->image, $r, $g, $b);
+        imagefill($this->image, 0, 0, $color);
+    }
+
+    public function putTextAtCenterForApi($percent, $r, $g, $b, $fontFile, $text)
+    {
+        $color = imagecolorallocate($this->image, $r, $g, $b);
+
+        $boxHeight = $boxWidth = 0;
+        $size = ceil($this->height * $percent / 10) / 10;
+        $checkedSizes = [];
+        while (true) {
+            $box = imagettfbbox($size, 0, $fontFile, $text);
+            $checkedSizes[] = $size;
+            $boxWidth = $box[2] - $box[0];
+            $boxHeight = $box[1] - $box[7];
+
+            $boxPercent = $boxHeight / $this->height * 100;
+            $percentDelta = $boxPercent - $percent;
+            if (abs($percentDelta) > 0.1) {
+                if ($percentDelta > 0) {
+                    $size -= 0.1;
+                } else {
+                    $size += 0.1;
+                }
+                if (in_array($size, $checkedSizes, true)) {
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+
+        $x = intval(($this->width - $boxWidth) / 2);
+        $y = intval(($this->height - $boxHeight) / 2 + $boxHeight);
+        imagettftext($this->image, $size, 0, $x, $y, $color, $fontFile, $text);
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Gd extends \XF\Image\Gd
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Image/Imagick.php b/XF/ApiOnly/Image/Imagick.php
new file mode 100644
index 00000000..1f24ac3e
--- /dev/null
+++ b/XF/ApiOnly/Image/Imagick.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Image;
+
+class Imagick extends XFCP_Imagick implements DriverInterface
+{
+    public function setBackgroundColorForApi($r, $g, $b)
+    {
+        $image = $this->imagick;
+
+        $color = new \ImagickPixel(sprintf('rgb(%d, %d, %d)', $r, $g, $b));
+        $x = $y = 0;
+        $target = $image->getImagePixelColor($x, $y);
+        $image->floodFillPaintImage($color, 1, $target, $x, $y, false);
+    }
+
+    public function putTextAtCenterForApi($percent, $r, $g, $b, $fontFile, $text)
+    {
+        $image = $this->imagick;
+
+        $draw = new \ImagickDraw();
+        $draw->setFillColor(new \ImagickPixel(sprintf('rgb(%d, %d, %d)', $r, $g, $b)));
+        $draw->setFont($fontFile);
+        $draw->setGravity(\Imagick::GRAVITY_CENTER);
+
+        $size = ceil($this->height * $percent / 10) / 10;
+        $checkedSizes = [];
+        while (true) {
+            $draw->setFontSize($size);
+            $metrics = $image->queryFontMetrics($draw, $text);
+            $checkedSizes[] = $size;
+
+            $boxPercent = $metrics['textHeight'] / $this->height * 100;
+            $percentDelta = $boxPercent - $percent;
+            if (abs($percentDelta) > 0.1) {
+                if ($percentDelta > 0) {
+                    $size -= 0.1;
+                } else {
+                    $size += 0.1;
+                }
+                if (in_array($size, $checkedSizes, true)) {
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+
+        $image->annotateImage($draw, 0, 0, 0, $text);
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Imagick extends \XF\Image\Imagick
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Mvc/Dispatcher.php b/XF/ApiOnly/Mvc/Dispatcher.php
new file mode 100644
index 00000000..18b5e808
--- /dev/null
+++ b/XF/ApiOnly/Mvc/Dispatcher.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Mvc;
+
+use Xfrocks\Api\Listener;
+
+class Dispatcher extends XFCP_Dispatcher
+{
+    public function getRouter()
+    {
+        /** @var \XF\Mvc\Router|null $router */
+        $router = $this->router;
+
+        if ($router === null) {
+            $router = $this->app->router(Listener::$routerType);
+            $this->router = $router;
+        }
+
+        return $this->router;
+    }
+
+    /**
+     * @param \XF\Mvc\Renderer\AbstractRenderer $renderer
+     * @param \XF\Mvc\Reply\View $reply
+     * @return array
+     */
+    public function renderView(\XF\Mvc\Renderer\AbstractRenderer $renderer, \XF\Mvc\Reply\View $reply)
+    {
+        if ($reply instanceof \Xfrocks\Api\Mvc\Reply\Api) {
+            return $reply->getData();
+        }
+
+        return parent::renderView($renderer, $reply);
+    }
+
+    /**
+     * @param mixed $routePath
+     * @return \XF\Mvc\RouteMatch
+     */
+    public function route($routePath)
+    {
+        $match = parent::route($routePath);
+
+        $match->setResponseType('json');
+
+        return $match;
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Dispatcher extends \XF\Mvc\Dispatcher
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Mvc/Renderer/Json.php b/XF/ApiOnly/Mvc/Renderer/Json.php
new file mode 100644
index 00000000..dbcbcc6b
--- /dev/null
+++ b/XF/ApiOnly/Mvc/Renderer/Json.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Mvc\Renderer;
+
+use XF\Db\AbstractAdapter;
+use XF\Mvc\Renderer\Html;
+use XF\Mvc\Reply\AbstractReply;
+use Xfrocks\Api\Util\Cors;
+use Xfrocks\Api\XF\ApiOnly\Session\Session;
+
+class Json extends XFCP_Json
+{
+    /**
+     * @var int
+     */
+    private $prepareJsonEncodeDepth = 0;
+
+    /**
+     * @param mixed $content
+     * @param AbstractReply $reply
+     * @return string
+     */
+    public function postFilter($content, AbstractReply $reply)
+    {
+        Cors::addHeaders($this->response);
+
+        $json = parent::postFilter($content, $reply);
+
+        if (\XF::$debugMode) {
+            // TODO: find a more efficient way to do this
+            $json = json_encode(json_decode($json), JSON_PRETTY_PRINT);
+
+            $app = \XF::app();
+            $container = $app->container();
+            $language = $app->language();
+
+            if ($container->isCached('db')) {
+                /** @var AbstractAdapter $db */
+                $db = $container['db'];
+                $dbQueries = $db->getQueryCount();
+            } else {
+                $dbQueries = 'N/A';
+            }
+
+            $pageTime = microtime(true) - $container['time.granular'];
+
+            $this->response->header('Api-Debug-Db-Queries', $language->numberFormat($dbQueries));
+            $this->response->header('Api-Debug-Memory-Usage', $language->fileSizeFormat(memory_get_usage()));
+            $this->response->header('Api-Debug-Memory-Peak', $language->fileSizeFormat(memory_get_peak_usage()));
+            $this->response->header('Api-Debug-Page-Time', $language->numberFormat($pageTime, 6));
+        }
+
+        return $json;
+    }
+
+    /**
+     * @param array $errors
+     * @return array
+     */
+    public function renderErrors(array $errors)
+    {
+        return [
+            'status' => 'error',
+            'errors' => $errors
+        ];
+    }
+
+    /**
+     * @param mixed $url
+     * @param mixed $type
+     * @param mixed $message
+     * @return array
+     */
+    public function renderRedirect($url, $type, $message = '')
+    {
+        /** @var Html $htmlRenderer */
+        $htmlRenderer = \XF::app()->renderer('html');
+        $htmlRenderer->renderRedirect($url, $type, $message);
+
+        return parent::renderRedirect($url, $type, $message);
+    }
+
+    /**
+     * @param array $content
+     * @return array
+     */
+    protected function addDefaultJsonParams(array $content)
+    {
+        $visitor = \XF::visitor();
+        if ($visitor['user_id'] > 0) {
+            $content['system_info']['time'] = \XF::$time;
+            $content['system_info']['visitor_id'] = $visitor['user_id'];
+        }
+
+        if (\XF::$debugMode) {
+            $app = \XF::app();
+            $container = $app->container();
+
+            $pageUrl = $app->request()->getFullRequestUri();
+            $debugUrl = $pageUrl . (strpos($pageUrl, '?') !== false ? '&' : '?') . '_debug=1';
+            $content['system_info']['debug_url'] = $debugUrl;
+
+            if ($container->isCached('session')) {
+                /** @var Session $session */
+                $session = $container['session'];
+                $token = $session->getToken();
+                if ($token !== null) {
+                    $content['system_info']['client_id'] = $token->client_id;
+                    $content['system_info']['token_text'] = $token->token_text;
+                    $content['system_info']['expire_date'] = $token->expire_date;
+                    $content['system_info']['scope'] = $token->scope;
+                }
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     * @throws \Throwable
+     */
+    protected function prepareJsonEncode($value)
+    {
+        $this->prepareJsonEncodeDepth++;
+
+        /** @var \Throwable|null $throwable */
+        $throwable = null;
+
+        try {
+            $value = parent::prepareJsonEncode($value);
+
+            if (is_array($value)) {
+                foreach (array_keys($value) as $key) {
+                    if ($value[$key] === null) {
+                        unset($value[$key]);
+                    }
+                }
+            }
+        } catch (\Throwable $e) {
+            $throwable = $e;
+
+            if ($this->prepareJsonEncodeDepth === 1) {
+                if ($e instanceof \XF\Mvc\Reply\Exception) {
+                    $reply = $e->getReply();
+
+                    if ($reply instanceof \XF\Mvc\Reply\Error) {
+                        $value = $this->renderErrors($reply->getErrors());
+                        $this->setResponseCode($reply->getResponseCode());
+                        $throwable = null;
+                    }
+                } else {
+                    $value = $this->renderErrors([\XF::phrase('unexpected_error_occurred')]);
+                    $this->setResponseCode(500);
+
+                    \XF::logException($e);
+                    $throwable = null;
+                }
+            }
+        }
+
+        $this->prepareJsonEncodeDepth--;
+
+        if ($throwable !== null) {
+            throw $throwable;
+        }
+
+        return $value;
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Json extends \XF\Mvc\Renderer\Json
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Session/Session.php b/XF/ApiOnly/Session/Session.php
new file mode 100644
index 00000000..01421811
--- /dev/null
+++ b/XF/ApiOnly/Session/Session.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Session;
+
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\Mvc\Session\InMemoryStorage;
+
+class Session extends XFCP_Session
+{
+    const KEY_TOKEN = 'apiToken';
+
+    /**
+     * @var \XF\Session\StorageInterface
+     */
+    private $_unusedStorage;
+
+    public function __construct(\XF\Session\StorageInterface $storage, array $config = [])
+    {
+        parent::__construct(new InMemoryStorage(), $config);
+
+        $this->_unusedStorage = $storage;
+    }
+
+    /**
+     * @param \XF\Http\Response $response
+     * @return void
+     */
+    public function applyToResponse(\XF\Http\Response $response)
+    {
+        $headers = $response->headers();
+        if (isset($headers['Cache-Control'])) {
+            return;
+        }
+
+        $response->header('Cache-control', 'private, no-cache, max-age=0');
+    }
+
+    /**
+     * @return Token|null
+     */
+    public function getToken()
+    {
+        return $this->get(self::KEY_TOKEN);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getTokenText()
+    {
+        $token = $this->getToken();
+        return $token !== null ? $token->token_text : null;
+    }
+
+    /**
+     * @param string $scope
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        $token = $this->getToken();
+        return $token !== null ? $token->hasScope($scope) : false;
+    }
+
+    /**
+     * @param Token|null $token
+     * @return void
+     */
+    public function setToken($token)
+    {
+        $this->__set(self::KEY_TOKEN, $token);
+
+        if ($token !== null && $token->user_id > 0) {
+            $user = $token->User;
+            if ($user !== null) {
+                $this->changeUser($user);
+            }
+        }
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Session extends \XF\Session\Session
+    {
+        // extension hint
+    }
+}
diff --git a/XF/ApiOnly/Template/Templater.php b/XF/ApiOnly/Template/Templater.php
new file mode 100644
index 00000000..b1695000
--- /dev/null
+++ b/XF/ApiOnly/Template/Templater.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Xfrocks\Api\XF\ApiOnly\Template;
+
+use Xfrocks\Api\Listener;
+
+class Templater extends XFCP_Templater
+{
+    /**
+     * @param string $username
+     * @return array
+     */
+    public function getDefaultAvatarStylingForApi($username)
+    {
+        return $this->getDefaultAvatarStyling($username);
+    }
+
+    public function renderTemplate(
+        $template,
+        array $params = [],
+        $addDefaultParams = true,
+        \XF\Template\ExtensionSet $extensionOverrides = null
+    ) {
+        $output = parent::renderTemplate($template, $params, $addDefaultParams, $extensionOverrides);
+
+        if ($template === 'public:bb_code_tag_attach' && isset($params['attachment'])) {
+            /** @var \XF\Entity\Attachment $attachment */
+            $attachment = $params['attachment'];
+            if ($attachment->has_thumbnail) {
+                $escape = false;
+                $linkPublic = $this->escape($this->fnLinkType(
+                    $this,
+                    $escape,
+                    'public',
+                    'full:attachments',
+                    $attachment,
+                    ['hash' => $attachment->temp_hash]
+                ));
+                $linkApi = $this->escape($this->fnLinkType(
+                    $this,
+                    $escape,
+                    Listener::$routerType,
+                    'attachments',
+                    $attachment,
+                    ['hash' => $attachment->temp_hash]
+                ));
+
+                $output = str_replace($linkPublic, $linkApi, $output);
+
+                $data = $attachment->Data;
+                if ($data !== null) {
+                    $output = self::_addDimensionsBySrc($output, "src=\"$linkApi\"", $data->height, $data->width);
+
+                    /** @var mixed $mixed */
+                    $mixed = $attachment;
+                    $hasGetThumbnailUrlFull = is_callable([$mixed, 'getThumbnailUrlFull']);
+                    $thumbnailUrl = $hasGetThumbnailUrlFull ? $attachment->thumbnail_url_full : $attachment->thumbnail_url;
+                    $srcThumbnail = sprintf('src="%s"', $this->escape($thumbnailUrl));
+                    $output = self::_addDimensionsBySrc(
+                        $output,
+                        $srcThumbnail,
+                        $data->thumbnail_height,
+                        $data->thumbnail_width
+                    );
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    private static $requiredExternalKeys = ['includeCss', 'inlineCss', 'includeJs', 'inlineJs', 'pageParams'];
+
+    public function requiredExternalsGetHtml()
+    {
+        $html = '';
+
+        $includedCss = $this->getIncludedCss();
+        if (count($includedCss) > 0) {
+            $html .= '<link rel="stylesheet" href="'
+                . htmlspecialchars($this->getCssLoadUrl($includedCss))
+                . '" />';
+        }
+
+        $inlineCss = $this->getInlineCss();
+        if (count($inlineCss) > 0) {
+            foreach ($inlineCss as $inline) {
+                $html .= "<style>$inline</style>";
+            }
+        }
+
+        $includedJs = $this->getIncludedJs();
+        if (count($includedJs) > 0) {
+            foreach ($includedJs as $js) {
+                $html .= '<script src="' . htmlspecialchars($js) . '"></script>';
+            }
+        }
+
+        $inlineJs = $this->getInlineJs();
+        if (count($inlineJs) > 0) {
+            foreach ($inlineJs as $inline) {
+                $html .= "<script>$inline</script>";
+            }
+        }
+
+        return $html;
+    }
+
+    public function requiredExternalsReset(array $values = null)
+    {
+        $backup = [];
+
+        foreach (self::$requiredExternalKeys as $key) {
+            // @phpstan-ignore-next-line
+            $backup[$key] = $this->$key;
+            // @phpstan-ignore-next-line
+            $this->$key = $values != null ? $values[$key] : [];
+        }
+
+        return $backup;
+    }
+
+    private static function _addDimensionsBySrc($html, $src, $height, $width)
+    {
+        if (substr_count($html, $src) !== 1) {
+            return $html;
+        }
+
+        $html = str_replace($src, $src . " width=\"$width\"", $html);
+        $html = str_replace($src, $src . " height=\"$height\"", $html);
+
+        return $html;
+    }
+}
+
+if (false) {
+    // @codingStandardsIgnoreLine
+    class XFCP_Templater extends \XF\Template\Templater
+    {
+        // extension hint
+    }
+}
diff --git a/XF/Entity/Post.php b/XF/Entity/Post.php
new file mode 100644
index 00000000..b6458ce6
--- /dev/null
+++ b/XF/Entity/Post.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Xfrocks\Api\XF\Entity;
+
+use Xfrocks\Api\Repository\Subscription;
+
+class Post extends XFCP_Post
+{
+    /**
+     * @return void
+     */
+    protected function _postSave()
+    {
+        parent::_postSave();
+
+        /** @var Subscription $subRepo */
+        $subRepo = $this->repository('Xfrocks\Api:Subscription');
+
+        if ($this->isInsert()) {
+            $subRepo->pingThreadPost('insert', $this);
+        } elseif ($this->isChanged('message_state')) {
+            if ($this->message_state === 'visible') {
+                $subRepo->pingThreadPost('insert', $this);
+            } elseif ($this->getExistingValue('message') === 'visible') {
+                $subRepo->pingThreadPost('delete', $this);
+            }
+        } else {
+            $subRepo->pingThreadPost('update', $this);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postDelete()
+    {
+        parent::_postDelete();
+
+        /** @var Subscription $subRepo */
+        $subRepo = $this->repository('Xfrocks\Api:Subscription');
+        if ($this->message_state === 'visible') {
+            $subRepo->pingThreadPost('delete', $this);
+        }
+    }
+}
diff --git a/XF/Entity/Thread.php b/XF/Entity/Thread.php
new file mode 100644
index 00000000..0b23d6d1
--- /dev/null
+++ b/XF/Entity/Thread.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Xfrocks\Api\XF\Entity;
+
+use XF\Mvc\Entity\Structure;
+use Xfrocks\Api\Repository\Subscription;
+
+class Thread extends XFCP_Thread
+{
+    public static function getStructure(Structure $structure)
+    {
+        $structure = parent::getStructure($structure);
+
+        $options = \XF::options();
+
+        /** @var int $sub */
+        $sub = $options->bdApi_subscriptionThreadPost;
+        /** @var string $subColumn */
+        $subColumn = $options->bdApi_subscriptionColumnThreadPost;
+
+        if ($sub > 0 && $subColumn !== '') {
+            $structure->columns[$subColumn] = ['type' => self::SERIALIZED_ARRAY, 'default' => []];
+        }
+
+        return $structure;
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postDelete()
+    {
+        parent::_postDelete();
+
+        /** @var int $sub */
+        $sub = $this->app()->options()->bdApi_subscriptionThreadPost;
+
+        if ($sub > 0) {
+            /** @var Subscription $subRepo */
+            $subRepo = $this->repository('Xfrocks\Api:Subscription');
+            $subRepo->deleteSubscriptionsForTopic(Subscription::TYPE_THREAD_POST, $this->thread_id);
+        }
+    }
+}
diff --git a/XF/Entity/User.php b/XF/Entity/User.php
new file mode 100644
index 00000000..23513866
--- /dev/null
+++ b/XF/Entity/User.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Xfrocks\Api\XF\Entity;
+
+use Xfrocks\Api\Repository\Subscription;
+
+class User extends XFCP_User
+{
+    /**
+     * @return bool
+     */
+    public function canAddApiClient()
+    {
+        if ($this->hasPermission('general', 'bdApi_clientNew')) {
+            return true;
+        }
+
+        if ($this->is_admin) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postSave()
+    {
+        parent::_postSave();
+
+        if ($this->isInsert()) {
+            /** @var Subscription $subRepo */
+            $subRepo = $this->repository('Xfrocks\Api:Subscription');
+            $subRepo->pingUser('insert', $this);
+        }
+    }
+
+    /**
+     * @return void
+     */
+    protected function _postDelete()
+    {
+        parent::_postDelete();
+
+        /** @var Subscription $subRepo */
+        $subRepo = $this->repository('Xfrocks\Api:Subscription');
+        $subRepo->pingUser('delete', $this);
+    }
+}
diff --git a/XF/Entity/UserAlert.php b/XF/Entity/UserAlert.php
new file mode 100644
index 00000000..36ee511a
--- /dev/null
+++ b/XF/Entity/UserAlert.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Xfrocks\Api\XF\Entity;
+
+use XF\Util\Php;
+use Xfrocks\Api\Repository\Subscription;
+
+class UserAlert extends XFCP_UserAlert
+{
+    /**
+     * @return void
+     */
+    protected function _postSave()
+    {
+        parent::_postSave();
+
+        static $userOptions = [];
+
+        /** @var Subscription $subRepo */
+        $subRepo = $this->repository('Xfrocks\Api:Subscription');
+
+        if (Subscription::getSubOption(Subscription::TYPE_NOTIFICATION)) {
+            if ($this->alerted_user_id > 0) {
+                /** @var string $subColumn */
+                $subColumn = \XF::options()->bdApi_subscriptionColumnUserNotification;
+                if (!isset($userOptions[$this->alerted_user_id])) {
+                    $userOptions[$this->alerted_user_id] = $this->db()->fetchOne('
+                        SELECT `' . $subColumn . '`
+                        FROM `xf_user_option`
+                        WHERE user_id = ?
+                    ', $this->alerted_user_id);
+                }
+
+                $option = $userOptions[$this->alerted_user_id];
+                if (is_string($option) && strlen($option) > 0) {
+                    $option = Php::safeUnserialize($option);
+                }
+
+                if (!is_array($option)) {
+                    $option = [];
+                }
+            } else {
+                $option = $subRepo->getClientSubscriptionsData();
+            }
+
+            if (count($option) > 0) {
+                $subRepo->ping(
+                    $option,
+                    'insert',
+                    Subscription::TYPE_NOTIFICATION,
+                    $this->alert_id
+                );
+            }
+        }
+    }
+}
diff --git a/XF/Entity/UserOption.php b/XF/Entity/UserOption.php
new file mode 100644
index 00000000..de7bee27
--- /dev/null
+++ b/XF/Entity/UserOption.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Xfrocks\Api\XF\Entity;
+
+use XF\Mvc\Entity\Structure;
+
+class UserOption extends XFCP_UserOption
+{
+    public static function getStructure(Structure $structure)
+    {
+        $structure = parent::getStructure($structure);
+
+        $options = \XF::options();
+
+        /** @var string $userColumn */
+        $userColumn = $options->bdApi_subscriptionColumnUser;
+        /** @var string $userNotifyColumn */
+        $userNotifyColumn = $options->bdApi_subscriptionColumnUserNotification;
+
+        if ($options->bdApi_subscriptionUser && $userColumn !== '') {
+            $structure->columns[$userColumn] = ['type' => self::SERIALIZED_ARRAY, 'default' => []];
+        }
+
+        if ($options->bdApi_subscriptionUserNotification && $userNotifyColumn !== '') {
+            $structure->columns[$userNotifyColumn] = ['type' => self::SERIALIZED_ARRAY, 'default' => []];
+        }
+
+        return $structure;
+    }
+}
diff --git a/XF/Pub/Controller/Account.php b/XF/Pub/Controller/Account.php
new file mode 100644
index 00000000..58187dcf
--- /dev/null
+++ b/XF/Pub/Controller/Account.php
@@ -0,0 +1,414 @@
+<?php
+
+namespace Xfrocks\Api\XF\Pub\Controller;
+
+use XF\Entity\UserConnectedAccount;
+use XF\Mvc\Entity\Finder;
+use XF\Util\Random;
+use Xfrocks\Api\ControllerPlugin\Login;
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\Entity\Token;
+use Xfrocks\Api\Entity\UserScope;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Repository\AuthCode;
+use Xfrocks\Api\Repository\RefreshToken;
+use Xfrocks\Api\Repository\Subscription;
+use Xfrocks\Api\XF\Entity\User;
+
+class Account extends XFCP_Account
+{
+    /**
+     * @return \XF\Mvc\Reply\View
+     */
+    public function actionApi()
+    {
+        $visitor = \XF::visitor();
+
+        $clients = $this->getApiClientRepo()->findUserClients($visitor->user_id)
+            ->with(['User'])
+            ->fetch();
+
+        $userScopes = $this->finder('Xfrocks\Api:UserScope')
+            ->with('Client', true)
+            ->where('user_id', $visitor->user_id)
+            ->order('accept_date', 'DESC')
+            ->fetch();
+
+        $tokens = $this->finder('Xfrocks\Api:Token')
+            ->where('user_id', $visitor->user_id)
+            ->fetch();
+
+        $userScopesByClientIds = [];
+        $scopesPhrase = [];
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+
+        /** @var UserScope $userScope */
+        foreach ($userScopes as $userScope) {
+            if (!isset($userScopesByClientIds[$userScope->client_id])) {
+                $userScopesByClientIds[$userScope->client_id] = [
+                    'last_issue_date' => 0,
+                    'user_scopes' => [],
+                    'client' => $userScope->Client,
+                ];
+            }
+
+            $userScopesByClientIds[$userScope->client_id]['last_issue_date'] = \max(
+                $userScopesByClientIds[$userScope->client_id]['last_issue_date'],
+                $userScope->accept_date
+            );
+            $userScopesByClientIds[$userScope->client_id]['user_scopes'][$userScope->scope] = $userScope;
+            $scopesPhrase[$userScope->scope] = $apiServer->getScopeDescription($userScope->scope);
+        }
+
+        /** @var Token $token */
+        foreach ($tokens as $token) {
+            if (!isset($userScopesByClientIds[$token->client_id])) {
+                continue;
+            }
+
+            $userScopesByClientIds[$token->client_id]['last_issue_date'] = \max(
+                $userScopesByClientIds[$token->client_id]['last_issue_date'],
+                $token->issue_date
+            );
+        }
+
+        $viewParams = [
+            'clients' => $clients,
+            'userScopesClientIds' => $userScopesByClientIds,
+            'scopesPhrase' => $scopesPhrase,
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Api\Index', 'bdapi_account_api', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    public function actionApiUpdateScope()
+    {
+        $visitor = \XF::visitor();
+        $clientId = $this->filter('client_id', 'str');
+        /** @var Client $client */
+        $client = $this->assertRecordExists('Xfrocks\Api:Client', $clientId);
+
+        /** @var \Xfrocks\Api\Repository\UserScope $userScopeRepo */
+        $userScopeRepo = $this->repository('Xfrocks\Api:UserScope');
+        $userScopes = $this->finder('Xfrocks\Api:UserScope')
+            ->where('client_id', $client->client_id)
+            ->where('user_id', $visitor->user_id)
+            ->fetch();
+
+        if ($userScopes->count() === 0) {
+            return $this->noPermission();
+        }
+
+        if ($this->isPost()) {
+            $isRevoke = $this->filter('revoke', 'bool') === true;
+            $scopes = $this->filter('scopes', 'array-str');
+            if (count($scopes) === 0) {
+                $isRevoke = true;
+            }
+
+            $db = $this->app()->db();
+            $db->beginTransaction();
+
+            try {
+                $userScopesChanged = false;
+                /** @var UserScope $userScope */
+                foreach ($userScopes as $userScope) {
+                    if ($isRevoke || !in_array($userScope->scope, $scopes, true)) {
+                        $userScopeRepo->deleteUserScope($client->client_id, $visitor->user_id, $userScope->scope);
+                        $userScopesChanged = true;
+                    }
+                }
+
+                if ($userScopesChanged) {
+                    /** @var AuthCode $authCodeRepo */
+                    $authCodeRepo = $this->repository('Xfrocks\Api:AuthCode');
+                    $authCodeRepo->deleteAuthCodes($client->client_id, $visitor->user_id);
+                    /** @var RefreshToken $refreshTokenRepo */
+                    $refreshTokenRepo = $this->repository('Xfrocks\Api:RefreshToken');
+                    $refreshTokenRepo->deleteRefreshTokens($client->client_id, $visitor->user_id);
+                    /** @var \Xfrocks\Api\Repository\Token $tokenRepo */
+                    $tokenRepo = $this->repository('Xfrocks\Api:Token');
+                    $tokenRepo->deleteTokens($client->client_id, $visitor->user_id);
+                }
+
+                if ($isRevoke) {
+                    /** @var Subscription $subscriptionRepo */
+                    $subscriptionRepo = $this->repository('Xfrocks\Api:Subscription');
+                    $subscriptionRepo->deleteSubscriptions(
+                        $client->client_id,
+                        Subscription::TYPE_USER,
+                        $visitor->user_id
+                    );
+
+                    $subscriptionRepo->deleteSubscriptions(
+                        $client->client_id,
+                        Subscription::TYPE_NOTIFICATION,
+                        $visitor->user_id
+                    );
+                }
+
+                $connectedAccounts = $this->finder('XF:UserConnectedAccount')
+                    ->where('user_id', $visitor->user_id)
+                    ->where('provider', 'api_' . $client->client_id)
+                    ->fetch();
+                /** @var UserConnectedAccount $connectedAccount */
+                foreach ($connectedAccounts as $connectedAccount) {
+                    $connectedAccount->delete(true, false);
+                }
+
+                $db->commit();
+            } catch (\Throwable $e) {
+                $db->rollback();
+
+                throw $e;
+            }
+
+            return $this->redirect($this->buildLink('account/api'));
+        }
+
+        $scopesPhrase = [];
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+
+        foreach ($userScopes as $userScope) {
+            $scopesPhrase[$userScope->scope] = $apiServer->getScopeDescription($userScope->scope);
+        }
+
+        $viewParams = [
+            'client' => $client,
+            'userScopes' => $userScopes,
+            'scopesPhrase' => $scopesPhrase,
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Api\UpdateScope', 'bdapi_account_api_update_scope', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\View
+     */
+    public function actionApiClientAdd()
+    {
+        /** @var User $visitor */
+        $visitor = \XF::visitor();
+        if (!$visitor->canAddApiClient()) {
+            return $this->noPermission();
+        }
+
+        $viewParams = [
+            'client' => $this->em()->create('Xfrocks\Api:Client')
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Api\Edit', 'bdapi_account_api_client_add', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect|\XF\Mvc\Reply\View
+     * @throws \XF\PrintableException
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionApiClientDelete()
+    {
+        $client = $this->assertEditableApiClient($this->filter('client_id', 'str'));
+
+        if ($this->isPost()) {
+            $client->delete();
+
+            return $this->redirect($this->buildLink('account/api'));
+        }
+
+        $viewParams = [
+            'client' => $client
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Api\Delete', 'bdapi_account_api_client_delete', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionApiClientEdit()
+    {
+        $client = $this->assertEditableApiClient($this->filter('client_id', 'str'));
+
+        $viewParams = [
+            'client' => $client
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Api\Edit', 'bdapi_account_api_client_edit', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionApiClientSave()
+    {
+        $this->assertPostOnly();
+
+        $clientId = $this->filter('client_id', 'str');
+
+        if ($clientId !== '') {
+            $client = $this->assertEditableApiClient($clientId);
+        } else {
+            /** @var User $visitor */
+            $visitor = \XF::visitor();
+            if (!$visitor->canAddApiClient()) {
+                return $this->noPermission();
+            }
+
+            /** @var Client $client */
+            $client = $this->em()->create('Xfrocks\Api:Client');
+        }
+
+        $client->bulkSet($this->filter([
+            'name' => 'str',
+            'description' => 'str',
+            'redirect_uri' => 'str'
+        ]));
+
+        $options = $this->filter('options', 'array');
+        $client->setClientOptions($this->filterArray(
+            $options,
+            [
+                'whitelisted_domains' => 'str'
+            ]
+        ));
+
+        $client->save();
+
+        return $this->redirect($this->buildLink('account/api'));
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \XF\PrintableException
+     */
+    public function actionApiLogout()
+    {
+        /** @var Login $loginPlugin */
+        $loginPlugin = $this->plugin('Xfrocks\Api:Login');
+        return $loginPlugin->logout();
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect|\XF\Mvc\Reply\View
+     * @throws \League\OAuth2\Server\Exception\InvalidGrantException
+     * @throws \League\OAuth2\Server\Exception\UnsupportedResponseTypeException
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionAuthorize()
+    {
+        /** @var Server $apiServer */
+        $apiServer = $this->app->container('api.server');
+
+        $clientId = $this->filter('client_id', 'str');
+        $clientIsAuto = false;
+        if ($clientId === '') {
+            /** @var Client|null $visitorClient */
+            $visitorClient = $this->getApiClientRepo()->findUserClients(\XF::visitor()->user_id)
+                ->order(Finder::ORDER_RANDOM)
+                ->fetchOne();
+            if ($visitorClient !== null) {
+                $clientIsAuto = true;
+                $apiServer->setRequestQuery('client_id', $visitorClient->client_id);
+                $apiServer->setRequestQuery('redirect_uri', $visitorClient->redirect_uri);
+                $apiServer->setRequestQuery('response_type', 'token');
+                $apiServer->setRequestQuery('scope', Server::SCOPE_READ);
+                $apiServer->setRequestQuery('state', Random::getRandomString(32));
+            }
+        }
+
+        $linkParams = $authorizeParams = $apiServer->grantAuthCodeCheckParams($this);
+
+        /** @var Client $client */
+        $client = $linkParams['client'];
+        unset($linkParams['client']);
+        $linkParams['client_id'] = $client->client_id;
+
+        $scopeIds = $linkParams['scopes'];
+        unset($linkParams['scopes']);
+
+        $needAuthScopes = [];
+        $requestedScopes = [];
+        $userScopes = $this->finder('Xfrocks\Api:UserScope')
+            ->where('client_id', $client->client_id)
+            ->where('user_id', \XF::visitor()->user_id)
+            ->keyedBy('scope')
+            ->fetch();
+        foreach ($scopeIds as $scopeId) {
+            $requestedScopes[$scopeId] = $apiServer->getScopeDescription($scopeId);
+
+            // TODO: auto authorize scopes
+
+            if (!isset($userScopes[$scopeId])) {
+                $needAuthScopes[$scopeId] = $requestedScopes[$scopeId];
+            }
+        }
+
+        $bypassConfirmation = false;
+        if (count($requestedScopes) > 0 && count($needAuthScopes) === 0) {
+            $bypassConfirmation = true;
+        }
+        if ($clientIsAuto) {
+            $bypassConfirmation = false;
+        }
+
+        if ($this->isPost() || $bypassConfirmation) {
+            $userScopeKeys = $userScopes->keys();
+            if ($this->isPost()) {
+                $authorizeParams['scopes'] = $this->filter('scopes', 'array-str');
+            }
+            $authorizeParams['scopes'] = array_merge($authorizeParams['scopes'], $userScopeKeys);
+            $authorizeParams['scopes'] = array_unique($authorizeParams['scopes']);
+
+            return $apiServer->grantAuthCodeNewAuthRequest($this, $authorizeParams);
+        }
+
+        $viewParams = [
+            'client' => $client,
+            'needAuthScopes' => $needAuthScopes,
+
+            'clientIsAuto' => $clientIsAuto,
+            'linkParams' => $linkParams,
+        ];
+
+        $view = $this->view('Xfrocks\Api:Account\Authorize', 'bdapi_account_authorize', $viewParams);
+        return $this->addAccountWrapperParams($view, 'api');
+    }
+
+    /**
+     * @param string $clientId
+     * @return Client
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertEditableApiClient($clientId)
+    {
+        /** @var Client $client */
+        $client = $this->assertRecordExists('Xfrocks\Api:Client', $clientId);
+
+        if (!$client->canEdit()) {
+            throw $this->exception($this->notFound(\XF::phrase('bdapi_requested_client_not_found')));
+        }
+
+        return $client;
+    }
+
+    /**
+     * @return \Xfrocks\Api\Repository\Client
+     */
+    protected function getApiClientRepo()
+    {
+        /** @var \Xfrocks\Api\Repository\Client $clientRepo */
+        $clientRepo = $this->repository('Xfrocks\Api:Client');
+        return $clientRepo;
+    }
+}
diff --git a/XF/Pub/Controller/Misc.php b/XF/Pub/Controller/Misc.php
new file mode 100644
index 00000000..a506d1df
--- /dev/null
+++ b/XF/Pub/Controller/Misc.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Xfrocks\Api\XF\Pub\Controller;
+
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\ControllerPlugin\Login;
+use Xfrocks\Api\Entity\Client;
+use Xfrocks\Api\Listener;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Util\Crypt;
+
+class Misc extends XFCP_Misc
+{
+    /**
+     * @throws \XF\PrintableException
+     */
+    public function actionApiChr()
+    {
+        $input = $this->filter([
+            'html' => 'str',
+            'required_externals' => 'str',
+            'timestamp' => 'int',
+        ]);
+
+        $html = Crypt::decryptTypeOne($input['html'], $input['timestamp']);
+
+        $requiredExternals = [];
+        if (strlen($input['required_externals']) > 0) {
+            $requiredExternals = \GuzzleHttp\json_decode(
+                Crypt::decryptTypeOne($input['required_externals'], $input['timestamp']),
+                true
+            );
+        }
+
+        $viewParams = compact('html', 'requiredExternals');
+        return $this->view('Xfrocks\Api:Misc\Api\Chr', 'bdapi_misc_chr', $viewParams);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\View
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionApiData()
+    {
+        $callback = $this->filter('callback', 'str');
+        $clientId = $this->filter('client_id', 'str');
+        $cmd = $this->filter('cmd', 'str');
+        $scope = $this->filter('scope', 'str');
+
+        $data = [$cmd => 0];
+
+        /** @var Client $client */
+        $client = $this->assertRecordExists('Xfrocks\Api:Client', $clientId);
+        $visitor = \XF::visitor();
+
+        switch ($cmd) {
+            case 'authorized':
+                if ($scope === '') {
+                    // no scope requested, check for scope `read`
+                    $requestedScopes = [Server::SCOPE_READ];
+                } else {
+                    $requestedScopes = explode(Listener::$scopeDelimiter, $scope);
+                    if (!is_array($requestedScopes)) {
+                        $requestedScopes = [];
+                    }
+                }
+                $requestedScopesAccepted = [];
+
+                // TODO: check for auto authorize
+
+                $userScopes = $this->finder('Xfrocks\Api:UserScope')
+                    ->where('client_id', $client->client_id)
+                    ->where('user_id', $visitor->user_id)
+                    ->keyedBy('scope')
+                    ->fetch();
+
+                foreach ($requestedScopes as $requestedScope) {
+                    if (isset($userScopes[$requestedScope])) {
+                        $requestedScopesAccepted[] = $requestedScope;
+                    }
+                }
+
+                if (count($requestedScopes) === count($requestedScopesAccepted)) {
+                    $data[$cmd] = 1;
+                }
+
+                if ($data[$cmd] > 0) {
+                    if ($scope !== '') {
+                        $data += $this->prepareApiDataForVisitor($visitor, $requestedScopesAccepted);
+                    } else {
+                        // just checking for connection status, return user_id only
+                        $data['user_id'] = $visitor->user_id;
+                    }
+                }
+
+                // switch ($cmd)
+                break;
+        }
+
+        $this->signApiData($client, $data);
+
+        $viewParams = [
+            'callback' => $callback,
+            'client_id' => $clientId,
+            'cmd' => $cmd,
+            'data' => $data,
+        ];
+
+        $this->setResponseType('raw');
+
+        return $this->view('Xfrocks\Api:Misc\ApiData', '', $viewParams);
+    }
+
+    /**
+     * @return \XF\Mvc\Reply\Redirect
+     * @throws \XF\Mvc\Reply\Exception
+     * @throws \XF\PrintableException
+     */
+    public function actionApiLogin()
+    {
+        /** @var Login $loginPlugin */
+        $loginPlugin = $this->plugin('Xfrocks\Api:Login');
+        return $loginPlugin->login('misc/api-login');
+    }
+
+    /**
+     * @param mixed $action
+     * @param ParameterBag $params
+     * @return void
+     */
+    public function checkCsrfIfNeeded($action, ParameterBag $params)
+    {
+        if ($action === 'ApiData') {
+            return;
+        }
+
+        parent::checkCsrfIfNeeded($action, $params);
+    }
+
+    /**
+     * @param \XF\Entity\User $visitor
+     * @param string[] $scopes
+     * @return array
+     */
+    protected function prepareApiDataForVisitor($visitor, array $scopes)
+    {
+        $data = [
+            'user_id' => $visitor->user_id,
+            'username' => $visitor->username,
+            'user_unread_notification_count' => $visitor->alerts_unread
+        ];
+
+        if (in_array(Server::SCOPE_PARTICIPATE_IN_CONVERSATIONS, $scopes, true)) {
+            $data['user_unread_conversation_count'] = $visitor->conversations_unread;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Client $client
+     * @param array $data
+     * @return void
+     */
+    protected function signApiData($client, array &$data)
+    {
+        $str = '';
+
+        $keys = array_keys($data);
+        asort($keys);
+        foreach ($keys as $key) {
+            if ($key === 'signature') {
+                // do not include existing signature when signing
+                // it's safe to run this method more than once with the same $data
+                continue;
+            }
+
+            if (is_array($data[$key])) {
+                // do not support array in signing for now
+                unset($data[$key]);
+                continue;
+            }
+
+            if (is_bool($data[$key])) {
+                // strval(true) = 1 while strval(false) = 0
+                // so we will normalize bool to int before the strval
+                $data[$key] = ($data[$key] ? 1 : 0);
+            }
+
+            $str .= sprintf('%s=%s&', $key, $data[$key]);
+        }
+
+        if (\XF::$debugMode && !headers_sent()) {
+            header('X-Api-Signature-String-Without-Secret: ' . $str);
+        }
+        $str .= $client->client_secret;
+
+        $data['signature'] = md5($str);
+    }
+}
diff --git a/XF/Repository/Node.php b/XF/Repository/Node.php
new file mode 100644
index 00000000..d5e22564
--- /dev/null
+++ b/XF/Repository/Node.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Xfrocks\Api\XF\Repository;
+
+use Xfrocks\Api\Transform\TransformContext;
+
+class Node extends XFCP_Node
+{
+    /**
+     * @param TransformContext $context
+     * @param string $key
+     * @return mixed
+     */
+    public function apiTransformCalculateDynamicValue(TransformContext $context, $key)
+    {
+        return null;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param array $links
+     * @return void
+     */
+    public function apiTransformCollectLinks(TransformContext $context, array &$links)
+    {
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param array $permissions
+     * @return void
+     */
+    public function apiTransformCollectPermissions(TransformContext $context, array &$permissions)
+    {
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param array $mappings
+     * @return void
+     */
+    public function apiTransformGetMappings(TransformContext $context, array &$mappings)
+    {
+    }
+}
diff --git a/XF/Service/AddOn/HashGenerator.php b/XF/Service/AddOn/HashGenerator.php
new file mode 100644
index 00000000..db239a3e
--- /dev/null
+++ b/XF/Service/AddOn/HashGenerator.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Xfrocks\Api\XF\Service\AddOn;
+
+class HashGenerator extends XFCP_HashGenerator
+{
+    /**
+     * @return void
+     */
+    protected function prepareFilesToHash()
+    {
+        if ($this->filesPrepared) {
+            return;
+        }
+
+        parent::prepareFilesToHash();
+
+        $keys = [];
+        foreach ($this->filesToHash as $key => $path) {
+            if (preg_match('#_build/upload/api/[^/]+$#', $path) !== 1) {
+                continue;
+            }
+
+            $keys[] = $key;
+        }
+
+        foreach ($keys as $key) {
+            unset($this->filesToHash[$key]);
+        }
+    }
+}
diff --git a/XF/Service/Conversation/Notifier.php b/XF/Service/Conversation/Notifier.php
new file mode 100644
index 00000000..2c83d5d5
--- /dev/null
+++ b/XF/Service/Conversation/Notifier.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Xfrocks\Api\XF\Service\Conversation;
+
+use Xfrocks\Api\Repository\Subscription;
+
+class Notifier extends XFCP_Notifier
+{
+    /**
+     * @param mixed $actionType
+     * @param array $notifyUsers
+     * @param \XF\Entity\ConversationMessage|null $message
+     * @param \XF\Entity\User|null $sender
+     * @return array
+     */
+    protected function _sendNotifications(
+        $actionType,
+        array $notifyUsers,
+        \XF\Entity\ConversationMessage $message = null,
+        \XF\Entity\User $sender = null
+    ) {
+        $sent = parent::_sendNotifications($actionType, $notifyUsers, $message, $sender);
+
+        $message = $message !== null ? $message : $this->conversation->FirstMessage;
+        $sender = $sender !== null ? $sender : $message->User;
+
+        foreach ($notifyUsers as $user) {
+            if ($sender->user_id == $user->user_id) {
+                continue;
+            }
+
+            /** @var Subscription $subscriptionRepo */
+            $subscriptionRepo = $this->repository('Xfrocks\Api:Subscription');
+            $subscriptionRepo->pingConversationMessage(
+                $actionType,
+                $message,
+                $user,
+                $sender
+            );
+        }
+
+        return $sent;
+    }
+}
diff --git a/XF/Service/User/DeleteCleanUp.php b/XF/Service/User/DeleteCleanUp.php
new file mode 100644
index 00000000..3ba4bac5
--- /dev/null
+++ b/XF/Service/User/DeleteCleanUp.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Xfrocks\Api\XF\Service\User;
+
+use Xfrocks\Api\Repository\Subscription;
+
+class DeleteCleanUp extends XFCP_DeleteCleanUp
+{
+    /**
+     * @param \XF\App $app
+     * @param int $userId
+     * @param string $userName
+     */
+    public function __construct(\XF\App $app, $userId, $userName)
+    {
+        parent::__construct($app, $userId, $userName);
+
+        $this->deletes['xf_bdapi_auth_code'] = 'user_id = ?';
+        $this->deletes['xf_bdapi_refresh_token'] = 'user_id = ?';
+        $this->deletes['xf_bdapi_token'] = 'user_id = ?';
+        $this->deletes['xf_bdapi_user_scope'] = 'user_id = ?';
+
+        $this->steps[] = 'stepDeleteApiSubscriptions';
+    }
+
+    /**
+     * @return void
+     */
+    public function stepDeleteApiSubscriptions()
+    {
+        $app = $this->app;
+        $options = $app->options();
+
+        if ($options->bdApi_subscriptionUser
+            || $options->bdApi_subscriptionUserNotification
+        ) {
+            /** @var Subscription $subRepo */
+            $subRepo = $this->repository('Xfrocks\Api:Subscription');
+            $subRepo->deleteSubscriptionsForTopic(Subscription::TYPE_USER, $this->userId);
+        }
+    }
+}
diff --git a/XF/Transform/AbstractNode.php b/XF/Transform/AbstractNode.php
new file mode 100644
index 00000000..4d802fdd
--- /dev/null
+++ b/XF/Transform/AbstractNode.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\XF\Repository\Node;
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+abstract class AbstractNode extends AbstractHandler
+{
+    const LINK_SUB_CATEGORIES = 'sub-categories';
+    const LINK_SUB_FORUMS = 'sub-forums';
+
+    public function getMappings(TransformContext $context)
+    {
+        $mappings = [
+            'node_id' => $this->getNameSingular() . '_id',
+            'title' => $this->getNameSingular() . '_title',
+            'description' => $this->getNameSingular() . '_description'
+        ];
+
+        $this->nodeRepo()->apiTransformGetMappings($context, $mappings);
+
+        return $mappings;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\AbstractNode $node */
+        $node = $context->getSource();
+
+        $links = [
+            self::LINK_PERMALINK => $this->buildApiLink($this->getRoutePrefix(), $node),
+            self::LINK_DETAIL => $this->buildApiLink($this->getRoutePrefix(), $node),
+        ];
+
+        $nodeNode = $node->Node;
+        if ($nodeNode !== null && $nodeNode->rgt - $nodeNode->lft > 1) {
+            $linkParams = ['parent_node_id' => $node->node_id];
+            $links += [
+                self::LINK_SUB_CATEGORIES => $this->buildApiLink('categories', null, $linkParams),
+                self::LINK_SUB_FORUMS => $this->buildApiLink('forums', null, $linkParams)
+            ];
+        }
+
+        $this->nodeRepo()->apiTransformCollectLinks($context, $links);
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        $perms = [];
+
+        $node = $context->getSource();
+        $canView = [$node, 'canView'];
+        if (is_callable($canView)) {
+            $perms[self::PERM_VIEW] = call_user_func($canView);
+        }
+
+        $visitor = \XF::visitor();
+        $perms[self::PERM_EDIT] = $visitor->hasAdminPermission('node');
+        $perms[self::PERM_DELETE] = $visitor->hasAdminPermission('node');
+
+        $this->nodeRepo()->apiTransformCollectPermissions($context, $perms);
+
+        return $perms;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        $value = $this->nodeRepo()->apiTransformCalculateDynamicValue($context, $key);
+        return $value !== null ? $value : parent::calculateDynamicValue($context, $key);
+    }
+
+    /**
+     * @return Node
+     */
+    protected function nodeRepo()
+    {
+        /** @var Node $nodeRepo */
+        $nodeRepo = $this->app->repository('XF:Node');
+        return $nodeRepo;
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getNameSingular();
+
+    /**
+     * @return string
+     */
+    abstract protected function getRoutePrefix();
+}
diff --git a/XF/Transform/Attachment.php b/XF/Transform/Attachment.php
new file mode 100644
index 00000000..8315a348
--- /dev/null
+++ b/XF/Transform/Attachment.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\AttachmentParent;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Attachment extends AbstractHandler
+{
+    const KEY_DOWNLOAD_COUNT = 'attachment_download_count';
+    const KEY_FILENAME = 'filename';
+    const KEY_HEIGHT = 'attachment_height';
+    const KEY_IS_INSERTED = 'attachment_is_inserted';
+    const KEY_ID = 'attachment_id';
+    const KEY_WIDTH = 'attachment_width';
+
+    const LINK_DATA = 'data';
+    const LINK_THUMBNAIL = 'thumbnail';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        switch ($key) {
+            case self::KEY_HEIGHT:
+            case self::KEY_WIDTH:
+                /** @var \XF\Entity\Attachment $attachment */
+                $attachment = $context->getSource();
+                $data = $attachment->Data;
+                if ($data !== null && $data->height > 0 && $data->width > 0) {
+                    return $key == self::KEY_HEIGHT ? $data->height : $data->width;
+                }
+
+                return null;
+            case self::KEY_IS_INSERTED:
+                $parentSource = $context->getParentSource();
+                $isAttachmentEmbedded = [$parentSource, 'isAttachmentEmbedded'];
+                if (is_callable($isAttachmentEmbedded)) {
+                    /** @var \XF\Entity\Attachment $attachment */
+                    $attachment = $context->getSource();
+                    return call_user_func($isAttachmentEmbedded, $attachment->attachment_id);
+                }
+
+                return null;
+        }
+
+        /** @var AttachmentParent|null $parentHandler */
+        $parentHandler = $context->getParentHandler();
+        if ($parentHandler !== null) {
+            return $parentHandler->attachmentCalculateDynamicValue($context, $key);
+        }
+
+        return parent::calculateDynamicValue($context, $key);
+    }
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\Attachment $attachment */
+        $attachment = $context->getSource();
+
+        $links = [
+            self::LINK_DATA => $this->buildApiLink('attachments', $attachment, ['hash' => $attachment->temp_hash]),
+            self::LINK_PERMALINK => $this->buildPublicLink('attachments', $attachment),
+        ];
+
+        $thumbnailUrl = $attachment->thumbnail_url;
+        if ($thumbnailUrl !== '') {
+            $links[self::LINK_THUMBNAIL] = $thumbnailUrl;
+        }
+
+        /** @var AttachmentParent|null $parentHandler */
+        $parentHandler = $context->getParentHandler();
+        if ($parentHandler !== null) {
+            $parentHandler->attachmentCollectLinks($context, $links);
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\Attachment $attachment */
+        $attachment = $context->getSource();
+
+        $permissions = [
+            self::PERM_DELETE => false,
+            self::PERM_VIEW => $attachment->canView(),
+        ];
+
+        /** @var AttachmentParent|null $parentHandler */
+        $parentHandler = $context->getParentHandler();
+        if ($parentHandler !== null) {
+            $parentHandler->attachmentCollectPermissions($context, $permissions);
+        }
+
+        return $permissions;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        $mappings = [
+            'attachment_id' => self::KEY_ID,
+            'filename' => self::KEY_FILENAME,
+            'view_count' => self::KEY_DOWNLOAD_COUNT,
+
+            self::KEY_HEIGHT,
+            self::KEY_IS_INSERTED,
+            self::KEY_WIDTH,
+        ];
+
+        /** @var AttachmentParent|null $parentHandler */
+        $parentHandler = $context->getParentHandler();
+        if ($parentHandler !== null) {
+            $parentHandler->attachmentGetMappings($context, $mappings);
+        }
+
+        return $mappings;
+    }
+}
diff --git a/XF/Transform/Category.php b/XF/Transform/Category.php
new file mode 100644
index 00000000..32340175
--- /dev/null
+++ b/XF/Transform/Category.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+class Category extends AbstractNode
+{
+    protected function getNameSingular()
+    {
+        return 'category';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'categories';
+    }
+}
diff --git a/XF/Transform/ConversationMaster.php b/XF/Transform/ConversationMaster.php
new file mode 100644
index 00000000..34ebc28d
--- /dev/null
+++ b/XF/Transform/ConversationMaster.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ConversationMaster extends AbstractHandler
+{
+    const KEY_CREATE_DATE = 'conversation_create_date';
+    const KEY_ID = 'conversation_id';
+    const KEY_MESSAGE_COUNT = 'conversation_message_count';
+    const KEY_TITLE = 'conversation_title';
+    const KEY_CREATOR_USER_ID = 'creator_user_id';
+    const KEY_CREATOR_USERNAME = 'creator_username';
+    const KEY_UPDATE_DATE = 'conversation_update_date';
+
+    const DYNAMIC_KEY_IS_DELETED = 'conversation_is_deleted';
+    const DYNAMIC_KEY_IS_IGNORED = 'user_is_ignored';
+    const DYNAMIC_KEY_IS_OPEN = 'conversation_is_open';
+    const DYNAMIC_KEY_FIRST_MESSAGE = 'first_message';
+    const DYNAMIC_KEY_HAS_NEW_MESSAGE = 'conversation_has_new_message';
+    const DYNAMIC_KEY_LAST_MESSAGE = 'last_message';
+    const DYNAMIC_KEY_RECIPIENTS = 'recipients';
+
+    const LINK_MESSAGES = 'messages';
+
+    const PERM_REPLY = 'reply';
+    const PERM_UPLOAD_ATTACHMENT = 'upload_attachment';
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'start_date' => self::KEY_CREATE_DATE,
+            'conversation_id' => self::KEY_ID,
+            'reply_count' => self::KEY_MESSAGE_COUNT,
+            'title' => self::KEY_TITLE,
+            'user_id' => self::KEY_CREATOR_USER_ID,
+            'username' => self::KEY_CREATOR_USERNAME,
+            'last_message_date' => self::KEY_UPDATE_DATE,
+
+            self::DYNAMIC_KEY_IS_DELETED,
+            self::DYNAMIC_KEY_IS_IGNORED,
+            self::DYNAMIC_KEY_IS_OPEN,
+            self::DYNAMIC_KEY_FIRST_MESSAGE,
+            self::DYNAMIC_KEY_HAS_NEW_MESSAGE,
+            self::DYNAMIC_KEY_LAST_MESSAGE,
+            self::DYNAMIC_KEY_RECIPIENTS
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\ConversationMaster $conversation */
+        $conversation = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_IS_DELETED:
+                $userId = \XF::visitor()->user_id;
+
+                if (!isset($conversation->Recipients[$userId])) {
+                    return true;
+                }
+                $recipient = $conversation->Recipients[$userId];
+
+                return in_array($recipient->recipient_state, ['deleted', 'deleted_ignored'], true);
+            case self::DYNAMIC_KEY_IS_IGNORED:
+                return \XF::visitor()->isIgnoring($conversation->user_id);
+            case self::DYNAMIC_KEY_IS_OPEN:
+                $userId = \XF::visitor()->user_id;
+
+                if (!isset($conversation->Recipients[$userId])) {
+                    return false;
+                }
+                $recipient = $conversation->Recipients[$userId];
+
+                return $recipient->recipient_state === 'active';
+            case self::DYNAMIC_KEY_FIRST_MESSAGE:
+                $firstMessage = $conversation->FirstMessage;
+                if ($firstMessage === null) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntity($context, $key, $firstMessage);
+            case self::DYNAMIC_KEY_HAS_NEW_MESSAGE:
+                $userId = \XF::visitor()->user_id;
+
+                if (!isset($conversation->Recipients[$userId])) {
+                    return false;
+                }
+                $recipient = $conversation->Recipients[$userId];
+
+                return $recipient->last_read_date < $conversation->last_message_date;
+            case self::DYNAMIC_KEY_LAST_MESSAGE:
+                if (!$context->selectorShouldIncludeField($key)) {
+                    return null;
+                }
+
+                $lastMessage = $conversation->LastMessage;
+                if ($lastMessage === null) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntity($context, $key, $lastMessage);
+            case self::DYNAMIC_KEY_RECIPIENTS:
+                return $this->transformer->transformEntityRelation($context, $key, $conversation, 'Recipients');
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\ConversationMaster $conversation */
+        $conversation = $context->getSource();
+        $links = [
+            self::LINK_PERMALINK => $this->buildPublicLink('conversations', $conversation),
+            self::LINK_DETAIL => $this->buildApiLink('conversations', $conversation),
+            self::LINK_MESSAGES => $this->buildApiLink(
+                'conversation-messages',
+                null,
+                ['conversation_id' => $conversation->conversation_id]
+            )
+        ];
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\ConversationMaster $conversation */
+        $conversation = $context->getSource();
+        $perms = [
+            self::PERM_REPLY => $conversation->canReply(),
+            self::PERM_DELETE => true,
+            self::PERM_UPLOAD_ATTACHMENT => $conversation->canUploadAndManageAttachments()
+        ];
+
+        return $perms;
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_FIRST_MESSAGE)) {
+            $this->callOnTransformEntitiesForRelation(
+                $context,
+                $entities,
+                self::DYNAMIC_KEY_FIRST_MESSAGE,
+                'FirstMessage'
+            );
+        }
+
+        if ($context->selectorShouldIncludeField(self::DYNAMIC_KEY_LAST_MESSAGE)) {
+            $this->callOnTransformEntitiesForRelation(
+                $context,
+                $entities,
+                self::DYNAMIC_KEY_LAST_MESSAGE,
+                'LastMessage'
+            );
+        }
+
+        $convoIds = array_keys($entities);
+        if (count($convoIds) > 0) {
+            $convoUsers = $this->app->em()->getFinder('XF:ConversationUser')
+                ->where('conversation_id', $convoIds)
+                ->fetch();
+            $convoUsersByConvoId = [];
+            /** @var \XF\Entity\ConversationUser $convoUser */
+            foreach ($convoUsers as $convoUser) {
+                $convoUsersByConvoId[$convoUser->conversation_id][$convoUser->owner_user_id] = $convoUser;
+            }
+            /** @var \XF\Entity\ConversationMaster $convo */
+            foreach ($entities as $convo) {
+                $thisConvoUsers = $convoUsersByConvoId[$convo->conversation_id];
+                $convo->hydrateRelation('Users', new \XF\Mvc\Entity\ArrayCollection($thisConvoUsers));
+            }
+        }
+
+        return parent::onTransformEntities($context, $entities);
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_FIRST_MESSAGE)) {
+            $this->callOnTransformFinderForRelation(
+                $context,
+                $finder,
+                self::DYNAMIC_KEY_FIRST_MESSAGE,
+                'FirstMessage'
+            );
+        }
+
+        if ($context->selectorShouldIncludeField(self::DYNAMIC_KEY_LAST_MESSAGE)) {
+            $this->callOnTransformFinderForRelation(
+                $context,
+                $finder,
+                self::DYNAMIC_KEY_LAST_MESSAGE,
+                'LastMessage'
+            );
+        }
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/XF/Transform/ConversationMessage.php b/XF/Transform/ConversationMessage.php
new file mode 100644
index 00000000..93a7b2de
--- /dev/null
+++ b/XF/Transform/ConversationMessage.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\AttachmentParent;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ConversationMessage extends AbstractHandler implements AttachmentParent
+{
+    const ATTACHMENT__DYNAMIC_KEY_ID = 'message_id';
+    const ATTACHMENT__LINK_MESSAGE = 'conversation-messages';
+
+    const CONTENT_TYPE_CONVO_MESSAGE = 'conversation_message';
+
+    const KEY_ID = 'message_id';
+    const KEY_CREATOR_USER_ID = 'creator_user_id';
+    const KEY_CREATOR_USERNAME = 'creator_username';
+    const KEY_CREATE_DATE = 'message_create_date';
+    const KEY_CONVERSATION_ID = 'conversation_id';
+    const KEY_ATTACH_COUNT = 'message_attach_count';
+
+    const DYNAMIC_KEY_BODY = 'message_body';
+    const DYNAMIC_KEY_BODY_HTML = 'message_body_html';
+    const DYNAMIC_KEY_BODY_PLAIN = 'message_body_plain_text';
+    const DYNAMIC_KEY_IS_LIKED = 'message_is_liked';
+    const DYNAMIC_KEY_SIGNATURE = 'signature';
+    const DYNAMIC_KEY_SIGNATURE_HTML = 'signature_html';
+    const DYNAMIC_KEY_SIGNATURE_PLAIN = 'signature_plain_text';
+    const DYNAMIC_KEY_USER_IS_IGNORED = 'user_is_ignored';
+
+    const PERM_REPLY = 'reply';
+    const PERM_UPLOAD_ATTACHMENT = 'upload_attachment';
+
+    const LINK_CONVERSATION = 'conversation';
+    const LINK_CREATOR = 'creator';
+    const LINK_CREATOR_AVATAR = 'creator_avatar';
+
+    public function attachmentCalculateDynamicValue(TransformContext $context, $key)
+    {
+        switch ($key) {
+            case self::ATTACHMENT__DYNAMIC_KEY_ID:
+                return $context->getParentSourceValue('message_id');
+        }
+
+        return null;
+    }
+
+    public function attachmentCollectPermissions(TransformContext $context, array &$permissions)
+    {
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $context->getParentSource();
+
+        $canDelete = false;
+        $conversation = $message->Conversation;
+
+        if ($conversation !== null && $conversation->canUploadAndManageAttachments()) {
+            $canDelete = $this->checkAttachmentCanManage(self::CONTENT_TYPE_CONVO_MESSAGE, $message);
+        }
+
+        $permissions[self::PERM_DELETE] = $canDelete;
+    }
+
+    public function attachmentCollectLinks(TransformContext $context, array &$links)
+    {
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $context->getParentSource();
+
+        $links[self::ATTACHMENT__LINK_MESSAGE] = $this->buildApiLink('conversation-messages', $message);
+    }
+
+    public function attachmentGetMappings(TransformContext $context, array &$mappings)
+    {
+        $mappings[] = self::ATTACHMENT__DYNAMIC_KEY_ID;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'message_id' => self::KEY_ID,
+            'conversation_id' => self::KEY_CONVERSATION_ID,
+            'user_id' => self::KEY_CREATOR_USER_ID,
+            'username' => self::KEY_CREATOR_USERNAME,
+            'message_date' => self::KEY_CREATE_DATE,
+            'attach_count' => self::KEY_ATTACH_COUNT,
+
+            self::DYNAMIC_KEY_ATTACHMENTS,
+            self::DYNAMIC_KEY_BODY,
+            self::DYNAMIC_KEY_BODY_HTML,
+            self::DYNAMIC_KEY_BODY_PLAIN,
+            self::DYNAMIC_KEY_SIGNATURE,
+            self::DYNAMIC_KEY_SIGNATURE_HTML,
+            self::DYNAMIC_KEY_SIGNATURE_PLAIN,
+            self::DYNAMIC_KEY_USER_IS_IGNORED
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_ATTACHMENTS:
+                if ($message->attach_count < 1) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntityRelation($context, $key, $message, 'Attachments');
+            case self::DYNAMIC_KEY_BODY:
+                return $message->message;
+            case self::DYNAMIC_KEY_BODY_HTML:
+                return $this->renderBbCodeHtml($key, $message->message, $message);
+            case self::DYNAMIC_KEY_BODY_PLAIN:
+                return $this->renderBbCodePlainText($message->message);
+            case self::DYNAMIC_KEY_IS_LIKED:
+                return $message->isReactedTo();
+            case self::DYNAMIC_KEY_SIGNATURE:
+            case self::DYNAMIC_KEY_SIGNATURE_HTML:
+            case self::DYNAMIC_KEY_SIGNATURE_PLAIN:
+                if ($message->user_id < 1) {
+                    return null;
+                }
+
+                $user = $message->User;
+                if ($user === null) {
+                    return null;
+                }
+
+                $profile = $user->Profile;
+                if ($profile === null) {
+                    return null;
+                }
+
+                switch ($key) {
+                    case self::DYNAMIC_KEY_SIGNATURE:
+                        return $profile->signature;
+                    case self::DYNAMIC_KEY_SIGNATURE_HTML:
+                        return $this->renderBbCodeHtml($key, $profile->signature, $profile);
+                    case self::DYNAMIC_KEY_SIGNATURE_PLAIN:
+                        return $this->renderBbCodePlainText($profile->signature);
+                }
+                break;
+            case self::DYNAMIC_KEY_USER_IS_IGNORED:
+                return $message->isIgnored();
+        }
+
+        return parent::calculateDynamicValue($context, $key);
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $context->getSource();
+        $user = $message->User;
+
+        $links = [
+            self::LINK_DETAIL => $this->buildApiLink('conversation-messages', $message),
+            self::LINK_CONVERSATION => $this->buildApiLink('conversations', $message->Conversation),
+            self::LINK_REPORT => $this->buildApiLink('conversation-messages/report', $message)
+        ];
+
+        if ($user !== null) {
+            $links[self::LINK_CREATOR] = $this->buildApiLink('users', $user);
+            $links[self::LINK_CREATOR_AVATAR] = $user->getAvatarUrl('l');
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\ConversationMessage $message */
+        $message = $context->getSource();
+        $conversation = $message->Conversation;
+
+        return [
+            self::PERM_VIEW => $message->canView(),
+            self::PERM_EDIT => $message->canEdit(),
+
+            // save value for version of xenforo 1.x
+            self::PERM_DELETE => true,
+
+            self::PERM_REPLY => $conversation !== null ? $conversation->canReply() : null,
+            self::PERM_UPLOAD_ATTACHMENT => $conversation !== null ? $conversation->canUploadAndManageAttachments() : null,
+
+            self::PERM_LIKE => $message->canReact(),
+        ];
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        $needAttachments = false;
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_ATTACHMENTS)) {
+            $needAttachments = true;
+        }
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_BODY_HTML)) {
+            $needAttachments = true;
+        }
+
+        if ($needAttachments) {
+            $this->enqueueEntitiesToAddAttachmentsTo($entities, self::CONTENT_TYPE_CONVO_MESSAGE);
+        }
+
+        return parent::onTransformEntities($context, $entities);
+    }
+}
diff --git a/XF/Transform/ConversationRecipient.php b/XF/Transform/ConversationRecipient.php
new file mode 100644
index 00000000..b05ab61b
--- /dev/null
+++ b/XF/Transform/ConversationRecipient.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ConversationRecipient extends AbstractHandler
+{
+    const KEY_USER_ID = 'user_id';
+
+    const DYNAMIC_KEY_USERNAME = 'username';
+    const DYNAMIC_KEY_AVATAR = 'avatar';
+    const DYNAMIC_KEY_AVATAR_BIG = 'avatar_big';
+    const DYNAMIC_KEY_AVATAR_SMALL = 'avatar_small';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'user_id' => self::KEY_USER_ID,
+
+            self::DYNAMIC_KEY_USERNAME,
+            self::DYNAMIC_KEY_AVATAR,
+            self::DYNAMIC_KEY_AVATAR_BIG,
+            self::DYNAMIC_KEY_AVATAR_SMALL
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\ConversationRecipient $recipient */
+        $recipient = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_USERNAME:
+                $user = $recipient->User;
+                if ($user === null) {
+                    return \XF::phrase('deleted_member');
+                }
+
+                return $user->username;
+            case self::DYNAMIC_KEY_AVATAR:
+                return $this->collectUserAvatarUrl($recipient, 'l');
+            case self::DYNAMIC_KEY_AVATAR_BIG:
+                return $this->collectUserAvatarUrl($recipient, 'o');
+            case self::DYNAMIC_KEY_AVATAR_SMALL:
+                return $this->collectUserAvatarUrl($recipient, 's');
+        }
+
+        return null;
+    }
+
+    /**
+     * @param \XF\Entity\ConversationRecipient $recipient
+     * @param string $sizeCode
+     * @return mixed|string|null
+     */
+    protected function collectUserAvatarUrl(\XF\Entity\ConversationRecipient $recipient, $sizeCode)
+    {
+        $user = $recipient->User;
+        return $user !== null ? $user->getAvatarUrl($sizeCode) : null;
+    }
+}
diff --git a/XF/Transform/ConversationUser.php b/XF/Transform/ConversationUser.php
new file mode 100644
index 00000000..4f3cb990
--- /dev/null
+++ b/XF/Transform/ConversationUser.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ConversationUser extends AbstractHandler
+{
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        $this->callOnTransformEntitiesForRelation($context, $entities, null, 'Master');
+
+        return parent::onTransformEntities($context, $entities);
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $this->callOnTransformFinderForRelation($context, $finder, null, 'Master');
+
+        return parent::onTransformFinder($context, $finder);
+    }
+
+    public function onTransformed(TransformContext $context, array &$data)
+    {
+        parent::onTransformed($context, $data);
+
+        $data += $this->transformer->transformEntityRelation($context, null, $context->getSource(), 'Master');
+    }
+}
diff --git a/XF/Transform/Forum.php b/XF/Transform/Forum.php
new file mode 100644
index 00000000..bf0d86c3
--- /dev/null
+++ b/XF/Transform/Forum.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\TransformContext;
+
+class Forum extends AbstractNode
+{
+    const KEY_POST_COUNT = 'forum_post_count';
+    const KEY_THREAD_COUNT = 'forum_thread_count';
+    const KEY_DEFAULT_THREAD_PREFIX_ID = 'thread_default_prefix_id';
+    const KEY_PREFIX_IS_REQUIRED = 'thread_prefix_is_required';
+
+    const DYNAMIC_KEY_IS_FOLLOW = 'forum_is_follow';
+    const DYNAMIC_KEY_PREFIXES = 'forum_prefixes';
+
+    const LINK_THREADS = 'threads';
+
+    const PERM_CREATE_THREAD = 'create_thread';
+    const PERM_UPLOAD_ATTACHMENT = 'upload_attachment';
+
+    public function getMappings(TransformContext $context)
+    {
+        $mappings = parent::getMappings($context);
+
+        $mappings += [
+            'discussion_count' => self::KEY_THREAD_COUNT,
+            'message_count' => self::KEY_POST_COUNT,
+            'default_prefix_id' => self::KEY_DEFAULT_THREAD_PREFIX_ID,
+            'require_prefix' => self::KEY_PREFIX_IS_REQUIRED,
+
+            self::DYNAMIC_KEY_IS_FOLLOW,
+            self::DYNAMIC_KEY_PREFIXES
+        ];
+
+        return $mappings;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var array $links */
+        $links = parent::collectLinks($context);
+        /** @var \XF\Entity\Forum $forum */
+        $forum = $context->getSource();
+
+        $links += [
+            self::LINK_FOLLOWERS => $this->buildApiLink('forums/followers', $forum),
+            self::LINK_THREADS => $this->buildApiLink('threads', null, ['forum_id' => $forum->node_id])
+        ];
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\Forum $forum */
+        $forum = $context->getSource();
+        /** @var array $perms */
+        $perms = parent::collectPermissions($context);
+
+        $perms += [
+            self::PERM_FOLLOW => $forum->canWatch(),
+            self::PERM_CREATE_THREAD => $forum->canCreateThread(),
+            self::PERM_UPLOAD_ATTACHMENT => $forum->canUploadAndManageAttachments()
+        ];
+
+        return $perms;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\Forum $forum */
+        $forum = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_IS_FOLLOW:
+                $userId = \XF::visitor()->user_id;
+                if ($userId < 1) {
+                    return false;
+                }
+
+                return isset($forum->Watch[$userId]);
+            case self::DYNAMIC_KEY_PREFIXES:
+                if (count($forum->prefix_cache) === 0) {
+                    return null;
+                }
+
+                $finder = $forum->finder('XF:ThreadPrefix')
+                    ->where('prefix_id', $forum->prefix_cache)
+                    ->order('materialized_order');
+
+                return $this->transformer->transformFinder($context, $key, $finder);
+        }
+
+        return parent::calculateDynamicValue($context, $key);
+    }
+
+    protected function getNameSingular()
+    {
+        return 'forum';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'forums';
+    }
+}
diff --git a/XF/Transform/LinkForum.php b/XF/Transform/LinkForum.php
new file mode 100644
index 00000000..a78b0b27
--- /dev/null
+++ b/XF/Transform/LinkForum.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\TransformContext;
+
+class LinkForum extends AbstractNode
+{
+    public function collectLinks(TransformContext $context)
+    {
+        $links = parent::collectLinks($context);
+
+        /** @var \XF\Entity\LinkForum $linkForum */
+        $linkForum = $context->getSource();
+        if ($linkForum->link_url !== '') {
+            $links['target'] = $linkForum->link_url;
+        } else {
+            $links['target'] = $this->buildPublicLink('link-forums', $linkForum);
+        }
+
+        return $links;
+    }
+
+    protected function getNameSingular()
+    {
+        return 'link';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'link-forums';
+    }
+}
diff --git a/XF/Transform/Page.php b/XF/Transform/Page.php
new file mode 100644
index 00000000..52f0f186
--- /dev/null
+++ b/XF/Transform/Page.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\TransformContext;
+
+class Page extends AbstractNode
+{
+    const KEY_VIEW_COUNT = 'page_view_count';
+
+    const DYNAMIC_KEY_PAGE_HTML = 'page_html';
+
+    public function getMappings(TransformContext $context)
+    {
+        $mappings = parent::getMappings($context);
+
+        $mappings['view_count'] = self::KEY_VIEW_COUNT;
+        $mappings[] = self::DYNAMIC_KEY_PAGE_HTML;
+
+        return $mappings;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\Page $page */
+        $page = $context->getSource();
+
+        if ($key === self::DYNAMIC_KEY_PAGE_HTML) {
+            return $this->app->templater()->renderTemplate('public:' . $page->getTemplateName(), [
+                'page' => $page
+            ]);
+        }
+
+        return parent::calculateDynamicValue($context, $key);
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        $links = parent::collectLinks($context);
+
+        /** @var \XF\Entity\Page $page */
+        $page = $context->getSource();
+
+        $links['sub-pages'] = $this->buildApiLink('pages', null, [
+            'parent_page_id' => $page->node_id
+        ]);
+
+        return $links;
+    }
+
+    protected function getNameSingular()
+    {
+        return 'page';
+    }
+
+    protected function getRoutePrefix()
+    {
+        return 'pages';
+    }
+}
diff --git a/XF/Transform/Poll.php b/XF/Transform/Poll.php
new file mode 100644
index 00000000..94c14996
--- /dev/null
+++ b/XF/Transform/Poll.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Poll extends AbstractHandler
+{
+    const KEY_ID = 'poll_id';
+    const KEY_MAX_VOTES = 'poll_max_votes';
+    const KEY_QUESTION = 'poll_question';
+    const KEY_VOTE_COUNT = 'poll_vote_count';
+
+    const DYNAMIC_KEY_IS_OPEN = 'poll_is_open';
+    const DYNAMIC_KEY_IS_VOTED = 'poll_is_voted';
+    const DYNAMIC_KEY_RESPONSES = 'responses';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\Poll $poll */
+        $poll = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_IS_OPEN:
+                return !$poll->isClosed();
+            case self::DYNAMIC_KEY_IS_VOTED:
+                return $poll->hasVoted();
+            case self::DYNAMIC_KEY_RESPONSES:
+                return $this->transformer->transformEntityRelation($context, $key, $poll, 'Responses');
+        }
+
+        return null;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'poll_id' => self::KEY_ID,
+            'question' => self::KEY_QUESTION,
+            'voter_count' => self::KEY_VOTE_COUNT,
+            'max_votes' => self::KEY_MAX_VOTES,
+
+            self::DYNAMIC_KEY_IS_OPEN,
+            self::DYNAMIC_KEY_IS_VOTED,
+            self::DYNAMIC_KEY_RESPONSES
+        ];
+    }
+}
diff --git a/XF/Transform/PollResponse.php b/XF/Transform/PollResponse.php
new file mode 100644
index 00000000..c7e6b37a
--- /dev/null
+++ b/XF/Transform/PollResponse.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class PollResponse extends AbstractHandler
+{
+    const KEY_ID = 'response_id';
+    const KEY_ANSWER = 'response_answer';
+    const KEY_VOTE_COUNT = 'response_vote_count';
+
+    const DYNAMIC_KEY_IS_VOTED = 'response_is_voted';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\PollResponse $response */
+        $response = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_IS_VOTED:
+                /** @var \XF\Entity\Poll|null $poll */
+                $poll = \XF::em()->find('XF:Poll', $response->poll_id);
+                return $poll !== null ? $poll->hasVoted($response->poll_response_id) : null;
+        }
+
+        return null;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'poll_response_id' => self::KEY_ID,
+            'response' => self::KEY_ANSWER,
+            'response_vote_count' => self::KEY_VOTE_COUNT,
+
+            self::DYNAMIC_KEY_IS_VOTED
+        ];
+    }
+}
diff --git a/XF/Transform/Post.php b/XF/Transform/Post.php
new file mode 100644
index 00000000..75bb164d
--- /dev/null
+++ b/XF/Transform/Post.php
@@ -0,0 +1,254 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use XF\Entity\Forum;
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\AttachmentParent;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Util\ParentFinder;
+
+class Post extends AbstractHandler implements AttachmentParent
+{
+    const CONTENT_TYPE_POST = 'post';
+
+    const ATTACHMENT__DYNAMIC_KEY_ID = 'post_id';
+    const ATTACHMENT__LINK_POST = 'post';
+
+    const KEY_ATTACHMENT_COUNT = 'post_attachment_count';
+    const KEY_BODY = 'post_body';
+    const KEY_CREATE_DATE = 'post_create_date';
+    const KEY_ID = 'post_id';
+    const KEY_LIKE_COUNT = 'post_like_count';
+    const KEY_UPDATE_DATE = 'post_update_date';
+    const KEY_POSTER_USER_ID = 'poster_user_id';
+    const KEY_POSTER_USERNAME = 'poster_username';
+    const KEY_THREAD_ID = 'thread_id';
+
+    const DYNAMIC_KEY_IS_LIKED = 'post_is_liked';
+    const DYNAMIC_KEY_BODY_HTML = 'post_body_html';
+    const DYNAMIC_KEY_BODY_PLAIN = 'post_body_plain_text';
+    const DYNAMIC_KEY_IS_PUBLISHED = 'post_is_published';
+    const DYNAMIC_KEY_IS_DELETED = 'post_is_deleted';
+    const DYNAMIC_KEY_IS_FIRST_POST = 'post_is_first_post';
+    const DYNAMIC_KEY_SIGNATURE = 'signature';
+    const DYNAMIC_KEY_SIGNATURE_HTML = 'signature_html';
+    const DYNAMIC_KEY_SIGNATURE_PLAIN = 'signature_plain_text';
+    const DYNAMIC_KEY_IS_IGNORED = 'user_is_ignored';
+
+    const LINK_THREAD = 'thread';
+    const LINK_POSTER = 'poster';
+    const LINK_POSTER_AVATAR = 'poster_avatar';
+
+    const PERM_REPLY = 'reply';
+    const PERM_UPLOAD_ATTACHMENT = 'upload_attachment';
+
+    public function attachmentCalculateDynamicValue(TransformContext $context, $key)
+    {
+        switch ($key) {
+            case self::ATTACHMENT__DYNAMIC_KEY_ID:
+                return $context->getParentSourceValue('post_id');
+        }
+
+        return null;
+    }
+
+    public function attachmentCollectLinks(TransformContext $context, array &$links)
+    {
+        $post = $context->getParentSource();
+        $links[self::ATTACHMENT__LINK_POST] = $this->buildApiLink('posts', $post);
+    }
+
+    public function attachmentCollectPermissions(TransformContext $context, array &$permissions)
+    {
+        /** @var \XF\Entity\Post $post */
+        $post = $context->getParentSource();
+        $canDelete = false;
+
+        $thread = $post->Thread;
+        $forum = $thread !== null ? $thread->Forum : null;
+        if ($forum !== null && $forum->canUploadAndManageAttachments()) {
+            $canDelete = $this->checkAttachmentCanManage(self::CONTENT_TYPE_POST, $post);
+        }
+
+        $permissions[self::PERM_DELETE] = $canDelete;
+    }
+
+    public function attachmentGetMappings(TransformContext $context, array &$mappings)
+    {
+        $mappings[] = self::ATTACHMENT__DYNAMIC_KEY_ID;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\Post $post */
+        $post = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_ATTACHMENTS:
+                if ($post->attach_count < 1) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntityRelation($context, $key, $post, 'Attachments');
+            case self::DYNAMIC_KEY_BODY_HTML:
+                return $this->renderBbCodeHtml($key, $post->message, $post);
+            case self::DYNAMIC_KEY_BODY_PLAIN:
+                return $this->renderBbCodePlainText($post->message);
+            case self::DYNAMIC_KEY_IS_DELETED:
+                return $post->message_state === 'deleted';
+            case self::DYNAMIC_KEY_IS_FIRST_POST:
+                return $post->isFirstPost();
+            case self::DYNAMIC_KEY_IS_IGNORED:
+                if (\XF::visitor()->user_id === 0) {
+                    return false;
+                }
+
+                return $post->isIgnored();
+            case self::DYNAMIC_KEY_IS_LIKED:
+                return $post->isReactedTo();
+            case self::DYNAMIC_KEY_IS_PUBLISHED:
+                return $post->message_state === 'visible';
+            case self::DYNAMIC_KEY_SIGNATURE:
+            case self::DYNAMIC_KEY_SIGNATURE_HTML:
+            case self::DYNAMIC_KEY_SIGNATURE_PLAIN:
+                if ($post->user_id < 1) {
+                    return null;
+                }
+
+                $user = $post->User;
+                if ($user === null) {
+                    return null;
+                }
+
+                $userProfile = $user->Profile;
+                if ($userProfile === null) {
+                    return null;
+                }
+
+                switch ($key) {
+                    case self::DYNAMIC_KEY_SIGNATURE:
+                        return $userProfile->signature;
+                    case self::DYNAMIC_KEY_SIGNATURE_HTML:
+                        return $this->renderBbCodeHtml($key, $userProfile->signature, $user);
+                    case self::DYNAMIC_KEY_SIGNATURE_PLAIN:
+                        return $this->renderBbCodePlainText($userProfile->signature);
+                }
+        }
+
+        return null;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\Post $post */
+        $post = $context->getSource();
+        $thread = $post->Thread;
+        $forum = $thread !== null ? $thread->Forum : null;
+
+        return [
+            self::PERM_DELETE => $post->canDelete(),
+            self::PERM_EDIT => $post->canEdit(),
+            self::PERM_LIKE => $post->canReact(),
+            self::PERM_REPLY => $thread !== null ? $thread->canReply() : null,
+            self::PERM_REPORT => $post->canReport(),
+            self::PERM_UPLOAD_ATTACHMENT => $forum !== null ? $forum->canUploadAndManageAttachments() : null,
+        ];
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\Post $post */
+        $post = $context->getSource();
+
+        $links = [
+            self::LINK_ATTACHMENTS => $this->buildApiLink('posts/attachments', $post),
+            self::LINK_DETAIL => $this->buildApiLink('posts', $post),
+            self::LINK_LIKES => $this->buildApiLink('posts/likes', $post),
+            self::LINK_PERMALINK => $this->buildPublicLink('posts', $post),
+            self::LINK_REPORT => $this->buildApiLink('posts/report', $post),
+            self::LINK_THREAD => $this->buildApiLink('threads', $post->Thread),
+        ];
+
+        if ($post->user_id > 0) {
+            $user = $post->User;
+            if ($user !== null) {
+                $links[self::LINK_POSTER] = $this->buildApiLink('users', $post->User);
+                $links[self::LINK_POSTER_AVATAR] = $user->getAvatarUrl('l');
+            }
+        }
+
+        return $links;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'attach_count' => self::KEY_ATTACHMENT_COUNT,
+            'last_edit_date' => self::KEY_UPDATE_DATE,
+            'message' => self::KEY_BODY,
+            'post_date' => self::KEY_CREATE_DATE,
+            'post_id' => self::KEY_ID,
+            'reaction_score' => self::KEY_LIKE_COUNT,
+            'thread_id' => self::KEY_THREAD_ID,
+            'user_id' => self::KEY_POSTER_USER_ID,
+            'username' => self::KEY_POSTER_USERNAME,
+
+            self::DYNAMIC_KEY_ATTACHMENTS,
+            self::DYNAMIC_KEY_BODY_HTML,
+            self::DYNAMIC_KEY_BODY_PLAIN,
+            self::DYNAMIC_KEY_IS_DELETED,
+            self::DYNAMIC_KEY_IS_FIRST_POST,
+            self::DYNAMIC_KEY_IS_IGNORED,
+            self::DYNAMIC_KEY_IS_LIKED,
+            self::DYNAMIC_KEY_IS_PUBLISHED,
+            self::DYNAMIC_KEY_SIGNATURE,
+            self::DYNAMIC_KEY_SIGNATURE_HTML,
+            self::DYNAMIC_KEY_SIGNATURE_PLAIN,
+        ];
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        $needAttachments = false;
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_ATTACHMENTS)) {
+            $needAttachments = true;
+        }
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_BODY_HTML)) {
+            $needAttachments = true;
+        }
+        if ($needAttachments) {
+            $this->enqueueEntitiesToAddAttachmentsTo($entities, self::CONTENT_TYPE_POST);
+        }
+
+        return $entities;
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $threadFinder = new ParentFinder($finder, 'Thread');
+        $visitor = \XF::visitor();
+
+        $threadFinder->with('Forum.Node.Permissions|' . $visitor->permission_combination_id);
+
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_SIGNATURE) ||
+            !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_SIGNATURE_HTML) ||
+            !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_SIGNATURE_PLAIN)
+        ) {
+            $finder->with('User.Profile');
+        }
+
+        $userId = $visitor->user_id;
+        if ($userId > 0) {
+            if (!$context->selectorShouldExcludeField(self::KEY_PERMISSIONS)) {
+                $threadFinder->with('ReplyBans|' . $userId);
+            }
+
+            if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_IS_LIKED)) {
+                $finder->with('Reactions|' . $userId);
+            }
+        }
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/XF/Transform/ProfilePost.php b/XF/Transform/ProfilePost.php
new file mode 100644
index 00000000..953ac048
--- /dev/null
+++ b/XF/Transform/ProfilePost.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ProfilePost extends AbstractHandler
+{
+    const KEY_POSTER_USER_ID = 'poster_user_id';
+    const KEY_POSTER_USERNAME = 'poster_username';
+    const KEY_POST_CREATE_DATE = 'post_create_date';
+    const KEY_POST_LIKE_COUNT = 'post_like_count';
+    const KEY_POST_COMMENT_COUNT = 'post_comment_count';
+
+    const DYNAMIC_KEY_POST_BODY = 'post_body';
+    const DYNAMIC_KEY_TIMELINE_USER_ID = 'timeline_user_id';
+    const DYNAMIC_KEY_TIMELINE_USER_NAME = 'timeline_username';
+    const DYNAMIC_KEY_POST_IS_PUBLISHED = 'post_is_published';
+    const DYNAMIC_KEY_POST_IS_DELETED = 'post_is_deleted';
+    const DYNAMIC_KEY_POST_IS_LIKED = 'post_is_liked';
+    const DYNAMIC_KEY_USER_IS_IGNORED = 'user_is_ignored';
+
+    const LINK_TIMELINE = 'timeline';
+    const LINK_TIMELINE_USER = 'timeline_user';
+    const LINK_POSTER = 'poster';
+    const LINK_COMMENTS = 'comments';
+    const LINK_POSTER_AVATAR = 'poster_avatar';
+
+    const PERM_COMMENT = 'comment';
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'user_id' => self::KEY_POSTER_USER_ID,
+            'username' => self::KEY_POSTER_USERNAME,
+            'post_date' => self::KEY_POST_CREATE_DATE,
+            'comment_count' => self::KEY_POST_COMMENT_COUNT,
+            'reaction_score' => self::KEY_POST_LIKE_COUNT,
+
+            self::DYNAMIC_KEY_POST_BODY,
+            self::DYNAMIC_KEY_TIMELINE_USER_ID,
+            self::DYNAMIC_KEY_TIMELINE_USER_NAME,
+            self::DYNAMIC_KEY_POST_IS_PUBLISHED,
+            self::DYNAMIC_KEY_POST_IS_DELETED,
+            self::DYNAMIC_KEY_POST_IS_LIKED,
+            self::DYNAMIC_KEY_USER_IS_IGNORED
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\ProfilePost $profilePost */
+        $profilePost = $context->getSource();
+        $profileUser = $profilePost->ProfileUser;
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_POST_BODY:
+                return $this->app->templater()->func('structured_text', [$profilePost->message]);
+            case self::DYNAMIC_KEY_TIMELINE_USER_ID:
+                return $profileUser !== null ? $profileUser->user_id : null;
+            case self::DYNAMIC_KEY_TIMELINE_USER_NAME:
+                return $profileUser !== null ? $profileUser->username : null;
+            case self::DYNAMIC_KEY_POST_IS_PUBLISHED:
+                return $profilePost->isVisible();
+            case self::DYNAMIC_KEY_POST_IS_DELETED:
+                return $profilePost->message_state === 'deleted';
+            case self::DYNAMIC_KEY_POST_IS_LIKED:
+                return $profilePost->isReactedTo();
+            case self::DYNAMIC_KEY_USER_IS_IGNORED:
+                return $profilePost->isIgnored();
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\ProfilePost $profilePost */
+        $profilePost = $context->getSource();
+        $user = $profilePost->User;
+
+        $links = [
+            self::LINK_PERMALINK => $this->buildPublicLink('profile-posts', $profilePost),
+            self::LINK_DETAIL => $this->buildApiLink('profile-posts', $profilePost),
+            self::LINK_TIMELINE => $this->buildApiLink('users/timeline', $profilePost->ProfileUser),
+            self::LINK_TIMELINE_USER => $this->buildApiLink('users', $profilePost->ProfileUser),
+            self::LINK_LIKES => $this->buildApiLink('profile-posts/likes', $profilePost),
+            self::LINK_COMMENTS => $this->buildApiLink('profile-posts/comments', $profilePost),
+            self::LINK_REPORT => $this->buildApiLink('profile-posts/report', $profilePost),
+        ];
+
+        if ($user !== null) {
+            $links[self::LINK_POSTER] = $this->buildApiLink('users', $user);
+            $links[self::LINK_POSTER_AVATAR] = $user->getAvatarUrl('m');
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\ProfilePost $profilePost */
+        $profilePost = $context->getSource();
+
+        $perms = [
+            self::PERM_VIEW => $profilePost->canView(),
+            self::PERM_EDIT => $profilePost->canEdit(),
+            self::PERM_DELETE => $profilePost->canDelete(),
+            self::PERM_LIKE => $profilePost->canReact(),
+            self::PERM_REPORT => $profilePost->canReport(),
+            self::PERM_COMMENT => $profilePost->canComment()
+        ];
+
+        return $perms;
+    }
+}
diff --git a/XF/Transform/ProfilePostComment.php b/XF/Transform/ProfilePostComment.php
new file mode 100644
index 00000000..9d45093d
--- /dev/null
+++ b/XF/Transform/ProfilePostComment.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ProfilePostComment extends AbstractHandler
+{
+    const KEY_ID = 'comment_id';
+    const KEY_PROFILE_POST_ID = 'profile_post_id';
+    const KEY_COMMENT_USER_ID = 'comment_user_id';
+    const KEY_COMMENT_USERNAME = 'comment_username';
+    const KEY_COMMENT_CREATE_DATE = 'comment_create_date';
+
+    const DYNAMIC_KEY_TIMELINE_USER_ID = 'timeline_user_id';
+    const DYNAMIC_KEY_USER_IS_IGNORED = 'user_is_ignored';
+    const DYNAMIC_KEY_COMMENT_BODY = 'comment_body';
+
+    const LINK_PROFILE_POST = 'profile_post';
+    const LINK_TIMELINE = 'timeline';
+    const LINK_TIMELINE_USER = 'timeline_user';
+    const LINK_POSTER = 'poster';
+    const LINK_POSTER_AVATAR = 'poster_avatar';
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'profile_post_comment_id' => self::KEY_ID,
+            'profile_post_id' => self::KEY_PROFILE_POST_ID,
+            'user_id' => self::KEY_COMMENT_USER_ID,
+            'username' => self::KEY_COMMENT_USERNAME,
+            'comment_date' => self::KEY_COMMENT_CREATE_DATE,
+
+            self::DYNAMIC_KEY_TIMELINE_USER_ID,
+            self::DYNAMIC_KEY_USER_IS_IGNORED,
+            self::DYNAMIC_KEY_COMMENT_BODY
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\ProfilePostComment $comment */
+        $comment = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_TIMELINE_USER_ID:
+                $profilePost = $comment->ProfilePost;
+                if ($profilePost === null) {
+                    break;
+                }
+
+                $profileUser = $profilePost->ProfileUser;
+                if ($profileUser === null) {
+                    break;
+                }
+
+                return $profileUser->user_id;
+            case self::DYNAMIC_KEY_COMMENT_BODY:
+                return $this->app->templater()->func('structured_text', [$comment->message]);
+            case self::DYNAMIC_KEY_USER_IS_IGNORED:
+                return $comment->isIgnored();
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\ProfilePostComment $comment */
+        $comment = $context->getSource();
+        $profilePost = $comment->ProfilePost;
+        $user = $comment->User;
+
+        $links = [
+            self::LINK_DETAIL => $this->buildApiLink(
+                'profile-posts/comments',
+                $comment->ProfilePost,
+                ['comment_id' => $comment->profile_post_comment_id]
+            ),
+            self::LINK_PROFILE_POST => $this->buildApiLink('profile-posts', $profilePost),
+            self::LINK_TIMELINE => $profilePost !== null
+                ? $this->buildApiLink('users/timeline', $profilePost->ProfileUser)
+                : null,
+            self::LINK_TIMELINE_USER => $profilePost !== null
+                ? $this->buildApiLink('users', $profilePost->ProfileUser)
+                : null,
+        ];
+
+        if ($user !== null) {
+            $links[self::LINK_POSTER] = $this->buildApiLink('users', $user);
+            $links[self::LINK_POSTER_AVATAR] = $user->getAvatarUrl('m');
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\ProfilePostComment $comment */
+        $comment = $context->getSource();
+
+        $perms = [
+            self::PERM_VIEW => $comment->canView(),
+            self::PERM_DELETE => $comment->canDelete()
+        ];
+
+        return $perms;
+    }
+}
diff --git a/XF/Transform/Tag.php b/XF/Transform/Tag.php
new file mode 100644
index 00000000..8b49541f
--- /dev/null
+++ b/XF/Transform/Tag.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Tag extends AbstractHandler
+{
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'tag_id' => 'tag_id',
+            'tag' => 'tag_text',
+            'use_count' => 'tag_use_count'
+        ];
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\Tag $tag */
+        $tag = $context->getSource();
+
+        return [
+            self::LINK_DETAIL => $this->buildApiLink('tags', $tag),
+            self::LINK_PERMALINK => $this->buildPublicLink('tags', $tag)
+        ];
+    }
+}
diff --git a/XF/Transform/Thread.php b/XF/Transform/Thread.php
new file mode 100644
index 00000000..2b963254
--- /dev/null
+++ b/XF/Transform/Thread.php
@@ -0,0 +1,244 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Util\ParentFinder;
+
+class Thread extends AbstractHandler
+{
+    const KEY_CREATOR_USER_ID = 'creator_user_id';
+    const KEY_CREATOR_USERNAME = 'creator_username';
+    const KEY_CREATE_DATE = 'thread_create_date';
+    const KEY_FORUM_ID = 'forum_id';
+    const KEY_ID = 'thread_id';
+    const KEY_POST_COUNT = 'thread_post_count';
+    const KEY_TITLE = 'thread_title';
+    const KEY_UPDATE_DATE = 'thread_update_date';
+    const KEY_VIEW_COUNT = 'thread_view_count';
+
+    const DYNAMIC_KEY_FIRST_POST = 'first_post';
+    const DYNAMIC_KEY_FORUM = 'forum';
+    const DYNAMIC_KEY_FORUM_DATA_KEY = 'thread.forum';
+    const DYNAMIC_KEY_IS_DELETED = 'thread_is_deleted';
+    const DYNAMIC_KEY_IS_FOLLOWED = 'thread_is_followed';
+    const DYNAMIC_KEY_IS_PUBLISHED = 'thread_is_published';
+    const DYNAMIC_KEY_IS_STICKY = 'thread_is_sticky';
+    const DYNAMIC_KEY_PREFIXES = 'thread_prefixes';
+    const DYNAMIC_KEY_POLL = 'poll';
+    const DYNAMIC_KEY_TAGS = 'thread_tags';
+    const DYNAMIC_KEY_USER_IS_IGNORED = 'user_is_ignored';
+
+    const LINK_FIRST_POST = 'first_post';
+    const LINK_FIRST_POSTER = 'first_poster';
+    const LINK_FIRST_POSTER_AVATAR = 'first_poster_avatar';
+    const LINK_FORUM = 'forum';
+    const LINK_LAST_POST = 'last_post';
+    const LINK_LAST_POSTER = 'last_poster';
+    const LINK_POSTS = 'posts';
+
+    const PERM_EDIT_TITLE = 'edit_title';
+    const PERM_EDIT_TAGS = 'edit_tags';
+    const PERM_POST = 'post';
+    const PERM_UPLOAD_ATTACHMENT = 'upload_attachment';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\Thread $thread */
+        $thread = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_FIELDS:
+                $customFieldSet = $thread->custom_fields;
+                return $this->transformer->transformCustomFieldSet($context, $customFieldSet);
+            case self::DYNAMIC_KEY_FIRST_POST:
+                $firstPost = $thread->FirstPost;
+                return $firstPost !== null ? $this->transformer->transformEntity($context, $key, $firstPost) : null;
+            case self::DYNAMIC_KEY_FORUM:
+                if ($context->data(self::DYNAMIC_KEY_FORUM_DATA_KEY) === true) {
+                    if ($context->selectorShouldExcludeField(self::DYNAMIC_KEY_FORUM)) {
+                        return null;
+                    }
+                } else {
+                    if (!$context->selectorShouldIncludeField(self::DYNAMIC_KEY_FORUM)) {
+                        return null;
+                    }
+                }
+
+                $forum = $thread->Forum;
+                return $forum !== null ? $this->transformer->transformEntity($context, $key, $forum) : null;
+            case self::DYNAMIC_KEY_IS_DELETED:
+                return $thread->discussion_state === 'deleted';
+            case self::DYNAMIC_KEY_IS_FOLLOWED:
+                $userId = \XF::visitor()->user_id;
+                if ($userId < 1) {
+                    return false;
+                }
+
+                return isset($thread->Watch[$userId]);
+            case self::DYNAMIC_KEY_IS_PUBLISHED:
+                return $thread->discussion_state === 'visible';
+            case self::DYNAMIC_KEY_IS_STICKY:
+                return $thread->sticky;
+            case self::DYNAMIC_KEY_POLL:
+                if ($thread->discussion_type !== 'poll') {
+                    return null;
+                }
+
+                $poll = $thread->Poll;
+                if ($poll === null) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntity($context, $key, $poll);
+            case self::DYNAMIC_KEY_PREFIXES:
+                if ($thread->prefix_id === 0) {
+                    return null;
+                }
+
+                /** @var \XF\Entity\ThreadPrefix|null $prefix */
+                $prefix = $thread->Prefix;
+                if ($prefix === null) {
+                    return null;
+                }
+
+                $prefixData = $this->transformer->transformEntity($context, $key, $prefix);
+                if (count($prefixData) === 0) {
+                    return null;
+                }
+
+                return [$prefixData];
+            case self::DYNAMIC_KEY_TAGS:
+                return $this->transformer->transformTags($context, $thread->tags);
+            case self::DYNAMIC_KEY_USER_IS_IGNORED:
+                return $thread->isIgnored();
+        }
+
+        return null;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\Thread $thread */
+        $thread = $context->getSource();
+        $forum = $thread->Forum;
+
+        return [
+            self::PERM_DELETE => $thread->canDelete(),
+            self::PERM_EDIT => $thread->canEdit(),
+            self::PERM_EDIT_TAGS => $thread->canEditTags(),
+            self::PERM_EDIT_TITLE => $thread->canEdit(),
+            self::PERM_FOLLOW => $thread->canWatch(),
+            self::PERM_POST => $thread->canReply(),
+            self::PERM_UPLOAD_ATTACHMENT => $forum !== null ? $forum->canUploadAndManageAttachments() : null,
+        ];
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\Thread $thread */
+        $thread = $context->getSource();
+
+        $links = [
+            self::LINK_DETAIL => $this->buildApiLink('threads', $thread),
+            self::LINK_FIRST_POST => $this->buildApiLink('posts', $thread->FirstPost),
+            self::LINK_FOLLOWERS => $this->buildApiLink('threads/followers', $thread),
+            self::LINK_FORUM => $this->buildApiLink('forums', $thread->Forum),
+            self::LINK_LAST_POSTER => $this->buildApiLink('users', $thread->LastPoster),
+            self::LINK_LAST_POST => $this->buildApiLink('posts', ['post_id' => $thread->last_post_id]),
+            self::LINK_PERMALINK => $this->buildPublicLink('threads', $thread),
+            self::LINK_POSTS => $this->buildApiLink('posts', null, ['thread_id' => $thread->thread_id]),
+        ];
+
+        $firstPost = $thread->FirstPost;
+        if ($firstPost !== null && $firstPost->user_id > 0) {
+            $firstPostUser = $firstPost->User;
+            if ($firstPostUser !== null) {
+                $links[self::LINK_FIRST_POSTER] = $this->buildApiLink('users', $firstPostUser);
+                $links[self::LINK_FIRST_POSTER_AVATAR] = $firstPostUser->getAvatarUrl('l');
+            }
+        }
+
+        return $links;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            // xf_thread
+            'last_post_date' => self::KEY_UPDATE_DATE,
+            'node_id' => self::KEY_FORUM_ID,
+            'post_date' => self::KEY_CREATE_DATE,
+            'reply_count' => self::KEY_POST_COUNT,
+            'thread_id' => self::KEY_ID,
+            'title' => self::KEY_TITLE,
+            'user_id' => self::KEY_CREATOR_USER_ID,
+            'username' => self::KEY_CREATOR_USERNAME,
+            'view_count' => self::KEY_VIEW_COUNT,
+
+            self::DYNAMIC_KEY_FIELDS,
+            self::DYNAMIC_KEY_FIRST_POST,
+            self::DYNAMIC_KEY_FORUM,
+            self::DYNAMIC_KEY_IS_PUBLISHED,
+            self::DYNAMIC_KEY_IS_DELETED,
+            self::DYNAMIC_KEY_IS_STICKY,
+            self::DYNAMIC_KEY_IS_FOLLOWED,
+            self::DYNAMIC_KEY_POLL,
+            self::DYNAMIC_KEY_PREFIXES,
+            self::DYNAMIC_KEY_TAGS,
+            self::DYNAMIC_KEY_USER_IS_IGNORED,
+        ];
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_FIRST_POST)) {
+            $this->callOnTransformEntitiesForRelation(
+                $context,
+                $entities,
+                self::DYNAMIC_KEY_FIRST_POST,
+                'FirstPost'
+            );
+        }
+
+        return $entities;
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $forumFinder = new ParentFinder($finder, 'Forum');
+        $visitor = \XF::visitor();
+
+        $forumFinder->with('Node.Permissions|' . $visitor->permission_combination_id);
+
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_FIRST_POST)) {
+            $this->callOnTransformFinderForRelation(
+                $context,
+                $finder,
+                self::DYNAMIC_KEY_FIRST_POST,
+                'FirstPost'
+            );
+        }
+
+        if ($context->selectorShouldIncludeField(self::DYNAMIC_KEY_FORUM)
+            || ($context->data(self::DYNAMIC_KEY_FORUM_DATA_KEY) === true
+                && !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_FORUM))) {
+            $this->callOnTransformFinderForRelation(
+                $context,
+                $finder,
+                self::DYNAMIC_KEY_FORUM,
+                'Forum'
+            );
+        }
+
+        $userId = $visitor->user_id;
+        if ($userId > 0) {
+            if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_IS_FOLLOWED)) {
+                $finder->with('Watch|' . $userId);
+            }
+        }
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/XF/Transform/ThreadPrefix.php b/XF/Transform/ThreadPrefix.php
new file mode 100644
index 00000000..ebc587ff
--- /dev/null
+++ b/XF/Transform/ThreadPrefix.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class ThreadPrefix extends AbstractHandler
+{
+    const KEY_ID = 'prefix_id';
+    const KEY_TITLE = 'prefix_title';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'prefix_id' => self::KEY_ID,
+            'title' => self::KEY_TITLE
+        ];
+    }
+}
diff --git a/XF/Transform/User.php b/XF/Transform/User.php
new file mode 100644
index 00000000..d415db20
--- /dev/null
+++ b/XF/Transform/User.php
@@ -0,0 +1,437 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use XF\Entity\ConversationMaster;
+use XF\Repository\UserFollow;
+use XF\Repository\UserGroup;
+use Xfrocks\Api\OAuth2\Server;
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class User extends AbstractHandler
+{
+    const KEY_ID = 'user_id';
+    const KEY_LIKE_COUNT = 'user_like_count';
+    const KEY_MESSAGE_COUNT = 'user_message_count';
+    const KEY_NAME = 'username';
+    const KEY_REGISTER_DATE = 'user_register_date';
+
+    const DYNAMIC_KEY_DOB_DAY = 'user_dob_day';
+    const DYNAMIC_KEY_DOB_MONTH = 'user_dob_month';
+    const DYNAMIC_KEY_DOB_YEAR = 'user_dob_year';
+    const DYNAMIC_KEY_EMAIL = 'user_email';
+    const DYNAMIC_KEY_EXTERNAL_AUTHS = 'user_external_authentications';
+    const DYNAMIC_KEY_FIELDS = 'fields';
+    const DYNAMIC_KEY_FOLLOWERS_TOTAL = 'user_followers_total';
+    const DYNAMIC_KEY_FOLLOWINGS_TOTAL = 'user_followings_total';
+    const DYNAMIC_KEY_GROUPS = 'user_groups';
+    const DYNAMIC_KEY_GROUPS__IS_PRIMARY = 'is_primary_group';
+    const DYNAMIC_KEY_HAS_PASSWORD = 'user_has_password';
+    const DYNAMIC_KEY_IS_FOLLOWED = 'user_is_followed';
+    const DYNAMIC_KEY_IS_IGNORED = 'user_is_ignored';
+    const DYNAMIC_KEY_IS_VALID = 'user_is_valid';
+    const DYNAMIC_KEY_IS_VERIFIED = 'user_is_verified';
+    const DYNAMIC_KEY_IS_VISITOR = 'user_is_visitor';
+    const DYNAMIC_KEY_LAST_SEEN_DATE = 'user_last_seen_date';
+    const DYNAMIC_KEY_PERMISSIONS_EDIT = 'edit_permissions';
+    const DYNAMIC_KEY_PERMISSIONS_SELF = 'self_permissions';
+    const DYNAMIC_KEY_TIMEZONE_OFFSET = 'user_timezone_offset';
+    const DYNAMIC_KEY_TITLE = 'user_title';
+    const DYNAMIC_KEY_UNREAD_CONVO_COUNT = 'user_unread_conversation_count';
+    const DYNAMIC_KEY_UNREAD_NOTIF_COUNT = 'user_unread_notification_count';
+
+    const LINK_AVATAR = 'avatar';
+    const LINK_AVATAR_BIG = 'avatar_big';
+    const LINK_AVATAR_SMALL = 'avatar_small';
+    const LINK_FOLLOWERS = 'followers';
+    const LINK_FOLLOWINGS = 'followings';
+    const LINK_IGNORE = 'ignore';
+    const LINK_TIMELINE = 'timeline';
+
+    const PERM_IGNORE = 'ignore';
+    const PERM_FOLLOW = 'follow';
+    const PERM_PROFILE_POST = 'profile_post';
+    const PERM_SELF_CREATE_CONVO = 'create_conversation';
+    const PERM_SELF_ATTACH_CONVO = 'upload_attachment_conversation';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+        $visitor = \XF::visitor();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_DOB_DAY:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                $userProfile = $user->Profile;
+                return $userProfile !== null ? $userProfile->dob_day : null;
+            case self::DYNAMIC_KEY_DOB_MONTH:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                $userProfile = $user->Profile;
+                return $userProfile !== null ? $userProfile->dob_month : null;
+            case self::DYNAMIC_KEY_DOB_YEAR:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                $userProfile = $user->Profile;
+                return $userProfile !== null ? $userProfile->dob_year : null;
+            case self::DYNAMIC_KEY_EMAIL:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                return $user->email;
+            case self::DYNAMIC_KEY_EXTERNAL_AUTHS:
+                return $this->collectExternalAuths($context);
+            case self::DYNAMIC_KEY_FIELDS:
+                return $this->collectFields($context);
+            case self::DYNAMIC_KEY_FOLLOWERS_TOTAL:
+                if (!$context->selectorShouldIncludeField($key)) {
+                    return null;
+                }
+
+                /** @var UserFollow $userFollowRepo */
+                $userFollowRepo = $this->app->repository('XF:UserFollow');
+                return $userFollowRepo->findFollowersForProfile($user)->total();
+            case self::DYNAMIC_KEY_FOLLOWINGS_TOTAL:
+                if (!$context->selectorShouldIncludeField($key)) {
+                    return null;
+                }
+
+                /** @var UserFollow $userFollowRepo */
+                $userFollowRepo = $this->app->repository('XF:UserFollow');
+                return $userFollowRepo->findFollowingForProfile($user)->total();
+            case self::DYNAMIC_KEY_GROUPS:
+                return $this->collectGroups($context, $key);
+            case self::DYNAMIC_KEY_HAS_PASSWORD:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                $userAuth = $user->Auth;
+                if ($userAuth === null) {
+                    return false;
+                }
+
+                $handler = $userAuth->getAuthenticationHandler();
+                return $handler !== null ? $handler->hasPassword() : false;
+            case self::DYNAMIC_KEY_IS_FOLLOWED:
+                return $visitor->isFollowing($user);
+            case self::DYNAMIC_KEY_IS_IGNORED:
+                return $visitor->isIgnoring($user->user_id);
+            case self::DYNAMIC_KEY_IS_VALID:
+                return (!$user->is_banned
+                    && in_array(
+                        $user->user_state,
+                        ['valid', 'email_confirm', 'email_confirm_edit'],
+                        true
+                    )
+                );
+            case self::DYNAMIC_KEY_IS_VERIFIED:
+                return $user->user_state === 'valid';
+            case self::DYNAMIC_KEY_IS_VISITOR:
+                return $user->user_id === $visitor->user_id;
+            case self::DYNAMIC_KEY_LAST_SEEN_DATE:
+                return $user->canViewCurrentActivity() ? $user->last_activity : $user->register_date;
+            case self::DYNAMIC_KEY_PERMISSIONS_EDIT:
+                return $this->collectPermissionsEdit();
+            case self::DYNAMIC_KEY_PERMISSIONS_SELF:
+                return $this->collectPermissionsSelf($context);
+            case self::DYNAMIC_KEY_TIMEZONE_OFFSET:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                $dtz = new \DateTimeZone($user->timezone);
+                try {
+                    $dt = new \DateTime('now', $dtz);
+                } catch (\Exception $e) {
+                    return null;
+                }
+                return $dtz->getOffset($dt);
+            case self::DYNAMIC_KEY_TITLE:
+                return strip_tags($this->getTemplater()->func('user_title', [$user]));
+            case self::DYNAMIC_KEY_UNREAD_CONVO_COUNT:
+                if ($context->data('flagFullAccess') !== true ||
+                    !$this->checkSessionScope(Server::SCOPE_PARTICIPATE_IN_CONVERSATIONS)) {
+                    return null;
+                }
+                return $user->conversations_unread;
+            case self::DYNAMIC_KEY_UNREAD_NOTIF_COUNT:
+                if ($context->data('flagFullAccess') !== true) {
+                    return null;
+                }
+                return $user->alerts_unread;
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+
+        $links = [
+            self::LINK_AVATAR => $user->getAvatarUrl('l'),
+            self::LINK_AVATAR_BIG => $user->getAvatarUrl('o'),
+            self::LINK_AVATAR_SMALL => $user->getAvatarUrl('s'),
+            self::LINK_DETAIL => $this->buildApiLink('users', $user),
+            self::LINK_FOLLOWERS => $this->buildApiLink('users/followers', $user),
+            self::LINK_FOLLOWINGS => $this->buildApiLink('users/followings', $user),
+            self::LINK_IGNORE => $this->buildApiLink('users/ignore', $user),
+            self::LINK_PERMALINK => $this->buildPublicLink('members', $user)
+        ];
+
+        if ($user->canViewPostsOnProfile()) {
+            $links[self::LINK_TIMELINE] = $this->buildApiLink('users/timeline', $user);
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+        $visitor = \XF::visitor();
+
+        return [
+            self::PERM_EDIT => $context->data('flagFullAccess') !== true,
+            self::PERM_IGNORE => $visitor->canIgnoreUser($user),
+            self::PERM_FOLLOW => $visitor->canFollowUser($user),
+            self::PERM_PROFILE_POST => $user->canPostOnProfile()
+        ];
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'reaction_score' => self::KEY_LIKE_COUNT,
+            'message_count' => self::KEY_MESSAGE_COUNT,
+            'register_date' => self::KEY_REGISTER_DATE,
+            'user_id' => self::KEY_ID,
+            'username' => self::KEY_NAME,
+
+            self::DYNAMIC_KEY_DOB_DAY,
+            self::DYNAMIC_KEY_DOB_MONTH,
+            self::DYNAMIC_KEY_DOB_YEAR,
+            self::DYNAMIC_KEY_EMAIL,
+            self::DYNAMIC_KEY_EXTERNAL_AUTHS,
+            self::DYNAMIC_KEY_FIELDS,
+            self::DYNAMIC_KEY_FOLLOWERS_TOTAL,
+            self::DYNAMIC_KEY_FOLLOWINGS_TOTAL,
+            self::DYNAMIC_KEY_GROUPS,
+            self::DYNAMIC_KEY_HAS_PASSWORD,
+            self::DYNAMIC_KEY_IS_FOLLOWED,
+            self::DYNAMIC_KEY_IS_IGNORED,
+            self::DYNAMIC_KEY_IS_VALID,
+            self::DYNAMIC_KEY_IS_VERIFIED,
+            self::DYNAMIC_KEY_IS_VISITOR,
+            self::DYNAMIC_KEY_LAST_SEEN_DATE,
+            self::DYNAMIC_KEY_PERMISSIONS_EDIT,
+            self::DYNAMIC_KEY_PERMISSIONS_SELF,
+            self::DYNAMIC_KEY_TIMEZONE_OFFSET,
+            self::DYNAMIC_KEY_TITLE,
+            self::DYNAMIC_KEY_UNREAD_CONVO_COUNT,
+            self::DYNAMIC_KEY_UNREAD_NOTIF_COUNT
+        ];
+    }
+
+    public function onNewContext(TransformContext $context)
+    {
+        $data = parent::onNewContext($context);
+        $data['flagFullAccess'] = false;
+
+        $visitor = \XF::visitor();
+        if ($visitor->user_id > 0) {
+            /** @var \XF\Entity\User $user */
+            $user = $context->getSource();
+            if ($user->user_id === $visitor->user_id) {
+                $data['flagFullAccess'] = true;
+            } else {
+                $data['flagFullAccess'] = $visitor->hasAdminPermission('user');
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array|null
+     */
+    protected function collectExternalAuths($context)
+    {
+        if ($context->data('flagFullAccess') !== true) {
+            return null;
+        }
+
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+        $userProfile = $user->Profile;
+        if ($userProfile === null) {
+            return null;
+        }
+
+        $data = [];
+        foreach ($userProfile->connected_accounts as $provider => $providerKey) {
+            $data[] = [
+                'provider' => $provider,
+                'provider_key' => $providerKey
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array|null
+     */
+    protected function collectFields($context)
+    {
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+
+        $systemFields = ['about', 'homepage', 'location'];
+        $profile = $user->Profile;
+        $data = $profile != null
+            ? $this->transformer->transformCustomFieldSet($context, $profile->custom_fields)
+            : [];
+
+        foreach ($systemFields as $systemFieldId) {
+            $systemField = [
+                'id' => $systemFieldId,
+                'title' => \XF::phrase($systemFieldId),
+                'description' => '',
+                'position' => 'personal',
+                'is_required' => false
+            ];
+
+            switch ($systemFieldId) {
+                case 'about':
+                    $systemField['value'] = $profile !== null ? $profile->about : null;
+                    break;
+                case 'homepage':
+                    $systemField['value'] = $profile !== null ? $profile->website : null;
+                    $systemField['title'] = \XF::phrase('website');
+                    break;
+                case 'location':
+                    $systemField['value'] = $profile !== null ? $profile->location : null;
+                    break;
+            }
+
+            $data[] = $systemField;
+        }
+
+        return $this->transformer->transformArray($context, 'fields', $data);
+    }
+
+    /**
+     * @param TransformContext $context
+     * @param string $key
+     * @return array|null
+     */
+    protected function collectGroups($context, $key)
+    {
+        if ($context->data('flagFullAccess') !== true) {
+            return null;
+        }
+
+        static $allGroups = null;
+        if ($allGroups === null) {
+            /** @var UserGroup $userGroupRepo */
+            $userGroupRepo = $this->app->repository('XF:UserGroup');
+            $allGroups = $userGroupRepo->findUserGroupsForList()->fetch();
+        }
+
+        /** @var \XF\Entity\User $user */
+        $user = $context->getSource();
+        $userGroups = [];
+        foreach ($allGroups as $group) {
+            if (!$user->isMemberOf($group)) {
+                continue;
+            }
+            $userGroups[] = $group;
+        }
+
+        $data = [];
+        /** @var \XF\Entity\UserGroup $group */
+        foreach ($userGroups as $group) {
+            $groupData = $this->transformer->transformEntity($context, $key, $group);
+            if ($group->user_group_id === $user->user_group_id) {
+                $groupData[self::DYNAMIC_KEY_GROUPS__IS_PRIMARY] = true;
+            } else {
+                $groupData[self::DYNAMIC_KEY_GROUPS__IS_PRIMARY] = false;
+            }
+
+            $data[] = $groupData;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return array|null
+     */
+    protected function collectPermissionsEdit()
+    {
+        // TODO
+        return null;
+    }
+
+    /**
+     * @param TransformContext $context
+     * @return array|null
+     */
+    protected function collectPermissionsSelf($context)
+    {
+        if ($context->data('flagFullAccess') !== true) {
+            return null;
+        }
+
+        $canStartConversation = \XF::visitor()->canStartConversation();
+        $canUploadAndManageAttachments = false;
+        if ($canStartConversation) {
+            /** @var ConversationMaster $conversation */
+            $conversation = $this->app->em()->create('XF:ConversationMaster');
+            $canUploadAndManageAttachments = $conversation->canUploadAndManageAttachments();
+        }
+
+        return [
+            self::PERM_SELF_CREATE_CONVO => $canStartConversation,
+            self::PERM_SELF_ATTACH_CONVO => $canUploadAndManageAttachments
+        ];
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $finder->with('Privacy');
+
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_DOB_DAY) ||
+            !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_DOB_MONTH) ||
+            !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_DOB_YEAR) ||
+            !$context->selectorShouldExcludeField(self::DYNAMIC_KEY_EXTERNAL_AUTHS)
+        ) {
+            $finder->with('Profile');
+        }
+
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_HAS_PASSWORD)) {
+            $finder->with('Auth');
+        }
+
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_LAST_SEEN_DATE)) {
+            $finder->with('Activity');
+        }
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/XF/Transform/UserAlert.php b/XF/Transform/UserAlert.php
new file mode 100644
index 00000000..16f11739
--- /dev/null
+++ b/XF/Transform/UserAlert.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class UserAlert extends AbstractHandler
+{
+    const KEY_ID = 'notification_id';
+    const KEY_CREATE_DATE = 'notification_create_date';
+    const KEY_CREATOR_USER_ID = 'creator_user_id';
+    const KEY_CREATOR_USERNAME = 'creator_username';
+    const KEY_CONTENT_TYPE = 'content_type';
+    const KEY_CONTENT_ID = 'content_id';
+    const KEY_CONTENT_ACTION = 'content_action';
+
+    const DYNAMIC_KEY_IS_UNREAD = 'notification_is_unread';
+    const DYNAMIC_KEY_NOTIFICATION_TYPE = 'notification_type';
+    const DYNAMIC_KEY_NOTIFICATION_HTML = 'notification_html';
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'alert_id' => self::KEY_ID,
+            'event_date' => self::KEY_CREATE_DATE,
+            'user_id' => self::KEY_CREATOR_USER_ID,
+            'username' => self::KEY_CREATOR_USERNAME,
+            'content_type' => self::KEY_CONTENT_TYPE,
+            'content_id' => self::KEY_CONTENT_ID,
+            'action' => self::KEY_CONTENT_ACTION,
+
+
+            self::DYNAMIC_KEY_IS_UNREAD,
+            self::DYNAMIC_KEY_NOTIFICATION_TYPE,
+            self::DYNAMIC_KEY_NOTIFICATION_HTML
+        ];
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XF\Entity\UserAlert $alert */
+        $alert = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_IS_UNREAD:
+                return $alert->isUnviewed();
+            case self::DYNAMIC_KEY_NOTIFICATION_TYPE:
+                return sprintf(
+                    '%s_%d_%s',
+                    $alert->content_type,
+                    $alert->content_id,
+                    $alert->action
+                );
+            case self::DYNAMIC_KEY_NOTIFICATION_HTML:
+                return $alert->render();
+        }
+
+        return parent::calculateDynamicValue($context, $key);
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XF\Entity\UserAlert $alert */
+        $alert = $context->getSource();
+
+        $links = [];
+
+        $links['content'] = $this->buildApiLink('notifications/content', $alert);
+        $links['read'] = $this->buildApiLink('notifications/read');
+
+        $user = $alert->User;
+        if ($user !== null) {
+            $links['creator_avatar'] = $user->getAvatarUrl('m');
+        }
+
+        return $links;
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        /** @var \XF\Entity\UserAlert[] $userAlerts */
+        $userAlerts = $entities;
+
+        /** @var \XF\Repository\UserAlert $userAlertRepo */
+        $userAlertRepo = $this->app->repository('XF:UserAlert');
+        $userAlertRepo->addContentToAlerts($userAlerts);
+
+        return parent::onTransformEntities($context, $entities);
+    }
+}
diff --git a/XF/Transform/UserGroup.php b/XF/Transform/UserGroup.php
new file mode 100644
index 00000000..b583264d
--- /dev/null
+++ b/XF/Transform/UserGroup.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Xfrocks\Api\XF\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class UserGroup extends AbstractHandler
+{
+    const KEY_ID = 'user_group_id';
+    const KEY_TITLE = 'user_group_title';
+
+    public function canView(TransformContext $context)
+    {
+        return true;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'user_group_id' => self::KEY_ID,
+            'title' => self::KEY_TITLE
+        ];
+    }
+}
diff --git a/XFRM/Controller/Category.php b/XFRM/Controller/Category.php
new file mode 100644
index 00000000..e1708186
--- /dev/null
+++ b/XFRM/Controller/Category.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Controller;
+
+use XF\Mvc\ParameterBag;
+use Xfrocks\Api\Controller\AbstractController;
+
+class Category extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->resource_category_id) {
+            return $this->actionSingle($params->resource_category_id);
+        }
+
+        $finder = $this->finder('XFRM:Category')->order('lft');
+        $categories = $this->transformFinderLazily($finder);
+
+        return $this->api(['categories' => $categories]);
+    }
+
+    /**
+     * @param int $resourceCategoryId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function actionSingle($resourceCategoryId)
+    {
+        $category = $this->assertViewableCategory($resourceCategoryId);
+
+        $data = [
+            'category' => $this->transformEntityLazily($category)
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param int $resourceCategoryId
+     * @param array $extraWith
+     * @return \XFRM\Entity\Category
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableCategory($resourceCategoryId, array $extraWith = [])
+    {
+        /** @var \XFRM\Entity\Category $category */
+        $category = $this->assertRecordExists(
+            'XFRM:Category',
+            $resourceCategoryId,
+            $extraWith,
+            'xfmg_requested_category_not_found'
+        );
+
+        if (!$category->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $category;
+    }
+}
diff --git a/XFRM/Controller/ResourceItem.php b/XFRM/Controller/ResourceItem.php
new file mode 100644
index 00000000..37f954b5
--- /dev/null
+++ b/XFRM/Controller/ResourceItem.php
@@ -0,0 +1,327 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Controller;
+
+use XF\Mvc\ParameterBag;
+use XFRM\Entity\ResourceWatch;
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Data\Params;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Util\PageNav;
+use Xfrocks\Api\Util\Tree;
+
+class ResourceItem extends AbstractController
+{
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetIndex(ParameterBag $params)
+    {
+        if ($params->resource_id) {
+            return $this->actionSingle($params->resource_id);
+        }
+
+        $params = $this->params()
+            ->define('resource_category_id', 'uint', 'category id to filter')
+            ->define('resource_category_ids', 'str', 'category ids to filter (separated by comma)')
+            ->define('in_sub', 'bool', 'flag to include sub categories in filtering')
+            ->defineOrder([
+                'resource_create_date' => ['resource_date', 'asc'],
+                'resource_create_date_reverse' => ['resource_date', 'desc'],
+                'resource_update_date' => ['last_update', 'asc', '_whereOp' => '>'],
+                'resource_update_date_reverse' => ['last_update', 'desc', '_whereOp' => '<'],
+                'resource_download_count' => ['download_count', 'asc'],
+                'resource_download_count_reverse' => ['download_count', 'desc'],
+                'resource_rating_weighted' => ['rating_weighted', 'asc'],
+                'resource_rating_weighted_reverse' => ['rating_weighted', 'desc'],
+            ])
+            ->definePageNav()
+            ->define(\Xfrocks\Api\XFRM\Transform\ResourceItem::KEY_UPDATE_DATE, 'uint', 'timestamp to filter')
+            ->define('resource_ids', 'str', 'resource ids to fetch (ignoring all filters, separated by comma)');
+
+        if ($params['resource_ids'] !== '') {
+            return $this->actionMultiple($params->filterCommaSeparatedIds('resource_ids'));
+        }
+
+        /** @var \XFRM\Finder\ResourceItem $finder */
+        $finder = $this->finder('XFRM:ResourceItem');
+        $this->applyFilters($finder, $params);
+
+        $orderChoice = $params->sortFinder($finder);
+        if (is_array($orderChoice)) {
+            switch ($orderChoice[0]) {
+                case 'last_update':
+                    $keyUpdateDate = \Xfrocks\Api\XFRM\Transform\ResourceItem::KEY_UPDATE_DATE;
+                    if ($params[$keyUpdateDate] > 0) {
+                        $finder->where($orderChoice[0], $orderChoice['_whereOp'], $params[$keyUpdateDate]);
+                    }
+                    break;
+            }
+        }
+
+        $params->limitFinderByPage($finder);
+
+        $total = $finder->total();
+        $resources = $total > 0 ? $this->transformFinderLazily($finder) : [];
+
+        $data = [
+            'resources' => $resources,
+            'resources_total' => $total,
+        ];
+
+        $theCategory = null;
+        if ($params['resource_category_id'] > 0) {
+            /** @var \XFRM\Entity\Category $theCategory */
+            $theCategory = $this->assertRecordExists('XFRM:Category', $params['resource_category_id']);
+        }
+        if ($theCategory !== null) {
+            $this->transformEntityIfNeeded($data, 'category', $theCategory);
+        }
+
+        PageNav::addLinksToData($data, $params, $total, 'resources');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param array $ids
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionMultiple(array $ids)
+    {
+        $resources = [];
+        if (count($ids) > 0) {
+            $resources = $this->findAndTransformLazily('XFRM:ResourceItem', $ids);
+        }
+
+        return $this->api(['resources' => $resources]);
+    }
+
+
+    /**
+     * @param int $resourceId
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     */
+    public function actionSingle($resourceId)
+    {
+        return $this->api([
+            'resource' => $this->findAndTransformLazily(
+                'XFRM:ResourceItem',
+                intval($resourceId),
+                'xfrm_requested_resource_not_found'
+            )
+        ]);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowers(ParameterBag $params)
+    {
+        $resource = $this->assertViewableResource($params->resource_id);
+
+        $users = [];
+        if ($resource->canWatch()) {
+            $visitor = \XF::visitor();
+            /** @var ResourceWatch|null $watch */
+            $watch = $resource->Watch[$visitor->user_id];
+            if ($watch !== null) {
+                $users[] = [
+                    'user_id' => $visitor->user_id,
+                    'username' => $visitor->username,
+                    'follow' => [
+                        'alert' => true,
+                        'email' => $watch->email_subscribe
+                    ]
+                ];
+            }
+        }
+
+        $data = [
+            'users' => $users
+        ];
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionPostFollowers(ParameterBag $params)
+    {
+        $resource = $this->assertViewableResource($params->resource_id);
+
+        $params = $this
+            ->params()
+            ->define('email', 'bool', 'whether to receive notification as email');
+
+        if (!$resource->canWatch($error)) {
+            return $this->noPermission($error);
+        }
+
+        /** @var \XFRM\Repository\ResourceWatch $resourceWatchRepo */
+        $resourceWatchRepo = $this->repository('XFRM:ResourceWatch');
+        $resourceWatchRepo->setWatchState(
+            $resource,
+            \XF::visitor(),
+            'watch',
+            ['email_subscribe' => $params['email']]
+        );
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @param ParameterBag $params
+     * @return \XF\Mvc\Reply\Message
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionDeleteFollowers(ParameterBag $params)
+    {
+        $resource = $this->assertViewableResource($params->resource_id);
+
+        /** @var \XFRM\Repository\ResourceWatch $resourceWatchRepo */
+        $resourceWatchRepo = $this->repository('XFRM:ResourceWatch');
+        $resourceWatchRepo->setWatchState($resource, \XF::visitor(), 'delete');
+
+        return $this->message(\XF::phrase('changes_saved'));
+    }
+
+    /**
+     * @return \Xfrocks\Api\Mvc\Reply\Api
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    public function actionGetFollowed()
+    {
+        $params = $this
+            ->params()
+            ->define('total', 'uint')
+            ->definePageNav();
+
+        $this->assertRegistrationRequired();
+
+        $visitor = \XF::visitor();
+        $finder = $this->finder('XFRM:ResourceWatch')
+            ->where('user_id', $visitor->user_id);
+
+        if ($params['total'] > 0) {
+            $data = [
+                'resources_total' => $finder->total()
+            ];
+
+            return $this->api($data);
+        }
+
+        $finder->with('Resource');
+        $params->limitFinderByPage($finder);
+
+        /** @var ResourceWatch[] $resourceWatches */
+        $resourceWatches = $finder->fetch();
+
+
+        $context = $this->params()->getTransformContext();
+        $context->onTransformedCallbacks[] = function ($context, &$data) use ($resourceWatches) {
+            /** @var TransformContext $context */
+            $source = $context->getSource();
+            if (!($source instanceof \XFRM\Entity\ResourceItem)) {
+                return;
+            }
+
+            /** @var ResourceWatch|null $watched */
+            $watched = null;
+            foreach ($resourceWatches as $resourceWatch) {
+                if ($resourceWatch->resource_id == $source->resource_id) {
+                    $watched = $resourceWatch;
+                    break;
+                }
+            }
+
+            if ($watched !== null) {
+                $data['follow'] = [
+                    'alert' => true,
+                    'email' => $watched->email_subscribe
+                ];
+            }
+        };
+
+        $resources = [];
+        foreach ($resourceWatches as $resourceWatch) {
+            $resource = $resourceWatch->Resource;
+            if ($resource !== null) {
+                $resources[] = $this->transformEntityLazily($resource);
+            }
+        }
+
+        $total = $finder->total();
+
+        $data = [
+            'resources' => $resources,
+            'resources_total' => $total
+        ];
+
+        PageNav::addLinksToData($data, $params, $total, 'resources/followed');
+
+        return $this->api($data);
+    }
+
+    /**
+     * @param \XFRM\Finder\ResourceItem $finder
+     * @param Params $params
+     * @return void
+     */
+    protected function applyFilters($finder, Params $params)
+    {
+        $finder->applyGlobalVisibilityChecks();
+
+        $categoryIds = [];
+        if ($params['resource_category_id'] > 0) {
+            $categoryIds[] = $params['resource_category_id'];
+        } else {
+            $categoryIds = $params->filterCommaSeparatedIds('resource_category_ids');
+            if (count($categoryIds) > 0) {
+                sort($categoryIds);
+            }
+        }
+        if (count($categoryIds) > 0) {
+            if ($params['in_sub'] === true) {
+                /** @var \XFRM\Repository\Category $categoryRepo */
+                $categoryRepo = $this->repository('XFRM:Category');
+                $categories = $this->finder('XFRM:Category')->fetch();
+                $categoryTree = $categoryRepo->createCategoryTree($categories);
+                $categoryIds = Tree::getAllChildIds($categoryTree, $categoryIds);
+            }
+
+            $categoryIds = array_unique($categoryIds);
+            $finder->where('resource_category_id', $categoryIds);
+        }
+    }
+
+    /**
+     * @param int $resourceId
+     * @param array $extraWith
+     * @return \XFRM\Entity\ResourceItem
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableResource($resourceId, array $extraWith = [])
+    {
+        /** @var \XFRM\Entity\ResourceItem $resourceItem */
+        $resourceItem = $this->assertRecordExists(
+            'XFRM:ResourceItem',
+            $resourceId,
+            $extraWith,
+            'xfrm_requested_resource_not_found'
+        );
+
+        if (!$resourceItem->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $resourceItem;
+    }
+}
diff --git a/XFRM/Controller/Search.php b/XFRM/Controller/Search.php
new file mode 100644
index 00000000..5b1a7cf9
--- /dev/null
+++ b/XFRM/Controller/Search.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Controller;
+
+class Search extends XFCP_Search
+{
+    /**
+     * @return \XF\Mvc\Reply\Error|\XF\Mvc\Reply\Reroute
+     * @throws \XF\PrintableException
+     */
+    public function actionPostResources()
+    {
+        if (!\XF::visitor()->canSearch($error)) {
+            return $this->noPermission($error);
+        }
+
+        $params = $this
+            ->params()
+            ->define('q', 'str', 'query to search for')
+            ->define('user_id', 'uint', 'id of the creator to search for contents');
+
+        if ($params['q'] === '' && $params['user_id'] === 0) {
+            return $this->error(\XF::phrase('bdapi_slash_search_requires_q'), 400);
+        }
+
+        $search = $this->searchRepo()->search($params, 'resource');
+        if ($search === null) {
+            // no results.
+            return $this->error(\XF::phrase('no_results_found'), 400);
+        }
+
+        return $this->rerouteController(__CLASS__, 'getResults', ['search_id' => $search->search_id]);
+    }
+}
+
+if (false) {
+    // phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
+    // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
+    class XFCP_Search extends \Xfrocks\Api\Controller\Search
+    {
+    }
+}
diff --git a/XFRM/Data/Modules.php b/XFRM/Data/Modules.php
new file mode 100644
index 00000000..b954578f
--- /dev/null
+++ b/XFRM/Data/Modules.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Data;
+
+use Xfrocks\Api\Controller\AbstractController;
+use Xfrocks\Api\Listener;
+
+class Modules extends XFCP_Modules
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->addController(
+            'Xfrocks\Api\XFRM\Controller\Category',
+            'resource-categories',
+            ':int<resource_category_id>/'
+        );
+        $this->addController(
+            'Xfrocks\Api\XFRM\Controller\ResourceItem',
+            'resources',
+            ':int<resource_id>/'
+        );
+
+        $this->register('resource', 2017040401);
+    }
+
+    /**
+     * @param AbstractController $controller
+     * @return array
+     */
+    public function getDataForApiIndex($controller)
+    {
+        $data = parent::getDataForApiIndex($controller);
+
+        $app = $controller->app();
+        $apiRouter = $app->router(Listener::$routerType);
+        $data['links']['resource-categories'] = $apiRouter->buildLink('resource-categories');
+        $data['links']['resources'] = $apiRouter->buildLink('resources');
+
+        return $data;
+    }
+}
+
+if (false) {
+    // phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
+    // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
+    class XFCP_Modules extends \Xfrocks\Api\Data\Modules
+    {
+    }
+}
diff --git a/XFRM/Transform/Category.php b/XFRM/Transform/Category.php
new file mode 100644
index 00000000..042b03ee
--- /dev/null
+++ b/XFRM/Transform/Category.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\TransformContext;
+
+class Category extends AbstractHandler
+{
+    const KEY_DESCRIPTION = 'category_description';
+    const KEY_ID = 'resource_category_id';
+    const KEY_PARENT_ID = 'parent_category_id';
+    const KEY_RESOURCE_COUNT = 'category_resource_count';
+    const KEY_TITLE = 'category_title';
+
+    const LINK_RESOURCES = 'resources';
+    const LINK_RESOURCES_IN_SUB = 'resources_in_sub';
+
+    const PERM_ADD = 'add';
+    const PERM_ADD_FILE = 'add_file';
+    const PERM_ADD_URL = 'add_url';
+    const PERM_ADD_PRICE = 'add_price';
+    const PERM_ADD_FILE_LESS = 'add_no_file_or_url';
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XFRM\Entity\Category $category */
+        $category = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_FIELDS:
+                /** @var \XF\CustomField\DefinitionSet $allDefinitions */
+                $allDefinitions = $this->app->container('customFields.resources');
+                $categoryDefinitions = $allDefinitions->filterOnly($category->field_cache);
+                return $this->transformer->transformCustomFieldDefinitionSet($context, $categoryDefinitions);
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XFRM\Entity\Category $category */
+        $category = $context->getSource();
+
+        $links = [
+            self::LINK_DETAIL => $this->buildApiLink('resource-categories', $category),
+            self::LINK_PERMALINK => $this->buildPublicLink('resources/categories', $category),
+            self::LINK_RESOURCES => $this->buildApiLink(
+                'resources',
+                null,
+                ['resource_category_id' => $category->resource_category_id]
+            ),
+            self::LINK_RESOURCES_IN_SUB => $this->buildApiLink(
+                'resources',
+                null,
+                ['resource_category_id' => $category->resource_category_id, 'in_sub' => 1]
+            ),
+        ];
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XFRM\Entity\Category $category */
+        $category = $context->getSource();
+
+        $permissions = [
+            self::PERM_ADD => $category->canAddResource(),
+        ];
+
+        $permissions += [
+            self::PERM_ADD_FILE => $permissions[self::PERM_ADD] && $category->allow_local,
+            self::PERM_ADD_URL => $permissions[self::PERM_ADD] && ($category->allow_external || $category->allow_commercial_external),
+            self::PERM_ADD_PRICE => $permissions[self::PERM_ADD] && $category->allow_commercial_external,
+            self::PERM_ADD_FILE_LESS => $permissions[self::PERM_ADD] && $category->allow_fileless,
+        ];
+
+        return $permissions;
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            'description' => self::KEY_DESCRIPTION,
+            'parent_category_id' => self::KEY_PARENT_ID,
+            'resource_category_id' => self::KEY_ID,
+            'resource_count' => self::KEY_RESOURCE_COUNT,
+            'title' => self::KEY_TITLE,
+
+            self::DYNAMIC_KEY_FIELDS,
+        ];
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $visitor = \XF::visitor();
+
+        $finder->with('Permissions|' . $visitor->permission_combination_id);
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/XFRM/Transform/ResourceItem.php b/XFRM/Transform/ResourceItem.php
new file mode 100644
index 00000000..b4fc0b52
--- /dev/null
+++ b/XFRM/Transform/ResourceItem.php
@@ -0,0 +1,356 @@
+<?php
+
+namespace Xfrocks\Api\XFRM\Transform;
+
+use Xfrocks\Api\Transform\AbstractHandler;
+use Xfrocks\Api\Transform\AttachmentParent;
+use Xfrocks\Api\Transform\TransformContext;
+use Xfrocks\Api\Util\ParentFinder;
+
+class ResourceItem extends AbstractHandler implements AttachmentParent
+{
+    const CONTENT_TYPE_RESOURCE_UPDATE = 'resource_update';
+
+    const ATTACHMENT__DYNAMIC_KEY_ID = 'resource_id';
+    const ATTACHMENT__LINK_RESOURCE = 'resource';
+
+    const KEY_CATEGORY_ID = 'resource_category_id';
+    const KEY_CREATOR_USER_ID = 'creator_user_id';
+    const KEY_CREATOR_USERNAME = 'creator_username';
+    const KEY_CREATE_DATE = 'resource_create_date';
+    const KEY_DESCRIPTION = 'resource_description';
+    const KEY_DOWNLOAD_COUNT = 'resource_download_count';
+    const KEY_ID = 'resource_id';
+    const KEY_RATING_COUNT = 'resource_rating_count';
+    const KEY_RATING_SUM = 'resource_rating_sum';
+    const KEY_RATING_AVG = 'resource_rating_avg';
+    const KEY_RATING_WEIGHTED = 'resource_rating_weighted';
+    const KEY_TITLE = 'resource_title';
+    const KEY_UPDATE_DATE = 'resource_update_date';
+
+    const DYNAMIC_KEY_ATTACHMENT_COUNT = 'resource_attachment_count';
+    const DYNAMIC_KEY_CURRENCY = 'resource_currency';
+    const DYNAMIC_KEY_HAS_FILE = 'resource_has_file';
+    const DYNAMIC_KEY_HAS_URL = 'resource_has_url';
+    const DYNAMIC_KEY_IS_DELETED = 'resource_is_deleted';
+    const DYNAMIC_KEY_IS_FOLLOWED = 'resource_is_followed';
+    const DYNAMIC_KEY_IS_LIKED = 'resource_is_liked';
+    const DYNAMIC_KEY_IS_PUBLISHED = 'resource_is_published';
+    const DYNAMIC_KEY_LIKE_COUNT = 'resource_like_count';
+    const DYNAMIC_KEY_PRICE = 'resource_price';
+    const DYNAMIC_KEY_RATING = 'resource_rating';
+    const DYNAMIC_KEY_TAGS = 'resource_tags';
+    const DYNAMIC_KEY_TEXT = 'resource_text';
+    const DYNAMIC_KEY_TEXT_HTML = 'resource_text_html';
+    const DYNAMIC_KEY_TEXT_PLAIN = 'resource_text_plain_text';
+    const DYNAMIC_KEY_VERSION = 'resource_version';
+
+    const LINK_CATEGORY = 'category';
+    const LINK_CONTENT = 'content';
+    const LINK_CREATOR_AVATAR = 'creator_avatar';
+    const LINK_ICON = 'icon';
+    const LINK_RATINGS = 'ratings';
+    const LINK_THREAD = 'thread';
+
+    const PERM_ADD_ICON = 'add_icon';
+    const PERM_DOWNLOAD = 'download';
+    const PERM_RATE = 'rate';
+
+    public function attachmentCalculateDynamicValue(TransformContext $context, $key)
+    {
+        switch ($key) {
+            case self::ATTACHMENT__DYNAMIC_KEY_ID:
+                return $context->getParentSourceValue('resource_id');
+        }
+
+        return null;
+    }
+
+    public function attachmentCollectLinks(TransformContext $context, array &$links)
+    {
+        $resourceItem = $context->getParentSource();
+        $links[self::ATTACHMENT__LINK_RESOURCE] = $this->buildApiLink('resources', $resourceItem);
+    }
+
+    public function attachmentCollectPermissions(TransformContext $context, array &$permissions)
+    {
+        /** @var \XFRM\Entity\ResourceItem $resourceItem */
+        $resourceItem = $context->getParentSource();
+        $canDelete = false;
+
+        $category = $resourceItem->Category;
+        $description = $resourceItem->Description;
+        if ($category !== null
+            && $description !== null
+            && $resourceItem->canEdit()
+            && $category->canUploadAndManageUpdateImages()
+        ) {
+            $canDelete = $this->checkAttachmentCanManage(self::CONTENT_TYPE_RESOURCE_UPDATE, $description);
+        }
+
+        $permissions[self::PERM_DELETE] = $canDelete;
+    }
+
+    public function attachmentGetMappings(TransformContext $context, array &$mappings)
+    {
+        $mappings[] = self::ATTACHMENT__DYNAMIC_KEY_ID;
+    }
+
+    public function calculateDynamicValue(TransformContext $context, $key)
+    {
+        /** @var \XFRM\Entity\ResourceItem $resourceItem */
+        $resourceItem = $context->getSource();
+
+        switch ($key) {
+            case self::DYNAMIC_KEY_ATTACHMENT_COUNT:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $description->attach_count;
+                }
+                break;
+            case self::DYNAMIC_KEY_ATTACHMENTS:
+                $description = $resourceItem->Description;
+                if ($description === null || $description->attach_count < 1) {
+                    return null;
+                }
+
+                return $this->transformer->transformEntityRelation($context, $key, $description, 'Attachments');
+            case self::DYNAMIC_KEY_CURRENCY:
+                return strlen($resourceItem->external_purchase_url) > 0 ? $resourceItem->currency : null;
+            case self::DYNAMIC_KEY_FIELDS:
+                $resourceFields = $resourceItem->custom_fields;
+                return $this->transformer->transformCustomFieldSet($context, $resourceFields);
+            case self::DYNAMIC_KEY_HAS_FILE:
+                return $resourceItem->getResourceTypeDetailed() === 'download_local';
+            case self::DYNAMIC_KEY_HAS_URL:
+                if (strlen($resourceItem->external_purchase_url) > 0) {
+                    return true;
+                }
+
+                if ($resourceItem->getResourceTypeDetailed() === 'download_external') {
+                    $version = $resourceItem->CurrentVersion;
+                    if ($version !== null) {
+                        return $version->download_url;
+                    }
+                }
+
+                return false;
+            case self::DYNAMIC_KEY_IS_DELETED:
+                return $resourceItem->resource_state === 'deleted';
+            case self::DYNAMIC_KEY_IS_FOLLOWED:
+                $userId = \XF::visitor()->user_id;
+                if ($userId < 1) {
+                    return false;
+                }
+
+                return isset($resourceItem->Watch[$userId]);
+            case self::DYNAMIC_KEY_IS_LIKED:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $description->isReactedTo();
+                }
+                break;
+            case self::DYNAMIC_KEY_IS_PUBLISHED:
+                return $resourceItem->resource_state === 'visible';
+            case self::DYNAMIC_KEY_LIKE_COUNT:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $description->reaction_score;
+                }
+                break;
+            case self::DYNAMIC_KEY_PRICE:
+                return strlen($resourceItem->external_purchase_url) > 0 ? $resourceItem->price : null;
+            case self::DYNAMIC_KEY_RATING:
+                $count = $resourceItem->rating_count;
+                if ($count == 0) {
+                    return 0;
+                }
+
+                $average = $resourceItem->rating_sum / $count;
+                $average = round($average / 0.5, 0) * 0.5;
+
+                return $average;
+            case self::DYNAMIC_KEY_TAGS:
+                return $this->transformer->transformTags($context, $resourceItem->tags);
+            case self::DYNAMIC_KEY_TEXT:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $description->message;
+                }
+                break;
+            case self::DYNAMIC_KEY_TEXT_HTML:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $this->renderBbCodeHtml($key, $description->message, $description);
+                }
+                break;
+            case self::DYNAMIC_KEY_TEXT_PLAIN:
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    return $this->renderBbCodePlainText($description->message);
+                }
+                break;
+            case self::DYNAMIC_KEY_VERSION:
+                $version = $resourceItem->CurrentVersion;
+                if ($version !== null) {
+                    return $version->version_string;
+                }
+                break;
+        }
+
+        return null;
+    }
+
+    public function collectLinks(TransformContext $context)
+    {
+        /** @var \XFRM\Entity\ResourceItem $resourceItem */
+        $resourceItem = $context->getSource();
+        $user = $resourceItem->User;
+
+        $links = [
+            self::LINK_ATTACHMENTS => $this->buildApiLink('resources/attachments', $resourceItem),
+            self::LINK_CATEGORY => $this->buildApiLink('resource-categories', $resourceItem->Category),
+            self::LINK_CREATOR_AVATAR => $user !== null ? $user->getAvatarUrl('l') : null,
+            self::LINK_DETAIL => $this->buildApiLink('resources', $resourceItem),
+            self::LINK_FOLLOWERS => $this->buildApiLink('resources/followers', $resourceItem),
+            self::LINK_ICON => $resourceItem->getIconUrl(),
+            self::LINK_LIKES => $this->buildApiLink('resources/likes', $resourceItem),
+            self::LINK_PERMALINK => $this->buildPublicLink('resources', $resourceItem),
+            self::LINK_RATINGS => $this->buildApiLink('resources/ratings', $resourceItem),
+            self::LINK_REPORT => $this->buildApiLink('resources/report', $resourceItem),
+        ];
+
+        if (strlen($resourceItem->external_purchase_url) > 0) {
+            $links[self::LINK_CONTENT] = $resourceItem->external_purchase_url;
+        } else {
+            $resourceTypeDetailed = $resourceItem->getResourceTypeDetailed();
+            switch ($resourceTypeDetailed) {
+                case 'download_external':
+                    $version = $resourceItem->CurrentVersion;
+                    if ($version !== null) {
+                        $links[self::LINK_CONTENT] = $version->download_url;
+                    }
+                    break;
+                case 'download_local':
+                    $links[self::LINK_CONTENT] = $this->buildApiLink('resources/files', $resourceItem);
+                    break;
+            }
+        }
+
+        if ($resourceItem->discussion_thread_id > 0) {
+            $links[self::LINK_THREAD] = $this->buildApiLink(
+                'threads',
+                ['thread_id' => $resourceItem->discussion_thread_id]
+            );
+        }
+
+        return $links;
+    }
+
+    public function collectPermissions(TransformContext $context)
+    {
+        /** @var \XFRM\Entity\ResourceItem $resourceItem */
+        $resourceItem = $context->getSource();
+        $description = $resourceItem->Description;
+
+        return [
+            self::PERM_ADD_ICON => $resourceItem->canEdit(),
+            self::PERM_DELETE => $resourceItem->canDelete(),
+            self::PERM_DOWNLOAD => $resourceItem->canDownload(),
+            self::PERM_EDIT => $resourceItem->canEdit(),
+            self::PERM_FOLLOW => $resourceItem->canWatch(),
+            self::PERM_LIKE => $description !== null ? $description->canReact() : null,
+            self::PERM_RATE => $resourceItem->canRate(),
+            self::PERM_REPORT => $description !== null ? $description->canReport() : null,
+        ];
+    }
+
+    public function getMappings(TransformContext $context)
+    {
+        return [
+            // xf_rm_resource
+            'download_count' => self::KEY_DOWNLOAD_COUNT,
+            'last_update' => self::KEY_UPDATE_DATE,
+            'rating_count' => self::KEY_RATING_COUNT,
+            'rating_sum' => self::KEY_RATING_SUM,
+            'rating_avg' => self::KEY_RATING_AVG,
+            'rating_weighted' => self::KEY_RATING_WEIGHTED,
+            'resource_category_id' => self::KEY_CATEGORY_ID,
+            'resource_date' => self::KEY_CREATE_DATE,
+            'resource_id' => self::KEY_ID,
+            'tag_line' => self::KEY_DESCRIPTION,
+            'title' => self::KEY_TITLE,
+            'user_id' => self::KEY_CREATOR_USER_ID,
+            'username' => self::KEY_CREATOR_USERNAME,
+
+            self::DYNAMIC_KEY_ATTACHMENT_COUNT,
+            self::DYNAMIC_KEY_ATTACHMENTS,
+            self::DYNAMIC_KEY_CURRENCY,
+            self::DYNAMIC_KEY_FIELDS,
+            self::DYNAMIC_KEY_HAS_FILE,
+            self::DYNAMIC_KEY_HAS_URL,
+            self::DYNAMIC_KEY_IS_DELETED,
+            self::DYNAMIC_KEY_IS_FOLLOWED,
+            self::DYNAMIC_KEY_IS_LIKED,
+            self::DYNAMIC_KEY_IS_PUBLISHED,
+            self::DYNAMIC_KEY_LIKE_COUNT,
+            self::DYNAMIC_KEY_PRICE,
+            self::DYNAMIC_KEY_RATING,
+            self::DYNAMIC_KEY_TAGS,
+            self::DYNAMIC_KEY_TEXT,
+            self::DYNAMIC_KEY_TEXT_HTML,
+            self::DYNAMIC_KEY_TEXT_PLAIN,
+            self::DYNAMIC_KEY_VERSION,
+        ];
+    }
+
+    public function onTransformEntities(TransformContext $context, $entities)
+    {
+        $needAttachments = false;
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_ATTACHMENTS)) {
+            $needAttachments = true;
+        }
+        if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_TEXT_HTML)) {
+            $needAttachments = true;
+        }
+        if ($needAttachments) {
+            $descriptions = [];
+            /** @var \XFRM\Entity\ResourceItem $resourceItem */
+            foreach ($entities as $resourceItem) {
+                $description = $resourceItem->Description;
+                if ($description !== null) {
+                    $descriptions[$description->resource_update_id] = $description;
+                }
+            }
+
+            $this->enqueueEntitiesToAddAttachmentsTo($descriptions, self::CONTENT_TYPE_RESOURCE_UPDATE);
+        }
+
+        return $entities;
+    }
+
+    public function onTransformFinder(TransformContext $context, \XF\Mvc\Entity\Finder $finder)
+    {
+        $categoryFinder = new ParentFinder($finder, 'Category');
+        $visitor = \XF::visitor();
+
+        $categoryFinder->with('Permissions|' . $visitor->permission_combination_id);
+
+        $finder->with('CurrentVersion');
+        $finder->with('Description');
+        $finder->with('User');
+
+        $userId = $visitor->user_id;
+        if ($userId > 0) {
+            if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_IS_FOLLOWED)) {
+                $finder->with('Watch|' . $userId);
+            }
+
+            if (!$context->selectorShouldExcludeField(self::DYNAMIC_KEY_IS_LIKED)) {
+                $finder->with('Description.Reactions|' . $userId);
+            }
+        }
+
+        return parent::onTransformFinder($context, $finder);
+    }
+}
diff --git a/xenforo/api/bootstrap.php b/_files/api/bootstrap.php
similarity index 55%
rename from xenforo/api/bootstrap.php
rename to _files/api/bootstrap.php
index b03d1cb1..0496e555 100644
--- a/xenforo/api/bootstrap.php
+++ b/_files/api/bootstrap.php
@@ -1,7 +1,5 @@
 <?php
 
-$startTime = microtime(true);
-
 // we have to figure out XenForo path
 // dirname(dirname(__FILE__)) should work most of the time
 // as it was the way XenForo's index.php does
@@ -9,14 +7,14 @@
 // so we have to be creative
 $parentOfDirOfFile = dirname(dirname(__FILE__));
 $scriptFilename = (isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : '');
-$pathToCheck = '/library/XenForo/Autoloader.php';
+$pathToXfPhp = '/src/XF.php';
 $fileDir = false;
-if (file_exists($parentOfDirOfFile . $pathToCheck)) {
+if (file_exists($parentOfDirOfFile . $pathToXfPhp)) {
     $fileDir = $parentOfDirOfFile;
 }
-if ($fileDir === false AND !empty($scriptFilename)) {
+if ($fileDir === false && $scriptFilename !== '') {
     $parentOfDirOfScriptFilename = dirname(dirname($scriptFilename));
-    if (file_exists($parentOfDirOfScriptFilename . $pathToCheck)) {
+    if (file_exists($parentOfDirOfScriptFilename . $pathToXfPhp)) {
         $fileDir = $parentOfDirOfScriptFilename;
     }
 }
@@ -24,8 +22,6 @@
     die('XenForo path could not be figured out...');
 }
 
-require($fileDir . '/library/XenForo/Autoloader.php');
-XenForo_Autoloader::getInstance()->setupAutoloader($fileDir . '/library');
-
-XenForo_Application::initialize($fileDir . '/library', $fileDir);
-XenForo_Application::set('page_start_time', $startTime);
+/** @noinspection PhpIncludeInspection */
+require($fileDir . $pathToXfPhp);
+XF::start($fileDir);
diff --git a/_files/api/index.php b/_files/api/index.php
new file mode 100644
index 00000000..5c763710
--- /dev/null
+++ b/_files/api/index.php
@@ -0,0 +1,4 @@
+<?php
+
+require(__DIR__ . '/bootstrap.php');
+XF::runApp('Xfrocks\Api\App');
diff --git a/_files/dev/PHPStan/Reflection/PropertiesClassReflectionExtension.php b/_files/dev/PHPStan/Reflection/PropertiesClassReflectionExtension.php
new file mode 100644
index 00000000..97aa9272
--- /dev/null
+++ b/_files/dev/PHPStan/Reflection/PropertiesClassReflectionExtension.php
@@ -0,0 +1,71 @@
+<?php
+
+// phpcs:disable PHPCompatibility.FunctionDeclarations.NewParamTypeDeclarations.boolFound
+// phpcs:disable PHPCompatibility.FunctionDeclarations.NewParamTypeDeclarations.stringFound
+// phpcs:disable PHPCompatibility.FunctionDeclarations.NewReturnTypeDeclarations.boolFound
+// phpcs:disable PHPCompatibility.FunctionDeclarations.NewReturnTypeDeclarations.class_nameFound
+
+namespace dev\PHPStan\Reflection;
+
+use DevHelper\PHPStan\Reflection\EntityColumnReflection;
+use DevHelper\PHPStan\Reflection\EntityGetterReflection;
+use DevHelper\PHPStan\Reflection\EntityRelationReflection;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\PropertyReflection;
+use XF\Mvc\Entity\Entity;
+
+class PropertiesClassReflectionExtension implements \PHPStan\Reflection\PropertiesClassReflectionExtension
+{
+    /**
+     * @var array
+     */
+    private $map = [
+        'XF\Entity\AbstractNode' => [
+            'node_id' => ['column', 'type' => Entity::UINT],
+            'Node' => ['relation', 'type' => Entity::TO_ONE, 'entity' => 'XF:Node'],
+        ],
+        'Xfrocks\Api\Entity\TokenWithScope' => [
+            'scope' => ['column', 'type' => Entity::STR],
+            'scopes' => ['getter', 'methodName' => 'getScopes'],
+        ],
+    ];
+
+    public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
+    {
+        $className = $classReflection->getName();
+        if (!isset($this->map[$className])) {
+            return false;
+        }
+
+        $classMap = $this->map[$className];
+        if (!isset($classMap[$propertyName])) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
+    {
+        $mapEntry = $this->map[$classReflection->getName()][$propertyName];
+
+        switch ($mapEntry[0]) {
+            case 'column':
+                return new EntityColumnReflection($classReflection, $mapEntry['type']);
+            case 'getter':
+                if ($classReflection->hasNativeMethod($mapEntry['methodName'])) {
+                    $method = $classReflection->getNativeMethod($mapEntry['methodName']);
+                    return new EntityGetterReflection(
+                        $classReflection,
+                        $method->getVariants()[0]->getReturnType(),
+                        false
+                    );
+                }
+                break;
+            case 'relation':
+                return new EntityRelationReflection($classReflection, $mapEntry['type'], $mapEntry['entity']);
+        }
+
+        throw new \PHPStan\ShouldNotHappenException();
+    }
+}
diff --git a/_files/dev/autogen.json b/_files/dev/autogen.json
new file mode 100644
index 00000000..2af36d95
--- /dev/null
+++ b/_files/dev/autogen.json
@@ -0,0 +1,6 @@
+{
+    "Admin/Controller/Entity.php": 2020052301,
+    "DevHelper\\Cli\\Command\\AutoGen": {
+        "version_id": 2019041201
+    }
+}
\ No newline at end of file
diff --git a/_files/dev/config.json b/_files/dev/config.json
new file mode 100644
index 00000000..c13e373f
--- /dev/null
+++ b/_files/dev/config.json
@@ -0,0 +1,5 @@
+{
+  "addon_ids_auto_enable": [
+    "XFRM"
+  ]
+}
diff --git a/_files/dev/phpstan.neon b/_files/dev/phpstan.neon
new file mode 100644
index 00000000..028430f1
--- /dev/null
+++ b/_files/dev/phpstan.neon
@@ -0,0 +1,11 @@
+includes:
+	- /var/www/html/src/addons/DevHelper/PHPStan/phpstan.neon
+
+parameters:
+    checkGenericClassInNonGenericObjectType: false
+
+services:
+	-
+		class: dev\PHPStan\Reflection\PropertiesClassReflectionExtension
+		tags:
+			- phpstan.broker.propertiesClassReflectionExtension
diff --git a/_files/dev/phpstan.php b/_files/dev/phpstan.php
new file mode 100644
index 00000000..b2b1989e
--- /dev/null
+++ b/_files/dev/phpstan.php
@@ -0,0 +1,15 @@
+<?php
+
+$appClass = 'Xfrocks\Api\App';
+
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require(dirname(__DIR__) . '/tests/autoload.php');
+
+$loader->addPsr4('dev\PHPStan\\', __DIR__ . '/PHPStan');
+
+$extensionHintManualPath = realpath(__DIR__ . '/../../_output/extension_hint_manual.php');
+$loader->addClassMap([
+    'Xfrocks\Api\XFRM\Data\XFCP_Modules' => $extensionHintManualPath,
+]);
+
+return $loader;
diff --git a/docs/api.markdown b/_files/docs/api.markdown
similarity index 90%
rename from docs/api.markdown
rename to _files/docs/api.markdown
index a09a2c5f..7d84acb3 100755
--- a/docs/api.markdown
+++ b/_files/docs/api.markdown
@@ -572,6 +572,7 @@ Parameters:
  * `post_body` (__required__): content of the new thread.
  * `thread_prefix_id` (_optional_): id of a prefix for the new thread. Since forum-2016031001.
  * `thread_tags` (_optional_): thread tags for the new thread. Since forum-2015091002.
+ * `fields` (_optional_): thread fields for the new thread. Since forum-2018073000
 
 Required scopes:
 
@@ -1061,6 +1062,7 @@ Parameters:
  * `thread_title` (_optional_, since forum-2014052203): new title of the thread (only used if the post is the first post in the thread and the authenticated user can edit thread).
  * `thread_prefix_id` (_optional_, since forum-2016031001): new id of the thread's prefix (only used if the post is the first post in the thread and the authenticated user can edit thread).
  * `thread_tags` (_optional_, since forum-2015091101): new tags of the thread (only used if the post is the first post in the thread and the authenticated user can edit thread tags).
+* `fields` (_optional_, since forum-2018082101): new fields of the thread (only used if the post is the first post in the thread)
 
 Required scopes:
 
@@ -1537,6 +1539,17 @@ Required scopes:
 
  * `post`
 
+### GET `/users/:userId/default-avatar`
+Default avatar (binary) of a user. Since forum-2018082301.
+
+Parameters:
+
+ * N/A
+
+Required scopes:
+
+ * `read`
+
 ### GET `/users/:userId/followers`
 List of a user's followers
 
@@ -1664,6 +1677,24 @@ Required scopes:
 
   * `post`
 
+### POST `/users/:userId/report`
+Report an user. Since forum-2018092501
+```
+{
+    status: "ok",
+    message: "Changes Saved"
+}
+```
+
+
+ Parameters:
+
+  * `message` (__required__): reason of the report
+
+ Required scopes:
+
+  * `post`
+  
 ### GET `/users/groups`
 List of all user groups. Since forum-2014092301.
 
@@ -2253,6 +2284,7 @@ Detail information of a message.
             creator_username: (string),
             user_is_ignored: (boolean), # since forum-2015072304
             message_create_date: (unix timestamp in seconds),
+            message_is_liked: (boolean), # since forum-2018112900
             message_body: (string),
             message_body_html: (string),
             message_body_plain_text: (string),
@@ -2292,7 +2324,8 @@ Detail information of a message.
                 delete: (boolean),
                 reply: (boolean),
                 upload_attachment: (boolean), # since forum-2014081801
-                report: (uri) # since forum-2015081101
+                report: (uri) # since forum-2015081101,
+                like: (boolean) # since forum-2018112900
             }
         }
     }
@@ -2392,6 +2425,65 @@ Required scopes:
 
  * `post`
 
+### GET `/conversation-messages/:messageId/likes`
+Get all likes of message. Since forum-2018112900
+
+```
+{
+    users: [
+        {
+            user_id: (int),
+            username: (string)
+        },
+        ...
+    ]
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `read`
+
+### POST `/conversation-messages/:messageId/likes`
+Like a message
+```
+{
+    status: "ok",
+    message: "Changes Saved"
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `post`
+
+### DELETE `/conversation-messages/:messageId/likes`
+Unlike a message
+
+```
+{
+    status: "ok",
+    message: "Changes Saved"
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `post`
+
+
 ## Notifications
 
 ### GET `/notifications`
@@ -2565,6 +2657,316 @@ Required scopes:
 
  * `read`
 
+## XenForo Resource Manager
+
+### GET `/resource-categories`
+Get all resource categories
+
+```
+{
+    categories: [
+        (category),
+        ...
+    ]
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `read`
+
+### GET `/resource-categories/:categoryId`
+Get resource category detail
+
+```
+{
+    category: {
+        resource_category_id: (int),
+        category_description: (string),
+        parent_category_id: (int),
+        category_resource_count: (int),
+        category_title: (string),
+        fields: [
+            {
+                id: (string),
+                title: (string),
+                description: (string),
+                display_group: (string),
+                position: (string),
+                choices: [
+                    {
+                        key: (string),
+                        value: (string),
+                    },
+                    ...
+                ],
+                is_multiple_choice: (boolean),
+                is_required: (boolean),
+            },
+            ...
+        ],
+        links: {
+            resources: (uri),
+            resources_in_sub: (uri),
+            detail: (uri),
+            permalink: (uri)
+        },
+        permissions: {
+            add: (bool),
+            add_file: (bool),
+            add_url: (bool),
+            add_price: (bool),
+            add_no_file_or_url: (bool)
+        }
+    }
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `read`
+
+### GET `/resources`
+Get resources
+
+```
+{
+    resources: [
+        (resource),
+        ...
+    ],
+    resource_total: (int),
+    links: {
+        pages: (int),
+        next: (uri),
+        prev: (uri)
+    }
+}
+```
+
+Parameters:
+
+* `resource_category_id` (_optional_): Get resources in category
+* `resource_category_ids` (_optional_): Get resources in categories. Each category ID separate by comma (,)
+* `in_sub` (_optional_): flag to include sub categories in filtering 
+* `page` (_optional_): page number of resources.
+* `limit` (_optional_): number of resources in a page. Default value depends on the system configuration.
+* `order` (_optional_): Support `resource_create_date`, `resource_create_date_reverse`, `resource_update_date`,
+`resource_update_date_reverse`, `resource_download_count`, `resource_download_count_reverse`, `resource_rating_weighted`, `resource_rating_weighted_reverse`
+* `resource_update_date` (_optional_): timestamp to filter
+* `resource_ids` (_optional_): resource ids to fetch (ignoring all filters, separated by comma)
+
+Required scopes:
+
+* `read`
+
+### GET `/resources/:resourceId`
+Get resource detail
+
+```
+{
+    resource: {
+        resource_category_id: (int),
+        creator_user_id: (int),
+        creator_username: (string),
+        resource_create_date: (int),
+        resource_description: (string),
+        resource_download_count: (int),
+        resource_id: (int),
+        resource_rating_count: (int),
+        resource_rating_sum: (int),
+        resource_rating_avg: (float),
+        resource_rating_weighted: (float),
+        resource_title: (string),
+        resource_update_date: (int),
+        resource_attachment_count: (int),
+        resource_currency: (string),
+        resource_has_file: (bool),
+        resource_has_url: (bool),
+        resource_is_deleted: (bool),
+        resource_is_followed: (bool),
+        resource_is_liked: (bool),
+        resource_is_published: (bool),
+        resource_like_count: (int),
+        resource_price: (float),
+        resource_rating: (int),
+        resource_tags: (array),
+        resource_text: (string),
+        resource_text_html: (string),
+        resource_text_plain_text: (string),
+        resource_version: (string),
+        fields: [
+            {
+                id: (string),
+                title: (string),
+                description: (string),
+                display_group: (string),
+                position: (string),
+                choices: [
+                    {
+                        key: (string),
+                        value: (string),
+                    },
+                    ...
+                ],
+                is_multiple_choice: (boolean),
+                is_required: (boolean),
+                value: (string),
+                values: [
+                    {
+                        key: (string),
+                        value: (string),
+                    },
+                    ...
+                ]
+            },
+            ...
+        ],
+        attachments: [
+            {
+                attachment_id: (int),
+                attachment_download_count: (int),
+                filename: (string),
+                attachment_is_inserted: (boolean),
+                links: {
+                    permalink: (uri),
+                    data: (uri),
+                    thumbnail: (uri)
+                },
+                permissions: {
+                    view: (boolean),
+                    delete: (boolean)
+                }
+            },
+            ...
+        ],
+        links: {
+            attachments: (uri),
+            detail: (uri),
+            followers: (uri),
+            likes: (uri),
+            permalink: (uri),
+            report: (uri),
+            category: (uri),
+            content: (uri),
+            creator_avatar: (uri),
+            icon: (uri),
+            ratings: (uri),
+            thread: (uri)
+        },
+        permissions: {
+            add_icon: (bool),
+            download: (bool),
+            rate: (bool),
+            delete: (bool),
+            edit: (bool),
+            follow: (bool),
+            like: (bool),
+            report: (bool),
+            view: (bool)
+        }
+    }
+}
+```
+
+Required scopes:
+
+* `read`
+
+### GET `/resources/:resourceId/followers`
+Get users following resource
+
+```
+{
+    users: [
+        {
+            user_id: (int),
+            username: (string),
+            follow: {
+                alert: (bool),
+                email: (bool)
+            }
+        },
+        ...    
+    ]
+}
+```
+
+Required scopes:
+
+* `read`
+
+
+### POST `/resources/:resourceId/followers`
+
+```
+{
+    status: "ok",
+    message: "Changes Saved"    
+}
+```
+
+Parameters:
+
+* `email` (_optional_): whether to receive notification as email
+
+Required scopes:
+
+* `post`
+
+### DELETE `/resources/:resourceId/followers`
+Remove follower record
+
+```
+{
+    status: "ok",
+    message: "Changes Saved"    
+}
+```
+
+Parameters:
+
+* N/A
+
+Required scopes:
+
+* `delete`
+
+
+### GET `/resources/followed`
+Get resources visitor following
+
+```
+{
+    resources: [
+        (resource),
+        ...
+    ],
+    resource_total: (int),
+    links: {
+        pages: (int),
+        next: (uri),
+        prev: (uri)
+    }
+}
+```
+
+Parameters:
+
+* `total` (_optional_): Determine to get `resource_total` only
+
+Required scopes:
+
+* `read`
+
 ## Batch requests
 
 ### POST `/batch`
diff --git a/_files/docs/config.markdown b/_files/docs/config.markdown
new file mode 100644
index 00000000..34ae0ea2
--- /dev/null
+++ b/_files/docs/config.markdown
@@ -0,0 +1,18 @@
+# Configuration Documents
+
+## config.php
+
+It's possible to reconfigure some internal api values by adding something like this into `config.php`:
+
+```php
+$config['api'] = [
+  'configKey' => 'configValue',
+  'configKey2' => 'someValue',
+  ...
+];
+```
+
+ * `accessTokenParamKey` default=`oauth_token`
+ * `apiDirName` default=`api`
+ * `routerType` default=`XfrocksApi`
+ * `scopeDelimiter` default=` ` (space)
diff --git a/_files/js/Xfrocks/Api/sdk.js b/_files/js/Xfrocks/Api/sdk.js
new file mode 100644
index 00000000..82fc3d05
--- /dev/null
+++ b/_files/js/Xfrocks/Api/sdk.js
@@ -0,0 +1,100 @@
+/* global jQuery */
+/* jshint -W030 */
+// noinspection ThisExpressionReferencesGlobalObjectJS
+!function ($, window, document, _undefined) {
+    'use strict';
+
+    window['{prefix}SDK'] = {};
+
+    var dataUri = '{data_uri}',
+        requestBaseUri = '{request_uri}',
+        SDK = window['{prefix}SDK'],
+        SDK_options = {'client_id': ''};
+
+    $.extend(
+        true,
+        SDK,
+        {
+            init: function (options) {
+                $.extend(true, SDK_options, options);
+            },
+
+            isAuthorized: function (scope, callback) {
+                // callback = function(isAuthorized, apiData) {};
+                $.ajax({
+                    data: {
+                        'cmd': 'authorized',
+                        'client_id': SDK_options.client_id,
+                        'scope': scope
+                    },
+                    dataType: 'jsonp',
+                    global: false,
+                    success: function (data) {
+                        if (typeof callback !== 'function') {
+                            return;
+                        }
+
+                        // noinspection JSUnresolvedVariable
+                        if (data.authorized !== _undefined && data.authorized === 1) {
+                            callback(true, data);
+                        } else {
+                            callback(false, null);
+                        }
+                    },
+                    url: dataUri
+                });
+            },
+
+            request: function (route, callback, accessToken, method, data) {
+                // callback = function(apiData) {};
+                var uri = requestBaseUri + '?' + route + '&_xfResponseType=jsonp';
+
+                var ajaxOptions = {
+                    dataType: 'jsonp',
+                    success: function (data) {
+                        if (typeof callback !== 'function') {
+                            return;
+                        }
+
+                        callback(data);
+                    }
+                };
+
+                if (method !== _undefined) {
+                    ajaxOptions.type = method;
+                } else {
+                    ajaxOptions.type = 'GET';
+                }
+
+                if (accessToken !== _undefined) {
+                    if (ajaxOptions.type === 'GET') {
+                        uri += '&oauth_token=' + accessToken;
+                    } else {
+                        if (data !== _undefined) {
+                            data.oauth_token = accessToken;
+                        } else {
+                            data = {
+                                oauth_token: accessToken
+                            };
+                        }
+                    }
+                }
+
+                if (data !== _undefined) {
+                    ajaxOptions.data = data;
+                }
+
+                $.ajax(
+                    uri,
+                    ajaxOptions
+                );
+            }
+        }
+    );
+
+    $(document).ready(function () {
+        if (typeof window['{prefix}Init'] === 'function') {
+            window['{prefix}Init']();
+        }
+    });
+}(jQuery, this, document);
\ No newline at end of file
diff --git a/_files/tests/.gitignore b/_files/tests/.gitignore
new file mode 100644
index 00000000..57872d0f
--- /dev/null
+++ b/_files/tests/.gitignore
@@ -0,0 +1 @@
+/vendor/
diff --git a/_files/tests/api/IndexTest.php b/_files/tests/api/IndexTest.php
new file mode 100644
index 00000000..89bfa98c
--- /dev/null
+++ b/_files/tests/api/IndexTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class IndexTest extends ApiTestCase
+{
+    /**
+     * @return void
+     */
+    public function testReturns200()
+    {
+        $response = static::httpRequest('GET', 'index');
+        static::assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     * @return void
+     */
+    public function testReturnsData()
+    {
+        $json = static::httpRequestJson('GET', 'index');
+        static::assertArrayHasKey('links', $json, 'json has links');
+
+        static::assertArrayHasKey('system_info', $json);
+        $systemInfo = $json['system_info'];
+        static::assertArrayHasKey('oauth/authorize', $systemInfo);
+        static::assertArrayHasKey('oauth/token', $systemInfo);
+    }
+}
diff --git a/_files/tests/api/OAuthTest.php b/_files/tests/api/OAuthTest.php
new file mode 100644
index 00000000..5ad6e3e8
--- /dev/null
+++ b/_files/tests/api/OAuthTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace tests\api;
+
+use Base32\Base32;
+use Otp\Otp;
+use tests\bases\ApiTestCase;
+
+class OAuthTest extends ApiTestCase
+{
+    /**
+     * @return void
+     */
+    public function testGrantTypePassword()
+    {
+        $client = static::dataApiClient();
+        $user = static::dataUser();
+        $json = static::postPassword($client, $user);
+
+        static::assertArrayHasKey('access_token', $json);
+        static::assertArrayHasKey('expires_in', $json);
+        static::assertArrayHasKey('scope', $json);
+
+        static::assertEquals($user['user_id'], $json['user_id']);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGrantTypeRefreshToken()
+    {
+        $client = static::dataApiClient();
+        $user = static::dataUser();
+        $passwordJson = static::postPassword($client, $user);
+        static::assertArrayHasKey('refresh_token', $passwordJson);
+
+        $json = static::postOauthToken([
+            'grant_type' => 'refresh_token',
+            'client_id' => $client['client_id'],
+            'client_secret' => $client['client_secret'],
+            'refresh_token' => $passwordJson['refresh_token']
+        ]);
+
+        static::assertArrayHasKey('access_token', $json);
+        static::assertArrayHasKey('refresh_token', $json);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGrantTypePasswordWithTfa()
+    {
+        $client = static::dataApiClient();
+        $user = static::dataUser(4);
+
+        $oAuthParams = [
+            'grant_type' => 'password',
+            'client_id' => $client['client_id'],
+            'client_secret' => $client['client_secret'],
+            'username' => $user['username'],
+            'password' => $user['password']
+        ];
+
+        static::httpRequestJson('POST', 'oauth/token', [
+            'form_params' => $oAuthParams
+        ], false);
+
+        $response = static::httpLatestResponse();
+        static::assertEquals('202', strval($response->getStatusCode()), '202');
+
+        static::assertNotEmpty($response->getHeader('X-Api-Tfa-Providers'));
+
+        $oAuthParams['tfa_provider'] = 'totp';
+
+        $otp = new Otp();
+        $oAuthParams['code'] = $otp->totp(Base32::decode($user['tfa_secret']));
+
+        $json = static::postOauthToken($oAuthParams);
+
+        static::assertArrayHasKey('access_token', $json);
+        static::assertArrayHasKey('expires_in', $json);
+        static::assertArrayHasKey('scope', $json);
+
+        static::assertEquals($user['user_id'], $json['user_id']);
+    }
+}
diff --git a/_files/tests/api/PostLikeTest.php b/_files/tests/api/PostLikeTest.php
new file mode 100644
index 00000000..39419e64
--- /dev/null
+++ b/_files/tests/api/PostLikeTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class PostLikeTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessToken = '';
+
+    /**
+     * @var array
+     */
+    private static $user = [];
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        static::$user = static::dataUser(1);
+
+        $token = static::postPassword(static::dataApiClient(), static::$user);
+        static::$accessToken = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostLikes()
+    {
+        $post = static::dataPost();
+
+        $json = static::httpRequestJson(
+            'POST',
+            sprintf('posts/%d/likes', $post['post_id']),
+            [
+                'form_params' => [
+                    'oauth_token' => static::$accessToken,
+                ]
+            ]
+        );
+
+        $status = static::assertArrayHasKeyPath($json, 'status');
+        static::assertEquals('ok', $status);
+
+        $likes = static::httpRequestJson(
+            'GET',
+            sprintf('posts/%d/likes?oauth_token=%s', $post['post_id'], static::$accessToken)
+        );
+        $likedUserId = static::assertArrayHasKeyPath($likes, 'users', 0, 'user_id');
+        static::assertEquals(static::$user['user_id'], $likedUserId);
+    }
+
+    /**
+     * @return void
+     */
+    public function testDeleteLikes()
+    {
+        $post = static::dataPost();
+
+        $json = static::httpRequestJson(
+            'DELETE',
+            sprintf('posts/%d/likes', $post['post_id']),
+            [
+                'form_params' => [
+                    'oauth_token' => static::$accessToken,
+                ]
+            ]
+        );
+
+        $status = static::assertArrayHasKeyPath($json, 'status');
+        static::assertEquals('ok', $status);
+
+        $likes = static::httpRequestJson(
+            'GET',
+            sprintf('posts/%d/likes?oauth_token=%s', $post['post_id'], static::$accessToken)
+        );
+        $likedUsers = static::assertArrayHasKeyPath($likes, 'users');
+        static::assertEquals(0, count($likedUsers));
+    }
+}
diff --git a/_files/tests/api/PostTest.php b/_files/tests/api/PostTest.php
new file mode 100644
index 00000000..5e585148
--- /dev/null
+++ b/_files/tests/api/PostTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class PostTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessToken = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUser());
+        static::$accessToken = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetIndex()
+    {
+        $thread = static::dataThread();
+
+        $jsonPosts = static::httpRequestJson(
+            'GET',
+            "posts?thread_id={$thread['thread_id']}&oauth_token=" . static::$accessToken
+        );
+        static::assertArrayHasKey('posts', $jsonPosts);
+
+        $post = static::dataPost();
+        $excludeFields = [
+            '',
+            'signature',
+            'signature_html',
+            'signature_plain_text'
+        ];
+
+        foreach ($excludeFields as $excludeField) {
+            $jsonPost = static::httpRequestJson(
+                'GET',
+                "posts/{$post['post_id']}?exclude_field={$excludeField}&oauth_token=" . static::$accessToken
+            );
+
+            static::assertArrayHasKey('post', $jsonPost);
+            if ($excludeField !== '') {
+                static::assertArrayNotHasKey($excludeField, $jsonPost);
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostIndex()
+    {
+        $thread = static::dataThread();
+
+        $json = static::httpRequestJson(
+            'POST',
+            'posts',
+            [
+                'form_params' => [
+                    'oauth_token' => static::$accessToken,
+                    'thread_id' => $thread['thread_id'],
+                    'post_body' => str_repeat(__METHOD__ . ' ', 10)
+                ]
+            ]
+        );
+
+        static::assertArrayHasKey('post', $json);
+    }
+
+    /**
+     * @return void
+     */
+    public function testPutIndex()
+    {
+        $post = static::dataPost();
+
+        $json = static::httpRequestJson(
+            'PUT',
+            'posts/' . $post['post_id'],
+            [
+                'form_params' => [
+                    'oauth_token' => static::$accessToken,
+                    'post_body' => str_repeat(__METHOD__ . ' ', 10)
+                ]
+            ]
+        );
+
+        $jsonPostId = static::assertArrayHasKeyPath($json, 'post', 'post_id');
+        static::assertEquals($post['post_id'], $jsonPostId);
+    }
+}
diff --git a/_files/tests/api/SubscriptionTest.php b/_files/tests/api/SubscriptionTest.php
new file mode 100644
index 00000000..e30c83eb
--- /dev/null
+++ b/_files/tests/api/SubscriptionTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class SubscriptionTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessToken = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUser());
+        static::$accessToken = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testSubscribeSuccess()
+    {
+        $hubCallback = static::$apiRoot . 'index.php?tools/websub/echo-hub-challenge';
+        $this->postSubscriptions($hubCallback);
+
+        static::assertEquals(202, static::httpLatestResponse()->getStatusCode());
+
+        $notificationsPath = 'notifications?oauth_token=' . static::$accessToken;
+        $notificationsJson1 = static::httpRequestJson('GET', $notificationsPath);
+        static::assertArrayHasKey('subscription_callback', $notificationsJson1);
+
+        $response = static::httpLatestResponse();
+        $links = $response->getHeader('Link');
+
+        $hrefs = [];
+        foreach ($links as $link) {
+            if (preg_match('#^<(.+)>; rel=(\w+)$#', $link, $matches) === false) {
+                continue;
+            }
+            $hrefs[$matches[2]] = $matches[1];
+        }
+        static::assertArrayHasKey('hub', $hrefs);
+        static::assertArrayHasKey('self', $hrefs);
+
+        $this->postSubscriptions($hubCallback, 'unsubscribe');
+        static::assertEquals(202, static::httpLatestResponse()->getStatusCode());
+
+        $notificationJson2 = static::httpRequestJson('GET', $notificationsPath);
+        static::assertArrayNotHasKey('subscription_callback', $notificationJson2);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSubscribeFailure()
+    {
+        $hubCallback = static::$apiRoot . 'index.php?tools/websub/echo-none';
+        $this->postSubscriptions($hubCallback);
+
+        static::assertEquals(400, static::httpLatestResponse()->getStatusCode());
+    }
+
+    /**
+     * @param string $hubCallback
+     * @param string $hubMode
+     * @return mixed|\Psr\Http\Message\ResponseInterface|null
+     */
+    private function postSubscriptions($hubCallback, $hubMode = 'subscribe')
+    {
+        $hubCallbackEncoded = rawurlencode($hubCallback);
+        return static::httpRequest(
+            'POST',
+            "subscriptions?hub.callback={$hubCallbackEncoded}&hub.mode={$hubMode}&hub.topic=user_notification_me&oauth_token=" . static::$accessToken,
+            [
+                'exceptions' => false,
+            ]
+        );
+    }
+}
diff --git a/_files/tests/api/ThreadAttachmentTest.php b/_files/tests/api/ThreadAttachmentTest.php
new file mode 100644
index 00000000..2e4c2bc2
--- /dev/null
+++ b/_files/tests/api/ThreadAttachmentTest.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class ThreadAttachmentTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessTokenBypassFloodCheck = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUserWithBypassFloodCheckPermission());
+        static::$accessTokenBypassFloodCheck = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testUploadForExistingThread()
+    {
+        $thread = $this->postThreads(__METHOD__);
+        $threadId = static::assertArrayHasKeyPath($thread, 'thread_id');
+
+        $hash = strval(microtime(true));
+        $attachment = $this->postThreadsAttachments($hash);
+        $attachmentId = static::assertArrayHasKeyPath($attachment, 'attachment_id');
+
+        $json = static::httpRequestJson(
+            'PUT',
+            "threads/{$threadId}",
+            [
+                'form_params' => [
+                    'attachment_hash' => $hash,
+                    'oauth_token' => static::$accessTokenBypassFloodCheck,
+                    'post_body' => __METHOD__ . ' now with attachment',
+                ],
+            ]
+        );
+        $thread = static::assertArrayHasKeyPath($json, 'thread');
+        $jsonThreadId = static::assertArrayHasKeyPath($thread, 'thread_id');
+        static::assertEquals($threadId, $jsonThreadId);
+        $postAttachments = static::assertArrayHasKeyPath($thread, 'first_post', 'attachments');
+
+        $attachmentFound = false;
+        foreach ($postAttachments as $postAttachment) {
+            $postAttachmentId = static::assertArrayHasKeyPath($postAttachment, 'attachment_id');
+            if ($postAttachmentId === $attachmentId) {
+                $attachmentFound = true;
+            }
+        }
+        static::assertTrue($attachmentFound);
+    }
+
+    /**
+     * @return void
+     */
+    public function testDeleteNewlyUploadedAttachment()
+    {
+        $attachment = $this->postThreadsAttachments();
+        $dataLink = static::assertArrayHasKeyPath($attachment, 'links', 'data');
+
+        $json2 = static::httpRequestJson('DELETE', $dataLink);
+        $status = static::assertArrayHasKeyPath($json2, 'status');
+        static::assertEquals('ok', $status);
+    }
+
+    /**
+     * @return void
+     */
+    public function testDeleteAssociatedAttachment()
+    {
+        $hash = strval(microtime(true));
+        $attachment = $this->postThreadsAttachments($hash);
+
+        $thread = $this->postThreads(__METHOD__, $hash);
+        $threadAttachments = static::assertArrayHasKeyPath($thread, 'first_post', 'attachments');
+        static::assertCount(1, $threadAttachments);
+        $threadAttachment = reset($threadAttachments);
+        static::assertEquals(
+            $attachment['attachment_id'],
+            static::assertArrayHasKeyPath($threadAttachment, 'attachment_id')
+        );
+        $dataLink = static::assertArrayHasKeyPath($threadAttachment, 'links', 'data');
+
+        $json2 = static::httpRequestJson('DELETE', $dataLink);
+        $status = static::assertArrayHasKeyPath($json2, 'status');
+        static::assertEquals('ok', $status);
+    }
+
+    /**
+     * @param string $method
+     * @param string $hash
+     * @return mixed
+     */
+    private function postThreads($method, $hash = '')
+    {
+        $forum = static::dataForum();
+        $json = static::httpRequestJson(
+            'POST',
+            'threads',
+            [
+                'form_params' => [
+                    'attachment_hash' => $hash,
+                    'forum_id' => $forum['node_id'],
+                    'oauth_token' => static::$accessTokenBypassFloodCheck,
+                    'post_body' => $method,
+                    'thread_title' => $method,
+                ],
+            ]
+        );
+
+        return static::assertArrayHasKeyPath($json, 'thread');
+    }
+
+    /**
+     * @param string $hash
+     * @return mixed
+     */
+    private function postThreadsAttachments($hash = '')
+    {
+        $accessToken = static::$accessTokenBypassFloodCheck;
+        $fileName = 'white.png';
+        $forum = static::dataForum();
+
+        $json = static::httpRequestJson(
+            'POST',
+            "threads/attachments?attachment_hash={$hash}&forum_id={$forum['node_id']}&oauth_token={$accessToken}",
+            [
+                'multipart' => [
+                    [
+                        'name' => 'file',
+                        'contents' => fopen(__DIR__ . "/files/{$fileName}", 'r'),
+                        'filename' => $fileName,
+                    ],
+                ]
+            ]
+        );
+
+        return static::assertArrayHasKeyPath($json, 'attachment');
+    }
+}
diff --git a/_files/tests/api/ThreadTest.php b/_files/tests/api/ThreadTest.php
new file mode 100644
index 00000000..5039b2e3
--- /dev/null
+++ b/_files/tests/api/ThreadTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class ThreadTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessTokenBypassFloodCheck = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUserWithBypassFloodCheckPermission());
+        static::$accessTokenBypassFloodCheck = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetIndex()
+    {
+        $forum = static::dataForum();
+
+        $jsonThreads = static::httpRequestJson(
+            'GET',
+            "threads?forum_id={$forum['node_id']}&oauth_token=" . static::$accessTokenBypassFloodCheck
+        );
+        static::assertArrayHasKey('threads', $jsonThreads);
+
+        $thread = static::dataThread();
+        $excludeFields = [
+            '',
+            'first_post',
+            'thread_is_followed'
+        ];
+
+        foreach ($excludeFields as $excludeField) {
+            $jsonThread = static::httpRequestJson(
+                'GET',
+                "threads/{$thread['thread_id']}?exclude_fields={$excludeField}&oauth_token=" . static::$accessTokenBypassFloodCheck
+            );
+
+            static::assertArrayHasKey('thread', $jsonThread);
+            if ($excludeField !== '') {
+                static::assertArrayNotHasKey($excludeField, $jsonThread);
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostIndex()
+    {
+        $forum = static::dataForum();
+
+        $randomTag = 'randomTag' . time();
+
+        $json = static::httpRequestJson(
+            'POST',
+            'threads',
+            [
+                'form_params' => [
+                    'forum_id' => $forum['node_id'],
+                    'oauth_token' => static::$accessTokenBypassFloodCheck,
+                    'post_body' => str_repeat(__METHOD__ . ' ', 10),
+                    'thread_title' => __METHOD__,
+                    'thread_tags' => $randomTag
+                ],
+            ]
+        );
+
+        static::assertArrayHasKey('thread', $json);
+
+        static::assertArrayHasKeyPath($json, 'thread', 'thread_tags');
+        static::assertNotEmpty($json['thread']['thread_tags']);
+
+        $tagIds = array_keys($json['thread']['thread_tags']);
+        $tagJson = static::httpRequestJson(
+            'GET',
+            "tags/${tagIds[0]}"
+        );
+
+        static::assertArrayHasKey('tag', $tagJson);
+    }
+
+    /**
+     * @return void
+     */
+    public function testPutIndex()
+    {
+        $thread = static::dataThread();
+        $token = $this::postPassword(static::dataApiClient(), static::dataUser());
+
+        $json = static::httpRequestJson(
+            'PUT',
+            'threads/' . $thread['thread_id'],
+            [
+                'form_params' => [
+                    'post_body' => str_repeat(__METHOD__ . ' ', 10),
+                    'oauth_token' => $token['access_token']
+                ]
+            ]
+        );
+
+        $jsonThreadId = static::assertArrayHasKeyPath($json, 'thread', 'thread_id');
+        static::assertEquals($thread['thread_id'], $jsonThreadId);
+    }
+
+    /** @noinspection PhpUnusedPrivateMethodInspection */
+    /**
+     * @return void
+     * @see ThreadAttachmentTest::postThreadsAttachments()
+     */
+    private function _testPostAttachments()
+    {
+        // intentionally left blank
+    }
+}
diff --git a/_files/tests/api/UserTest.php b/_files/tests/api/UserTest.php
new file mode 100644
index 00000000..1abc4c83
--- /dev/null
+++ b/_files/tests/api/UserTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class UserTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessToken = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUser());
+        static::$accessToken = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetIndex()
+    {
+        $user = static::dataUser();
+
+        $jsonUsers = static::httpRequestJson('GET', 'users?oauth_token=' . static::$accessToken);
+        static::assertArrayHasKey('users', $jsonUsers);
+
+        // test exclude fields.
+        $excludeFields = [
+            '',
+            'user_last_seen_date',
+            'user_external_authentications',
+            'user_dob_day',
+            'user_dob_month',
+            'user_dob_year',
+            'user_has_password'
+        ];
+
+        foreach ($excludeFields as $excludeField) {
+            $jsonUser = static::httpRequestJson(
+                'GET',
+                "users/{$user['user_id']}?exclude_field={$excludeField}&oauth_token=" . static::$accessToken
+            );
+
+            static::assertArrayHasKey('user', $jsonUser);
+
+            if ($excludeField !== '') {
+                static::assertArrayNotHasKey($excludeField, $jsonUser);
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostIndex()
+    {
+        $now = time();
+
+        $userEmail = 'tests_' . $now . '@local.com';
+        $username = 'tests_' . $now;
+
+        $json = static::httpRequestJson(
+            'POST',
+            'users',
+            [
+                'form_params' => [
+                    'user_email' => $userEmail,
+                    'username' => $username,
+                    'password' => '123456',
+                    'oauth_token' => static::$accessToken
+                ]
+            ]
+        );
+
+        static::assertArrayHasKey('user', $json);
+        static::assertArrayHasKey('token', $json);
+
+        $token = $json['token'];
+        static::assertArrayHasKey('access_token', $token);
+        static::assertArrayHasKey('expires_in', $token);
+        static::assertArrayHasKey('scope', $token);
+        static::assertArrayHasKey('refresh_token', $token);
+    }
+
+    /**
+     * @return void
+     */
+    public function testPutIndex()
+    {
+        $user = static::dataUser();
+
+        $json = static::httpRequestJson(
+            'PUT',
+            'users/' . $user['user_id'],
+            [
+                'form_params' => [
+                    'oauth_token' => static::$accessToken
+                ]
+            ]
+        );
+
+        static::assertArrayHasKey('status', $json);
+        static::assertEquals('ok', $json['status']);
+    }
+}
diff --git a/_files/tests/api/ZzzTest.php b/_files/tests/api/ZzzTest.php
new file mode 100644
index 00000000..940c337a
--- /dev/null
+++ b/_files/tests/api/ZzzTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace tests\api;
+
+use tests\bases\ApiTestCase;
+
+class ZzzTest extends ApiTestCase
+{
+    /**
+     * @var string
+     */
+    private static $accessToken = '';
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        $token = static::postPassword(static::dataApiClient(), static::dataUser());
+        static::$accessToken = $token['access_token'];
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostMultipartWithQueryParams()
+    {
+        $accessToken = static::$accessToken;
+        $fileName = 'white.png';
+        $forum = static::dataForum();
+
+        static::httpRequest(
+            'POST',
+            "threads/attachments?forum_id={$forum['node_id']}&oauth_token={$accessToken}",
+            [
+                'multipart' => [
+                    [
+                        'name' => 'file',
+                        'contents' => fopen(__DIR__ . "/files/{$fileName}", 'r'),
+                        'filename' => $fileName,
+                    ],
+                ]
+            ]
+        );
+
+        static::assertEquals(200, static::httpLatestResponse()->getStatusCode());
+    }
+
+    /**
+     * @return void
+     */
+    public function testPostMultipartWithBodyParams()
+    {
+        $fileName = 'white.png';
+        $forum = static::dataForum();
+
+        static::httpRequest(
+            'POST',
+            'threads/attachments',
+            [
+                'multipart' => [
+                    [
+                        'name' => 'file',
+                        'contents' => fopen(__DIR__ . "/files/{$fileName}", 'r'),
+                        'filename' => $fileName,
+                    ],
+                    [
+                        'name' => 'forum_id',
+                        'contents' => $forum['node_id'],
+                    ],
+                    [
+                        'name' => 'oauth_token',
+                        'contents' => static::$accessToken,
+                    ],
+                ]
+            ]
+        );
+
+        static::assertEquals(200, static::httpLatestResponse()->getStatusCode());
+    }
+
+    /**
+     * @return void
+     */
+    public function testOttWithGuest()
+    {
+        $this->requestActiveOttToken(0);
+    }
+
+    /**
+     * @return void
+     */
+    public function testOttWithUser()
+    {
+        $user = static::dataUser();
+        $this->requestActiveOttToken($user['user_id']);
+    }
+
+    /**
+     * @param int $userId
+     * @return void
+     */
+    protected function requestActiveOttToken($userId)
+    {
+        $timestamp = time() + 5 * 30;
+        $accessToken = ($userId > 0) ? static::$accessToken : '';
+        $client = static::dataApiClient();
+        $forum = static::dataForum();
+
+        $once = md5($userId . $timestamp . $accessToken . $client['client_secret']);
+        $ott = sprintf('%d,%d,%s,%s', $userId, $timestamp, $once, $client['client_id']);
+
+
+        $forumId = ($userId > 0) ? $forum['node_id'] : 0;
+        $json = static::httpRequestJson('GET', "threads?oauth_token={$ott}&forum_id={$forumId}");
+
+        static::assertArrayHasKey('threads', $json);
+    }
+}
diff --git a/_files/tests/api/files/white.png b/_files/tests/api/files/white.png
new file mode 100644
index 00000000..a5eb5c67
Binary files /dev/null and b/_files/tests/api/files/white.png differ
diff --git a/_files/tests/autoload.php b/_files/tests/autoload.php
new file mode 100644
index 00000000..a9e4fceb
--- /dev/null
+++ b/_files/tests/autoload.php
@@ -0,0 +1,12 @@
+<?php
+
+/** @noinspection PhpIncludeInspection */
+require('/var/www/html/src/vendor/autoload.php');
+
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require(__DIR__ . '/vendor/autoload.php');
+
+$loader->addPsr4('tests\api\\', __DIR__ . '/api');
+$loader->addPsr4('tests\bases\\', __DIR__ . '/bases');
+
+return $loader;
diff --git a/_files/tests/bases/ApiTestCase.php b/_files/tests/bases/ApiTestCase.php
new file mode 100644
index 00000000..365d809b
--- /dev/null
+++ b/_files/tests/bases/ApiTestCase.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace tests\bases;
+
+use GuzzleHttp\Exception\GuzzleException;
+use PHPUnit\Framework\TestCase;
+
+abstract class ApiTestCase extends TestCase
+{
+    /**
+     * @var string
+     */
+    public static $apiRoot = 'http://localhost/api/';
+
+    /**
+     * @var \Psr\Http\Message\ResponseInterface|null
+     */
+    private static $latestResponse = null;
+
+    /**
+     * @var \GuzzleHttp\Client
+     */
+    private static $http;
+
+    /**
+     * @var array|null
+     */
+    private static $testData = null;
+
+    /**
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+        self::$http = new \GuzzleHttp\Client([
+            'base_uri' => self::$apiRoot,
+        ]);
+    }
+
+    /**
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    protected static function httpLatestResponse()
+    {
+        /** @var \Psr\Http\Message\ResponseInterface $response */
+        $response = self::$latestResponse;
+        static::assertNotNull($response);
+
+        return $response;
+    }
+
+    /**
+     * @param string $method
+     * @param string $path
+     * @param array $options
+     * @return mixed|\Psr\Http\Message\ResponseInterface|null
+     */
+    protected static function httpRequest($method, $path, array $options = [])
+    {
+        if (preg_match('#^https?://#', $path) === 1) {
+            $uri = $path;
+        } else {
+            $uri = 'index.php?' . str_replace('?', '&', $path);
+        }
+
+        if (self::debugMode()) {
+            echo(str_repeat('----', 10) . "\n");
+            var_dump($method, $uri, $options);
+        }
+
+        try {
+            self::$latestResponse = self::$http->request($method, $uri, $options);
+        } catch (GuzzleException $e) {
+            throw new \RuntimeException('', 0, $e);
+        }
+
+        if (self::debugMode()) {
+            var_dump(self::$latestResponse->getStatusCode());
+            echo(str_repeat('----', 10) . "\n\n");
+        }
+
+        return self::$latestResponse;
+    }
+
+    /**
+     * @param string $method
+     * @param string $path
+     * @param array $options
+     * @param bool $checkError
+     * @return array
+     */
+    protected static function httpRequestJson($method, $path, array $options = [], $checkError = true)
+    {
+        $response = static::httpRequest($method, $path, $options);
+
+        $contentType = $response->getHeaders()['Content-Type'][0];
+        static::assertContains('application/json', $contentType);
+
+        $json = json_decode(strval($response->getBody()), true);
+        static::assertTrue(is_array($json));
+
+        if ($checkError) {
+            foreach (['error', 'error_description', 'errors'] as $errorKey) {
+                $errorMessage = "{$errorKey}: " . var_export(isset($json[$errorKey]) ? $json[$errorKey] : '', true);
+                static::assertArrayNotHasKey($errorKey, $json, $errorMessage);
+            }
+        }
+
+        return $json;
+    }
+
+    /**
+     * @param string|int ...$keys
+     * @return mixed
+     */
+    protected static function data(...$keys)
+    {
+        if (!is_array(self::$testData)) {
+            self::$testData = [];
+
+            $path = '/tmp/api_test.json';
+            static::assertFileExists($path);
+
+            $contents = file_get_contents($path);
+            $json = is_string($contents) ? json_decode($contents, true) : false;
+            static::assertTrue(is_array($json));
+
+            self::$testData = $json;
+        }
+
+        $data = self::$testData;
+        foreach ($keys as $key) {
+            static::assertArrayHasKey($key, $data);
+            $data = $data[$key];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    protected static function dataApiClient()
+    {
+        return static::data('apiClient');
+    }
+
+    /**
+     * @return array
+     */
+    protected static function dataForum()
+    {
+        return static::data('forum');
+    }
+
+    /**
+     * @param int $i
+     * @return array
+     */
+    protected static function dataUser($i = 0)
+    {
+        return static::data('users', $i);
+    }
+
+    /**
+     * @return array
+     */
+    protected static function dataUserWithBypassFloodCheckPermission()
+    {
+        return static::dataUser(3);
+    }
+
+    /**
+     * @param int $i
+     * @return array
+     */
+    protected static function dataThread($i = 0)
+    {
+        return static::data('threads', $i);
+    }
+
+    /**
+     * @param int $i
+     * @return array
+     */
+    protected static function dataPost($i = 0)
+    {
+        return static::data('posts', $i);
+    }
+
+    /**
+     * @return bool
+     */
+    protected static function debugMode()
+    {
+        return (getenv('API_TEST_CASE_DEBUG') === '1');
+    }
+
+    /**
+     * @param array $client
+     * @param array $user
+     * @return array
+     */
+    protected static function postPassword(array $client, array $user)
+    {
+        return static::postOauthToken([
+            'grant_type' => 'password',
+            'client_id' => $client['client_id'],
+            'client_secret' => $client['client_secret'],
+            'username' => $user['username'],
+            'password' => $user['password']
+        ]);
+    }
+
+    /**
+     * @param array $params
+     * @return array
+     */
+    protected static function postOauthToken(array $params)
+    {
+        return static::httpRequestJson('POST', 'oauth/token', ['form_params' => $params]);
+    }
+
+    /**
+     * @param array $data
+     * @param mixed ...$keys
+     * @return mixed
+     */
+    protected static function assertArrayHasKeyPath(array $data, ...$keys)
+    {
+        $ref =& $data;
+        foreach ($keys as $key) {
+            self::assertTrue(is_array($ref), var_export($ref, true) . ' is not an array');
+            self::assertArrayHasKey($key, $ref, "Key '{$key}' not found: " . implode(', ', array_keys($ref)));
+            $ref =& $ref[$key];
+        }
+
+        return $ref;
+    }
+}
diff --git a/_files/tests/composer.json b/_files/tests/composer.json
new file mode 100644
index 00000000..32bb12e6
--- /dev/null
+++ b/_files/tests/composer.json
@@ -0,0 +1,8 @@
+{
+  "require-dev": {
+    "phpunit/phpunit": "^7.3"
+  },
+  "scripts": {
+    "test": "./vendor/bin/phpunit --testdox"
+  }
+}
diff --git a/_files/tests/composer.lock b/_files/tests/composer.lock
new file mode 100644
index 00000000..da85c8a2
--- /dev/null
+++ b/_files/tests/composer.lock
@@ -0,0 +1,1426 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "df297bfc0e15dbb78ca294c94bbd143e",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2018-06-11T23:09:50+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^2.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "time": "2018-07-08T19:23:20+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2018-07-08T19:19:57+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-30T07:14:17+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-08-05T17:53:17+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "6.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a",
+                "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.1",
+                "phpunit/php-file-iterator": "^2.0",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-token-stream": "^3.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0.1",
+                "sebastian/environment": "^3.1",
+                "sebastian/version": "^2.0.1",
+                "theseer/tokenizer": "^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2018-06-01T07:51:50+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2018-09-13T20:33:42+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2018-02-01T13:07:23+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
+                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2018-02-01T13:16:43+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "7.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "7b331efabbb628c518c408fdfcaf571156775de2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7b331efabbb628c518c408fdfcaf571156775de2",
+                "reference": "7b331efabbb628c518c408fdfcaf571156775de2",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.1",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "^1.7",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
+                "php": "^7.1",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^6.0.7",
+                "phpunit/php-file-iterator": "^2.0.1",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^2.0",
+                "sebastian/comparator": "^3.0",
+                "sebastian/diff": "^3.0",
+                "sebastian/environment": "^3.1",
+                "sebastian/exporter": "^3.1",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0.1"
+            },
+            "conflict": {
+                "phpunit/phpunit-mock-objects": "*"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^2.0"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2018-09-08T15:14:29+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1",
+                "sebastian/diff": "^3.0",
+                "sebastian/exporter": "^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2018-07-12T15:12:46+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "366541b989927187c4ca70490a35615d3fef2dce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
+                "reference": "366541b989927187c4ca70490a35615d3fef2dce",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0",
+                "symfony/process": "^2 || ^3.3 || ^4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "time": "2018-06-10T07:54:39+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2017-07-01T08:51:00+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
+                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-04-03T13:19:02+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2017-04-27T15:39:26+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/object-reflector": "^1.1.1",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-08-03T12:35:26+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
+                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2017-03-29T09:07:27+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2017-03-03T06:23:57+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "time": "2017-04-07T12:08:54+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-01-29T19:49:41+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/_files/tests/phpunit.sh b/_files/tests/phpunit.sh
new file mode 100755
index 00000000..71838b7f
--- /dev/null
+++ b/_files/tests/phpunit.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec ./vendor/bin/phpunit "$@"
diff --git a/_files/tests/phpunit.xml b/_files/tests/phpunit.xml
new file mode 100644
index 00000000..19340771
--- /dev/null
+++ b/_files/tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="autoload.php">
+    <testsuites>
+        <testsuite name="API Test Suite">
+            <directory>api</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/_output/admin_navigation/XfrocksApi.json b/_output/admin_navigation/XfrocksApi.json
new file mode 100644
index 00000000..95fd7d84
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApi.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "",
+    "display_order": 201,
+    "link": "",
+    "icon": "fa-plane",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiAuthCodes.json b/_output/admin_navigation/XfrocksApiAuthCodes.json
new file mode 100644
index 00000000..4b77c28d
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiAuthCodes.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 30,
+    "link": "api-auth-codes",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiClients.json b/_output/admin_navigation/XfrocksApiClients.json
new file mode 100644
index 00000000..da4c9886
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiClients.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 10,
+    "link": "api-clients",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiLogs.json b/_output/admin_navigation/XfrocksApiLogs.json
new file mode 100644
index 00000000..91d98ed7
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiLogs.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 9999,
+    "link": "api-logs",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiRefreshTokens.json b/_output/admin_navigation/XfrocksApiRefreshTokens.json
new file mode 100644
index 00000000..a9a3f47e
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiRefreshTokens.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 40,
+    "link": "api-refresh-tokens",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiSubscriptions.json b/_output/admin_navigation/XfrocksApiSubscriptions.json
new file mode 100644
index 00000000..58bc7ce0
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiSubscriptions.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 5000,
+    "link": "api-subscriptions",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/XfrocksApiTokens.json b/_output/admin_navigation/XfrocksApiTokens.json
new file mode 100644
index 00000000..cd5a88c7
--- /dev/null
+++ b/_output/admin_navigation/XfrocksApiTokens.json
@@ -0,0 +1,10 @@
+{
+    "parent_navigation_id": "XfrocksApi",
+    "display_order": 20,
+    "link": "api-tokens",
+    "icon": "",
+    "admin_permission_id": "bdApi",
+    "debug_only": false,
+    "development_only": false,
+    "hide_no_children": false
+}
\ No newline at end of file
diff --git a/_output/admin_navigation/_metadata.json b/_output/admin_navigation/_metadata.json
new file mode 100644
index 00000000..f31d1a79
--- /dev/null
+++ b/_output/admin_navigation/_metadata.json
@@ -0,0 +1,23 @@
+{
+    "XfrocksApi.json": {
+        "hash": "70c9a12340688ed97c2c94750b2bfe4a"
+    },
+    "XfrocksApiAuthCodes.json": {
+        "hash": "36dfe726932ff2ff3f37966ab8004ce2"
+    },
+    "XfrocksApiClients.json": {
+        "hash": "f0a9f46b160ed14cd6e3b8bc55bb1ce1"
+    },
+    "XfrocksApiLogs.json": {
+        "hash": "538a3eed705ea8a9e44bb39610deef33"
+    },
+    "XfrocksApiRefreshTokens.json": {
+        "hash": "70f7b7990f1ae8bdaaf5033aaab50e14"
+    },
+    "XfrocksApiSubscriptions.json": {
+        "hash": "7266e7d7343935a993e1a0e421740ae0"
+    },
+    "XfrocksApiTokens.json": {
+        "hash": "6d8bdd9c9ae05e5090a33674b4ed8528"
+    }
+}
\ No newline at end of file
diff --git a/_output/admin_permissions/_metadata.json b/_output/admin_permissions/_metadata.json
new file mode 100644
index 00000000..d0ddbfbc
--- /dev/null
+++ b/_output/admin_permissions/_metadata.json
@@ -0,0 +1,5 @@
+{
+    "bdApi.json": {
+        "hash": "f25cbbe23fb758887568117cccb8471e"
+    }
+}
\ No newline at end of file
diff --git a/_output/admin_permissions/bdApi.json b/_output/admin_permissions/bdApi.json
new file mode 100644
index 00000000..7b4a8363
--- /dev/null
+++ b/_output/admin_permissions/bdApi.json
@@ -0,0 +1,3 @@
+{
+    "display_order": 9999
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Entity-Post_Xfrocks-Api-XF-Entity-Post.json b/_output/class_extensions/XF-Entity-Post_Xfrocks-Api-XF-Entity-Post.json
new file mode 100644
index 00000000..72a82a6c
--- /dev/null
+++ b/_output/class_extensions/XF-Entity-Post_Xfrocks-Api-XF-Entity-Post.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Entity\\Post",
+    "to_class": "Xfrocks\\Api\\XF\\Entity\\Post",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Entity-Thread_Xfrocks-Api-XF-Entity-Thread.json b/_output/class_extensions/XF-Entity-Thread_Xfrocks-Api-XF-Entity-Thread.json
new file mode 100644
index 00000000..e0eb1ac8
--- /dev/null
+++ b/_output/class_extensions/XF-Entity-Thread_Xfrocks-Api-XF-Entity-Thread.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Entity\\Thread",
+    "to_class": "Xfrocks\\Api\\XF\\Entity\\Thread",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Entity-UserAlert_Xfrocks-Api-XF-Entity-UserAlert.json b/_output/class_extensions/XF-Entity-UserAlert_Xfrocks-Api-XF-Entity-UserAlert.json
new file mode 100644
index 00000000..51b10efe
--- /dev/null
+++ b/_output/class_extensions/XF-Entity-UserAlert_Xfrocks-Api-XF-Entity-UserAlert.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Entity\\UserAlert",
+    "to_class": "Xfrocks\\Api\\XF\\Entity\\UserAlert",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Entity-UserOption_Xfrocks-Api-XF-Entity-UserOption.json b/_output/class_extensions/XF-Entity-UserOption_Xfrocks-Api-XF-Entity-UserOption.json
new file mode 100644
index 00000000..40788ab9
--- /dev/null
+++ b/_output/class_extensions/XF-Entity-UserOption_Xfrocks-Api-XF-Entity-UserOption.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Entity\\UserOption",
+    "to_class": "Xfrocks\\Api\\XF\\Entity\\UserOption",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Entity-User_Xfrocks-Api-XF-Entity-User.json b/_output/class_extensions/XF-Entity-User_Xfrocks-Api-XF-Entity-User.json
new file mode 100644
index 00000000..78d034fa
--- /dev/null
+++ b/_output/class_extensions/XF-Entity-User_Xfrocks-Api-XF-Entity-User.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Entity\\User",
+    "to_class": "Xfrocks\\Api\\XF\\Entity\\User",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Pub-Controller-Account_Xfrocks-Api-XF-Pub-Controller-Account.json b/_output/class_extensions/XF-Pub-Controller-Account_Xfrocks-Api-XF-Pub-Controller-Account.json
new file mode 100644
index 00000000..be8f8200
--- /dev/null
+++ b/_output/class_extensions/XF-Pub-Controller-Account_Xfrocks-Api-XF-Pub-Controller-Account.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Pub\\Controller\\Account",
+    "to_class": "Xfrocks\\Api\\XF\\Pub\\Controller\\Account",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Pub-Controller-Misc_Xfrocks-Api-XF-Pub-Controller-Misc.json b/_output/class_extensions/XF-Pub-Controller-Misc_Xfrocks-Api-XF-Pub-Controller-Misc.json
new file mode 100644
index 00000000..cbcf06ce
--- /dev/null
+++ b/_output/class_extensions/XF-Pub-Controller-Misc_Xfrocks-Api-XF-Pub-Controller-Misc.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Pub\\Controller\\Misc",
+    "to_class": "Xfrocks\\Api\\XF\\Pub\\Controller\\Misc",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Repository-Node_Xfrocks-Api-XF-Repository-Node.json b/_output/class_extensions/XF-Repository-Node_Xfrocks-Api-XF-Repository-Node.json
new file mode 100644
index 00000000..ce6366e3
--- /dev/null
+++ b/_output/class_extensions/XF-Repository-Node_Xfrocks-Api-XF-Repository-Node.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Repository\\Node",
+    "to_class": "Xfrocks\\Api\\XF\\Repository\\Node",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Service-AddOn-HashGenerator_Xfrocks-Api-XF-Service-AddOn-HashGenerator.json b/_output/class_extensions/XF-Service-AddOn-HashGenerator_Xfrocks-Api-XF-Service-AddOn-HashGenerator.json
new file mode 100644
index 00000000..e132a740
--- /dev/null
+++ b/_output/class_extensions/XF-Service-AddOn-HashGenerator_Xfrocks-Api-XF-Service-AddOn-HashGenerator.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Service\\AddOn\\HashGenerator",
+    "to_class": "Xfrocks\\Api\\XF\\Service\\AddOn\\HashGenerator",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Service-Conversation-Notifier_Xfrocks-Api-XF-Service-Conversation-Notifier.json b/_output/class_extensions/XF-Service-Conversation-Notifier_Xfrocks-Api-XF-Service-Conversation-Notifier.json
new file mode 100644
index 00000000..f9c8fc2f
--- /dev/null
+++ b/_output/class_extensions/XF-Service-Conversation-Notifier_Xfrocks-Api-XF-Service-Conversation-Notifier.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Service\\Conversation\\Notifier",
+    "to_class": "Xfrocks\\Api\\XF\\Service\\Conversation\\Notifier",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/XF-Service-User-DeleteCleanUp_Xfrocks-Api-XF-Service-User-DeleteCleanUp.json b/_output/class_extensions/XF-Service-User-DeleteCleanUp_Xfrocks-Api-XF-Service-User-DeleteCleanUp.json
new file mode 100644
index 00000000..471c3917
--- /dev/null
+++ b/_output/class_extensions/XF-Service-User-DeleteCleanUp_Xfrocks-Api-XF-Service-User-DeleteCleanUp.json
@@ -0,0 +1,6 @@
+{
+    "from_class": "XF\\Service\\User\\DeleteCleanUp",
+    "to_class": "Xfrocks\\Api\\XF\\Service\\User\\DeleteCleanUp",
+    "execute_order": 10,
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/class_extensions/_metadata.json b/_output/class_extensions/_metadata.json
new file mode 100644
index 00000000..4ca35c1d
--- /dev/null
+++ b/_output/class_extensions/_metadata.json
@@ -0,0 +1,35 @@
+{
+    "XF-Entity-Post_Xfrocks-Api-XF-Entity-Post.json": {
+        "hash": "afa2f2b4f50ac4d3ddb40574f4e4b1f4"
+    },
+    "XF-Entity-Thread_Xfrocks-Api-XF-Entity-Thread.json": {
+        "hash": "014ff641979958ef7027fd26ac786bea"
+    },
+    "XF-Entity-UserAlert_Xfrocks-Api-XF-Entity-UserAlert.json": {
+        "hash": "af90a9fe08b2b303408776c3c7a27301"
+    },
+    "XF-Entity-UserOption_Xfrocks-Api-XF-Entity-UserOption.json": {
+        "hash": "43dda0de74c45389e5909291d632637a"
+    },
+    "XF-Entity-User_Xfrocks-Api-XF-Entity-User.json": {
+        "hash": "ae48a23e0edac88b42ddfba1c29cea4d"
+    },
+    "XF-Pub-Controller-Account_Xfrocks-Api-XF-Pub-Controller-Account.json": {
+        "hash": "a0f1bad1fd472ab41ecf0ec219dd5d3d"
+    },
+    "XF-Pub-Controller-Misc_Xfrocks-Api-XF-Pub-Controller-Misc.json": {
+        "hash": "3c8843fcf5b4cc24e709fa61fc308c09"
+    },
+    "XF-Repository-Node_Xfrocks-Api-XF-Repository-Node.json": {
+        "hash": "06e16772e3cf6d06e667820c07c87fd6"
+    },
+    "XF-Service-AddOn-HashGenerator_Xfrocks-Api-XF-Service-AddOn-HashGenerator.json": {
+        "hash": "8b889b931b2efb5470e8a5adb2c5d7d9"
+    },
+    "XF-Service-Conversation-Notifier_Xfrocks-Api-XF-Service-Conversation-Notifier.json": {
+        "hash": "da13a532d2404806c8685a15313b5a22"
+    },
+    "XF-Service-User-DeleteCleanUp_Xfrocks-Api-XF-Service-User-DeleteCleanUp.json": {
+        "hash": "0a078c2e5fd8b7902570609f74e1485c"
+    }
+}
\ No newline at end of file
diff --git a/_output/code_event_listeners/_metadata.json b/_output/code_event_listeners/_metadata.json
new file mode 100644
index 00000000..73d7a724
--- /dev/null
+++ b/_output/code_event_listeners/_metadata.json
@@ -0,0 +1,8 @@
+{
+    "app_setup_a0014361bc61db6e914661e27a42c445.json": {
+        "hash": "52302ecadc637a759ff80d2b531de053"
+    },
+    "user_content_change_init_83289233a941c54c085f3fd42a6474a3.json": {
+        "hash": "4ac0bd8ce858bdcb0f1a900427501faf"
+    }
+}
\ No newline at end of file
diff --git a/_output/code_event_listeners/app_setup_a0014361bc61db6e914661e27a42c445.json b/_output/code_event_listeners/app_setup_a0014361bc61db6e914661e27a42c445.json
new file mode 100644
index 00000000..457b78bb
--- /dev/null
+++ b/_output/code_event_listeners/app_setup_a0014361bc61db6e914661e27a42c445.json
@@ -0,0 +1,9 @@
+{
+    "event_id": "app_setup",
+    "execute_order": 10,
+    "callback_class": "Xfrocks\\Api\\Listener",
+    "callback_method": "appSetup",
+    "active": true,
+    "hint": "",
+    "description": ""
+}
\ No newline at end of file
diff --git a/_output/code_event_listeners/user_content_change_init_83289233a941c54c085f3fd42a6474a3.json b/_output/code_event_listeners/user_content_change_init_83289233a941c54c085f3fd42a6474a3.json
new file mode 100644
index 00000000..49de8c4f
--- /dev/null
+++ b/_output/code_event_listeners/user_content_change_init_83289233a941c54c085f3fd42a6474a3.json
@@ -0,0 +1,9 @@
+{
+    "event_id": "user_content_change_init",
+    "execute_order": 10,
+    "callback_class": "Xfrocks\\Api\\Listener",
+    "callback_method": "userContentChangeInit",
+    "active": true,
+    "hint": "",
+    "description": ""
+}
\ No newline at end of file
diff --git a/_output/cron_entries/_metadata.json b/_output/cron_entries/_metadata.json
new file mode 100644
index 00000000..9054acd2
--- /dev/null
+++ b/_output/cron_entries/_metadata.json
@@ -0,0 +1,5 @@
+{
+    "bdApiCleanUpHourly.json": {
+        "hash": "fa60e4aa7c53d8a6815652f9077bff8d"
+    }
+}
\ No newline at end of file
diff --git a/_output/cron_entries/bdApiCleanUpHourly.json b/_output/cron_entries/bdApiCleanUpHourly.json
new file mode 100644
index 00000000..fad950fa
--- /dev/null
+++ b/_output/cron_entries/bdApiCleanUpHourly.json
@@ -0,0 +1,17 @@
+{
+    "cron_class": "Xfrocks\\Api\\Cron\\CleanUp",
+    "cron_method": "runHourlyCleanUp",
+    "run_rules": {
+        "day_type": "dom",
+        "dom": [
+            -1
+        ],
+        "hours": [
+            -1
+        ],
+        "minutes": [
+            29
+        ]
+    },
+    "active": true
+}
\ No newline at end of file
diff --git a/_output/extension_hint.php b/_output/extension_hint.php
new file mode 100644
index 00000000..63b6c764
--- /dev/null
+++ b/_output/extension_hint.php
@@ -0,0 +1,39 @@
+<?php
+
+// ################## THIS IS A GENERATED FILE ##################
+// DO NOT EDIT DIRECTLY. EDIT THE CLASS EXTENSIONS IN THE CONTROL PANEL.
+
+namespace Xfrocks\Api\XF\Entity
+{
+	class XFCP_Post extends \XF\Entity\Post {}
+	class XFCP_Thread extends \XF\Entity\Thread {}
+	class XFCP_User extends \XF\Entity\User {}
+	class XFCP_UserAlert extends \XF\Entity\UserAlert {}
+	class XFCP_UserOption extends \XF\Entity\UserOption {}
+}
+
+namespace Xfrocks\Api\XF\Pub\Controller
+{
+	class XFCP_Account extends \XF\Pub\Controller\Account {}
+	class XFCP_Misc extends \XF\Pub\Controller\Misc {}
+}
+
+namespace Xfrocks\Api\XF\Repository
+{
+	class XFCP_Node extends \XF\Repository\Node {}
+}
+
+namespace Xfrocks\Api\XF\Service\AddOn
+{
+	class XFCP_HashGenerator extends \XF\Service\AddOn\HashGenerator {}
+}
+
+namespace Xfrocks\Api\XF\Service\Conversation
+{
+	class XFCP_Notifier extends \XF\Service\Conversation\Notifier {}
+}
+
+namespace Xfrocks\Api\XF\Service\User
+{
+	class XFCP_DeleteCleanUp extends \XF\Service\User\DeleteCleanUp {}
+}
\ No newline at end of file
diff --git a/_output/option_groups/_metadata.json b/_output/option_groups/_metadata.json
new file mode 100644
index 00000000..06be0185
--- /dev/null
+++ b/_output/option_groups/_metadata.json
@@ -0,0 +1,5 @@
+{
+    "bdApi.json": {
+        "hash": "34681743b9276a0f9d60823a46cce3ee"
+    }
+}
\ No newline at end of file
diff --git a/_output/option_groups/bdApi.json b/_output/option_groups/bdApi.json
new file mode 100644
index 00000000..bd81d012
--- /dev/null
+++ b/_output/option_groups/bdApi.json
@@ -0,0 +1,6 @@
+{
+    "icon": "",
+    "display_order": 9999,
+    "advanced": false,
+    "debug_only": false
+}
\ No newline at end of file
diff --git a/_output/options/_metadata.json b/_output/options/_metadata.json
new file mode 100644
index 00000000..0750df08
--- /dev/null
+++ b/_output/options/_metadata.json
@@ -0,0 +1,50 @@
+{
+    "bdApi_authCodeTTL.json": {
+        "hash": "da794e2c00d7bc5126964300a5e72b4d"
+    },
+    "bdApi_cors.json": {
+        "hash": "b0a70bd49ca1c0e02a613f21033bf82b"
+    },
+    "bdApi_logRetentionDays.json": {
+        "hash": "46b137a4cf7648cba5553266b2e1427e"
+    },
+    "bdApi_paramLimitDefault.json": {
+        "hash": "494f628de855c691a347083fa7d80cfc"
+    },
+    "bdApi_paramLimitMax.json": {
+        "hash": "f477fab869fd0656bb9db5949050e2a2"
+    },
+    "bdApi_paramPageMax.json": {
+        "hash": "77fbedd2fc0ae24e03d787c739c2faff"
+    },
+    "bdApi_refreshTokenTTLDays.json": {
+        "hash": "98b7abcf3277c79a5ec0a89522c28fcf"
+    },
+    "bdApi_restrictAccess.json": {
+        "hash": "b0a70bd49ca1c0e02a613f21033bf82b"
+    },
+    "bdApi_subscriptionColumnThreadPost.json": {
+        "hash": "0e61e84ef9ef69f97815a33228cd3c62"
+    },
+    "bdApi_subscriptionColumnUser.json": {
+        "hash": "dc3715519f68c17ec36ba7a452c028ab"
+    },
+    "bdApi_subscriptionColumnUserNotification.json": {
+        "hash": "831852d30faf76b1ec6ab829f8d380c9"
+    },
+    "bdApi_subscriptionThreadPost.json": {
+        "hash": "68ff233d244acc2665ab14058a57be5e"
+    },
+    "bdApi_subscriptionUser.json": {
+        "hash": "aa7af21bf3928b0132be4f2e244a876f"
+    },
+    "bdApi_subscriptionUserNotification.json": {
+        "hash": "b57e64ccdd8cfa7692bcdd77b1dc3e0c"
+    },
+    "bdApi_tokenTTL.json": {
+        "hash": "8334129d2f01ebe9ee671c63687b194e"
+    },
+    "bdApi_userNotificationConversation.json": {
+        "hash": "66f2f642d10198a3c2b25101226c0be5"
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_authCodeTTL.json b/_output/options/bdApi_authCodeTTL.json
new file mode 100644
index 00000000..8131f9b8
--- /dev/null
+++ b/_output/options/bdApi_authCodeTTL.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "min=5",
+    "data_type": "positive_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "30",
+    "relations": {
+        "bdApi": 100
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_cors.json b/_output/options/bdApi_cors.json
new file mode 100644
index 00000000..c04f9442
--- /dev/null
+++ b/_output/options/bdApi_cors.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 10
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_logRetentionDays.json b/_output/options/bdApi_logRetentionDays.json
new file mode 100644
index 00000000..4634eaf3
--- /dev/null
+++ b/_output/options/bdApi_logRetentionDays.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "min=0\nstep=30",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "90",
+    "relations": {
+        "bdApi": 600
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_paramLimitDefault.json b/_output/options/bdApi_paramLimitDefault.json
new file mode 100644
index 00000000..3a3b25a6
--- /dev/null
+++ b/_output/options/bdApi_paramLimitDefault.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "",
+    "data_type": "positive_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "20",
+    "relations": {
+        "bdApi": 500
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_paramLimitMax.json b/_output/options/bdApi_paramLimitMax.json
new file mode 100644
index 00000000..13ad870e
--- /dev/null
+++ b/_output/options/bdApi_paramLimitMax.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "100",
+    "relations": {
+        "bdApi": 510
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_paramPageMax.json b/_output/options/bdApi_paramPageMax.json
new file mode 100644
index 00000000..3667c2f4
--- /dev/null
+++ b/_output/options/bdApi_paramPageMax.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 550
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_refreshTokenTTLDays.json b/_output/options/bdApi_refreshTokenTTLDays.json
new file mode 100644
index 00000000..378b8346
--- /dev/null
+++ b/_output/options/bdApi_refreshTokenTTLDays.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "min=1",
+    "data_type": "positive_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "14",
+    "relations": {
+        "bdApi": 120
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_restrictAccess.json b/_output/options/bdApi_restrictAccess.json
new file mode 100644
index 00000000..c04f9442
--- /dev/null
+++ b/_output/options/bdApi_restrictAccess.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 10
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionColumnThreadPost.json b/_output/options/bdApi_subscriptionColumnThreadPost.json
new file mode 100644
index 00000000..95275059
--- /dev/null
+++ b/_output/options/bdApi_subscriptionColumnThreadPost.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "textbox",
+    "edit_format_params": "",
+    "data_type": "string",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyTextboxOption",
+    "advanced": false,
+    "default_value": "",
+    "relations": {
+        "bdApi": 70
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionColumnUser.json b/_output/options/bdApi_subscriptionColumnUser.json
new file mode 100644
index 00000000..d5a3f7cf
--- /dev/null
+++ b/_output/options/bdApi_subscriptionColumnUser.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "textbox",
+    "edit_format_params": "",
+    "data_type": "string",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyTextboxOption",
+    "advanced": false,
+    "default_value": "",
+    "relations": {
+        "bdApi": 60
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionColumnUserNotification.json b/_output/options/bdApi_subscriptionColumnUserNotification.json
new file mode 100644
index 00000000..3a2be280
--- /dev/null
+++ b/_output/options/bdApi_subscriptionColumnUserNotification.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "textbox",
+    "edit_format_params": "",
+    "data_type": "string",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyTextboxOption",
+    "advanced": false,
+    "default_value": "",
+    "relations": {
+        "bdApi": 65
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionThreadPost.json b/_output/options/bdApi_subscriptionThreadPost.json
new file mode 100644
index 00000000..ae6f4394
--- /dev/null
+++ b/_output/options/bdApi_subscriptionThreadPost.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyOnOffOption",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 35
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionUser.json b/_output/options/bdApi_subscriptionUser.json
new file mode 100644
index 00000000..ebcfda91
--- /dev/null
+++ b/_output/options/bdApi_subscriptionUser.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyOnOffOption",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 20
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_subscriptionUserNotification.json b/_output/options/bdApi_subscriptionUserNotification.json
new file mode 100644
index 00000000..417eb5e1
--- /dev/null
+++ b/_output/options/bdApi_subscriptionUserNotification.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "Xfrocks\\Api\\Option\\ColumnOption",
+    "validation_method": "verifyOnOffOption",
+    "advanced": false,
+    "default_value": "0",
+    "relations": {
+        "bdApi": 25
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_tokenTTL.json b/_output/options/bdApi_tokenTTL.json
new file mode 100644
index 00000000..8e9855d5
--- /dev/null
+++ b/_output/options/bdApi_tokenTTL.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "spinbox",
+    "edit_format_params": "min=600",
+    "data_type": "positive_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "3600",
+    "relations": {
+        "bdApi": 110
+    }
+}
\ No newline at end of file
diff --git a/_output/options/bdApi_userNotificationConversation.json b/_output/options/bdApi_userNotificationConversation.json
new file mode 100644
index 00000000..6e16a739
--- /dev/null
+++ b/_output/options/bdApi_userNotificationConversation.json
@@ -0,0 +1,13 @@
+{
+    "edit_format": "onoff",
+    "edit_format_params": "",
+    "data_type": "unsigned_integer",
+    "sub_options": [],
+    "validation_class": "",
+    "validation_method": "",
+    "advanced": false,
+    "default_value": "1",
+    "relations": {
+        "bdApi": 30
+    }
+}
\ No newline at end of file
diff --git a/_output/permissions/_metadata.json b/_output/permissions/_metadata.json
new file mode 100644
index 00000000..0e373d09
--- /dev/null
+++ b/_output/permissions/_metadata.json
@@ -0,0 +1,5 @@
+{
+    "general-bdApi_clientNew.json": {
+        "hash": "0dce68198360bb378502f7e45d29c07e"
+    }
+}
\ No newline at end of file
diff --git a/_output/permissions/general-bdApi_clientNew.json b/_output/permissions/general-bdApi_clientNew.json
new file mode 100644
index 00000000..20253627
--- /dev/null
+++ b/_output/permissions/general-bdApi_clientNew.json
@@ -0,0 +1,6 @@
+{
+    "permission_type": "flag",
+    "interface_group_id": "generalPermissions",
+    "display_order": 9999,
+    "depend_permission_id": ""
+}
\ No newline at end of file
diff --git a/_output/phrases/_metadata.json b/_output/phrases/_metadata.json
new file mode 100644
index 00000000..1c701be4
--- /dev/null
+++ b/_output/phrases/_metadata.json
@@ -0,0 +1,812 @@
+{
+    "admin_navigation.XfrocksApi.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "db974238714ca8de634a7ce1d083a14f"
+    },
+    "admin_navigation.XfrocksApiAuthCodes.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "db9e49930035e05c901267e97790c4cb"
+    },
+    "admin_navigation.XfrocksApiClients.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "0377bd8eb69e7aae6d7025b29077a7ba"
+    },
+    "admin_navigation.XfrocksApiLogs.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b2d37ae1cedf42ff874289b721860af2"
+    },
+    "admin_navigation.XfrocksApiRefreshTokens.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "ea3644f15371d252c9ec80532b24c3bb"
+    },
+    "admin_navigation.XfrocksApiSubscriptions.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "4ca2c509994c2776d0880357b4e8e5be"
+    },
+    "admin_navigation.XfrocksApiTokens.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "3b5b5feef66adc0768f35b724a334827"
+    },
+    "admin_permission.bdApi.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "f31afc34f3646e515ac887280a1abd04"
+    },
+    "bdapi_api_access_tokens.txt": {
+        "global_cache": false,
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "2dc554f3bbe39578deadcf21e6d30345"
+    },
+    "bdapi_auth_code_add.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "dae6bd6048bbddf61e0eae01bdd09007"
+    },
+    "bdapi_auth_code_edit.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "af89f017ae9b9cf090e923b82f332008"
+    },
+    "bdapi_auth_code_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "db9e49930035e05c901267e97790c4cb"
+    },
+    "bdapi_auth_code_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "e6d145ad0a2a9c490920c16093a5cdde"
+    },
+    "bdapi_auth_code_text.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "abc9c64b139155cd0e6128f93088430d"
+    },
+    "bdapi_authorize_access.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "256fa54aaaade8674e5034bffa6e3b0b"
+    },
+    "bdapi_callback.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "406c70d61a3eefd08d468bd8a7b1b77f"
+    },
+    "bdapi_client_add.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "e55d78e01ab01f1164d35a2315c8540a"
+    },
+    "bdapi_client_description.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "b5a7adde1af5c87d7fd797b6245c2a39"
+    },
+    "bdapi_client_edit.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "c864baffdec9d088db4faec485519fa0"
+    },
+    "bdapi_client_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "3f362d88e7d47807cec60a6529cda796"
+    },
+    "bdapi_client_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "c4850e63b1a89896e2f452edb9c4bd7a"
+    },
+    "bdapi_client_id.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "656a6828d7ef1bb791e42087c4b5ee6e"
+    },
+    "bdapi_client_name.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "0d380be17f8c1b5508dddc0ff5bf8dc6"
+    },
+    "bdapi_client_secret.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "366522fd60d531a12f1f8b1d460f82fb"
+    },
+    "bdapi_column_x_table_y_not_found_for_field_z.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "8fee5376ada959d58f9c09e3413ef1bd"
+    },
+    "bdapi_expire_date.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b1dc284acb649d619d692b448e414ef9"
+    },
+    "bdapi_home.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "bbe1851a4bf6476f10ba4c77ec78d11d"
+    },
+    "bdapi_invalid_facebook_token.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "7d19af7a3995fc262806c4037a19e452"
+    },
+    "bdapi_last_used.txt": {
+        "global_cache": false,
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "135daaf0d59548436c6858c7f0798c45"
+    },
+    "bdapi_log_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b2d37ae1cedf42ff874289b721860af2"
+    },
+    "bdapi_log_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "ce0be71e33226e4c1db2bcea5959f16b"
+    },
+    "bdapi_log_entry.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b7cc931e9edfc5d2232748b203de4aef"
+    },
+    "bdapi_log_ip_address.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "5b8c99dad1893a85076709b2d3c2d2d0"
+    },
+    "bdapi_log_request_data.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "df5baf123e804b8c31151724197c0da2"
+    },
+    "bdapi_log_request_date.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b89aa19e2adefc268c3e2260d9242548"
+    },
+    "bdapi_log_request_method.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "b6434258c743f8673997b5aeb3721c27"
+    },
+    "bdapi_log_request_uri.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "efc92fb772a0037d7b1fab20dff56a85"
+    },
+    "bdapi_log_response_code.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "2affe82cc56bc171ff3febf97c70b119"
+    },
+    "bdapi_log_response_output.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "15c25a7f3e8605e0bd46c0616c7d7727"
+    },
+    "bdapi_no_facebook_association_found.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "1d489502a4dff67f38846b80ef599d18"
+    },
+    "bdapi_oauth2_error_access_denied.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "652122103181aa2752efaecab300edf0"
+    },
+    "bdapi_oauth2_error_invalid_client.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "7eb05314a948c1be042a9af76065fb0b"
+    },
+    "bdapi_oauth2_error_invalid_grant.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "7f874c8865e3eb49e02dc61bb38b0631"
+    },
+    "bdapi_oauth2_error_invalid_scope.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "870330b19733ae8a8d77c0420237ea43"
+    },
+    "bdapi_oauth2_error_unauthorized_client.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "652122103181aa2752efaecab300edf0"
+    },
+    "bdapi_oauth2_error_unsupported_grant_type.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "746020de8d7ed6467d307c063e15362e"
+    },
+    "bdapi_oauth2_error_unsupported_response_type.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "cb7c0e685ae4f06a7d59dba8b9526dc0"
+    },
+    "bdapi_only_accepts_post_requests.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "a830766e0d0c74739f421176ffc5a189"
+    },
+    "bdapi_please_confirm_to_authorize_access.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "c2c231c0b6e1a403cbb68f90360f132c"
+    },
+    "bdapi_please_confirm_to_authorize_access_auto.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "7da2f3cf0c8413bc87aa5bf34b78bdaa"
+    },
+    "bdapi_redirect_uri.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "27499763cc523271e74f32ff4f740a7f"
+    },
+    "bdapi_refresh_token_add.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "d2efb5f925740c8bf99d427720d7be8d"
+    },
+    "bdapi_refresh_token_edit.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "2c319230e9410aad5760a9341c7dfd72"
+    },
+    "bdapi_refresh_token_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "ea3644f15371d252c9ec80532b24c3bb"
+    },
+    "bdapi_refresh_token_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "ce58297e37e3bb7a2956a33716c23475"
+    },
+    "bdapi_refresh_token_text.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "ce58297e37e3bb7a2956a33716c23475"
+    },
+    "bdapi_request_must_authorize_to_encrypt.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "669f8e35dd1f369ace5dae1b997aa438"
+    },
+    "bdapi_requested_client_not_found.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "bfbf83bdff82a69c2b80b4c90303ec84"
+    },
+    "bdapi_requested_scopes.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "f262e8f8c4ab45246e59fb4f89e2ba41"
+    },
+    "bdapi_requested_user_group_not_found.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "5f427411a81233bb0b7b45a468a11109"
+    },
+    "bdapi_requires_upload_x.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "cb4f4ba5151dea146ab0c89f352d750c"
+    },
+    "bdapi_revoke.txt": {
+        "global_cache": false,
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "e4c27e9d17bd34073a120ad7bba9e8f4"
+    },
+    "bdapi_scope.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "5d113f2038d289f391614c39043629e8"
+    },
+    "bdapi_scope_admincp.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "504b4b5a7ef4daf18a2fd726015b28a4"
+    },
+    "bdapi_scope_conversate.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "01f32e12ad16daf7446ef2934f2b1a13"
+    },
+    "bdapi_scope_post.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "938ee37831193f5ba2e4aef21bc9dc92"
+    },
+    "bdapi_scope_read.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "8e232569dc4d66a9342f2274b1f41fe8"
+    },
+    "bdapi_scope_usercp.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "b6f477420ad193e4e57618952e8570e9"
+    },
+    "bdapi_slash_batch_requires_json.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "fb0d1eb2316a30f4aef20628b3f650b9"
+    },
+    "bdapi_slash_conversation_messages_attachments_requires_ids.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "30ecbbcc636d95fbfc3a13a2983074d1"
+    },
+    "bdapi_slash_lost_password_requires_username_or_email.txt": {
+        "global_cache": false,
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "4bd8aaee0b63c55bfdbf342746a5d67f"
+    },
+    "bdapi_slash_posts_attachments_requires_ids.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "a45bd6337fe42280f7e8f5d8a6495e79"
+    },
+    "bdapi_slash_search_requires_q.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "6bd7463cea5befd13d46ff23867efb1b"
+    },
+    "bdapi_slash_users_denied_dob.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "38ce5361fa0db71f443bd15d9a0b52e8"
+    },
+    "bdapi_slash_users_denied_user_group.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "612f94d29c40c7c079e0adf58b80cdd4"
+    },
+    "bdapi_slash_users_denied_user_title.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "25406015c61f1038abb3e4b799bda72d"
+    },
+    "bdapi_slash_users_denied_username.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "b25f974a4dc3f39dabdeddecc00f4bbf"
+    },
+    "bdapi_slash_users_requires_password_old.txt": {
+        "global_cache": false,
+        "version_id": 2000012,
+        "version_string": "2.0.0 Alpha 2",
+        "hash": "da72b878e0cc6a6c185793da2e1291c4"
+    },
+    "bdapi_subscribe_date.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "6ca7a1cede3de9e51efca478481ed7ff"
+    },
+    "bdapi_subscription_add.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "3c3abafb39d6241b6f3987671d4b1046"
+    },
+    "bdapi_subscription_callback_is_required.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "5c7f526ae5fe93c8e6b73bee2f6439a8"
+    },
+    "bdapi_subscription_cannot_verify_intent_of_subscriber.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "8295d1375bc34e2ca897761198c9f978"
+    },
+    "bdapi_subscription_edit.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "235b6b481ed9141defc633427336b9a2"
+    },
+    "bdapi_subscription_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "4ca2c509994c2776d0880357b4e8e5be"
+    },
+    "bdapi_subscription_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "787ad0b7a17de4ad6b1711bbf8d79fcb"
+    },
+    "bdapi_subscription_mode_must_valid.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "9add525b43640f1ac42bd76c8f6ae1f2"
+    },
+    "bdapi_subscription_topic.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "25812bf456959aa5f28dc570f341a3ba"
+    },
+    "bdapi_subscription_topic_not_recognized.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "09dcae9a170966cee2820d69a15e1e1b"
+    },
+    "bdapi_token_add.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "78ca1c060956bd43a69992189f26225e"
+    },
+    "bdapi_token_edit.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "1d02c60e69b6b2ee71c7b150256e8af7"
+    },
+    "bdapi_token_entities.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "3b5b5feef66adc0768f35b724a334827"
+    },
+    "bdapi_token_entity.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "5bc7ab301074148dc708229c5ad54fc6"
+    },
+    "bdapi_token_text.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "459a6f79ad9b13cbcb5f692d2cc7a94d"
+    },
+    "bdapi_update_scope.txt": {
+        "global_cache": false,
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "12dd7e892975d9eadad8649aa4b4e795"
+    },
+    "bdapi_update_scope_explain.txt": {
+        "global_cache": false,
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "2e785349e3b77a5d6bab2179fd21842a"
+    },
+    "bdapi_whitelisted_domains.txt": {
+        "global_cache": false,
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "d76ef1890c94b62626e72a1ec02f525a"
+    },
+    "bdapi_whitelisted_domains_explain.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "c2dec20d1853caee52c94e0ef0132e9e"
+    },
+    "bdapi_x_replied_in_the_conversation_y.txt": {
+        "global_cache": false,
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "9c5f04d09ff92059d1c4b2d71c4cae52"
+    },
+    "bdapi_you_will_be_redirected_x.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "cedda3e52b20658c4d4e15780b44105c"
+    },
+    "cron_entry.bdApiCleanUpHourly.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "42e7eafeb3c952760353720fcef891c0"
+    },
+    "option.bdApi_authCodeTTL.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "b6625714888627165777b2080daa5269"
+    },
+    "option.bdApi_cors.txt": {
+        "global_cache": false,
+        "version_id": 2000013,
+        "version_string": "2.0.0 Alpha 3",
+        "hash": "f32e6135189e1780b06505465eecaa60"
+    },
+    "option.bdApi_logRetentionDays.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "54e0d0669a98f808307c323e0dad0da9"
+    },
+    "option.bdApi_paramLimitDefault.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "3a036587014068642e9d40fca05b0c22"
+    },
+    "option.bdApi_paramLimitMax.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "bb359a5b51ddfa790521e8346dd306b3"
+    },
+    "option.bdApi_paramPageMax.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "adaf87680c83c38ec9d56867abb630f4"
+    },
+    "option.bdApi_refreshTokenTTLDays.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "767beea1c2eb64b1d650159a2794b16c"
+    },
+    "option.bdApi_restrictAccess.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "34faac305878c1caba32fa0e4ced9e23"
+    },
+    "option.bdApi_subscriptionColumnThreadPost.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "fe9f53ebf9e0f327b320f7f473092458"
+    },
+    "option.bdApi_subscriptionColumnUser.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "715282f33c5ff53d7c9d34d9a2d91917"
+    },
+    "option.bdApi_subscriptionColumnUserNotification.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "5d0a9594de833f95228d4d0dd10fc61c"
+    },
+    "option.bdApi_subscriptionThreadPost.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "8d435865582087e724337475d2811ed8"
+    },
+    "option.bdApi_subscriptionUser.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "9cedd12b812b4581f976de5792cf7cb8"
+    },
+    "option.bdApi_subscriptionUserNotification.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "94394be1ad3ba0d2da3aef58e5d2b4a9"
+    },
+    "option.bdApi_tokenTTL.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "41f6cd1daf504b93ffde06aa9e45ef4b"
+    },
+    "option.bdApi_userNotificationConversation.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "a8023022c2be5cab44fd75415f2cc346"
+    },
+    "option_explain.bdApi_authCodeTTL.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "ba56fdafd8809f135ed9aabc6599fd56"
+    },
+    "option_explain.bdApi_cors.txt": {
+        "global_cache": false,
+        "version_id": 2000013,
+        "version_string": "2.0.0 Alpha 3",
+        "hash": "f89a4fb8e37f6de3702730af93c7371b"
+    },
+    "option_explain.bdApi_logRetentionDays.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "ce2abbaa56705c706a1daf101250549f"
+    },
+    "option_explain.bdApi_paramLimitDefault.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "ba8cea81b0d1512f58c7725e3528bae7"
+    },
+    "option_explain.bdApi_paramLimitMax.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "cb1485735ed198f46df25ab731b115a5"
+    },
+    "option_explain.bdApi_paramPageMax.txt": {
+        "global_cache": false,
+        "version_id": 2000011,
+        "version_string": "2.0.0 Alpha 1",
+        "hash": "06ed2a9928d193e8d79efb8875e1ea20"
+    },
+    "option_explain.bdApi_refreshTokenTTLDays.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "95fd017260d08b3bf38f271c7b9876b0"
+    },
+    "option_explain.bdApi_restrictAccess.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "b616b9028b34d09facb37b7aefd8429c"
+    },
+    "option_explain.bdApi_subscriptionColumnThreadPost.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "790a6f22442d9f25263ce0ec7ee3c5b4"
+    },
+    "option_explain.bdApi_subscriptionColumnUser.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "1bf3fb6c3e6baf14d27f14f15f91003c"
+    },
+    "option_explain.bdApi_subscriptionColumnUserNotification.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "88f8cea9f33a0fb261759be3a31681b9"
+    },
+    "option_explain.bdApi_subscriptionThreadPost.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "6b4a0ec66486d95cd6e4396972bb227f"
+    },
+    "option_explain.bdApi_subscriptionUser.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "2c41c7e8c33f1011f61068af2d42d11a"
+    },
+    "option_explain.bdApi_subscriptionUserNotification.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "67c6effff4559ae323a7ca080e7ce762"
+    },
+    "option_explain.bdApi_tokenTTL.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "5ce5b570bba867e981e38d8d284ecc18"
+    },
+    "option_explain.bdApi_userNotificationConversation.txt": {
+        "global_cache": false,
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "9933da44ff5c288a90f730af8973657c"
+    },
+    "option_group.bdApi.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "caa09fcc5fecfa1a8a0af20151f7d195"
+    },
+    "option_group_description.bdApi.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "d41d8cd98f00b204e9800998ecf8427e"
+    },
+    "permission.general_bdApi_clientNew.txt": {
+        "global_cache": false,
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "4d347f22959e9fb406f375d0744e9db5"
+    }
+}
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApi.txt b/_output/phrases/admin_navigation.XfrocksApi.txt
new file mode 100644
index 00000000..7a095357
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApi.txt
@@ -0,0 +1 @@
+API
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiAuthCodes.txt b/_output/phrases/admin_navigation.XfrocksApiAuthCodes.txt
new file mode 100644
index 00000000..1bcf19fe
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiAuthCodes.txt
@@ -0,0 +1 @@
+Auth codes
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiClients.txt b/_output/phrases/admin_navigation.XfrocksApiClients.txt
new file mode 100644
index 00000000..3cbbf674
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiClients.txt
@@ -0,0 +1 @@
+API clients
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiLogs.txt b/_output/phrases/admin_navigation.XfrocksApiLogs.txt
new file mode 100644
index 00000000..9701e322
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiLogs.txt
@@ -0,0 +1 @@
+Logs
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiRefreshTokens.txt b/_output/phrases/admin_navigation.XfrocksApiRefreshTokens.txt
new file mode 100644
index 00000000..486c3865
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiRefreshTokens.txt
@@ -0,0 +1 @@
+Refresh tokens
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiSubscriptions.txt b/_output/phrases/admin_navigation.XfrocksApiSubscriptions.txt
new file mode 100644
index 00000000..a3ffb5c1
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiSubscriptions.txt
@@ -0,0 +1 @@
+Subscriptions
\ No newline at end of file
diff --git a/_output/phrases/admin_navigation.XfrocksApiTokens.txt b/_output/phrases/admin_navigation.XfrocksApiTokens.txt
new file mode 100644
index 00000000..31221463
--- /dev/null
+++ b/_output/phrases/admin_navigation.XfrocksApiTokens.txt
@@ -0,0 +1 @@
+Access tokens
\ No newline at end of file
diff --git a/_output/phrases/admin_permission.bdApi.txt b/_output/phrases/admin_permission.bdApi.txt
new file mode 100644
index 00000000..70b082cd
--- /dev/null
+++ b/_output/phrases/admin_permission.bdApi.txt
@@ -0,0 +1 @@
+[bd] API: Manage the API
\ No newline at end of file
diff --git a/_output/phrases/bdapi_api_access_tokens.txt b/_output/phrases/bdapi_api_access_tokens.txt
new file mode 100644
index 00000000..624129d2
--- /dev/null
+++ b/_output/phrases/bdapi_api_access_tokens.txt
@@ -0,0 +1 @@
+API Access Tokens
\ No newline at end of file
diff --git a/_output/phrases/bdapi_auth_code_add.txt b/_output/phrases/bdapi_auth_code_add.txt
new file mode 100644
index 00000000..496fc719
--- /dev/null
+++ b/_output/phrases/bdapi_auth_code_add.txt
@@ -0,0 +1 @@
+Add new auth code
\ No newline at end of file
diff --git a/_output/phrases/bdapi_auth_code_edit.txt b/_output/phrases/bdapi_auth_code_edit.txt
new file mode 100644
index 00000000..dd69cd01
--- /dev/null
+++ b/_output/phrases/bdapi_auth_code_edit.txt
@@ -0,0 +1 @@
+Edit auth code
\ No newline at end of file
diff --git a/_output/phrases/bdapi_auth_code_entities.txt b/_output/phrases/bdapi_auth_code_entities.txt
new file mode 100644
index 00000000..1bcf19fe
--- /dev/null
+++ b/_output/phrases/bdapi_auth_code_entities.txt
@@ -0,0 +1 @@
+Auth codes
\ No newline at end of file
diff --git a/_output/phrases/bdapi_auth_code_entity.txt b/_output/phrases/bdapi_auth_code_entity.txt
new file mode 100644
index 00000000..ae1a15c5
--- /dev/null
+++ b/_output/phrases/bdapi_auth_code_entity.txt
@@ -0,0 +1 @@
+Auth code
\ No newline at end of file
diff --git a/_output/phrases/bdapi_auth_code_text.txt b/_output/phrases/bdapi_auth_code_text.txt
new file mode 100644
index 00000000..3a45ef53
--- /dev/null
+++ b/_output/phrases/bdapi_auth_code_text.txt
@@ -0,0 +1 @@
+Authentication code
\ No newline at end of file
diff --git a/_output/phrases/bdapi_authorize_access.txt b/_output/phrases/bdapi_authorize_access.txt
new file mode 100644
index 00000000..0f56eb98
--- /dev/null
+++ b/_output/phrases/bdapi_authorize_access.txt
@@ -0,0 +1 @@
+Authorize Access
\ No newline at end of file
diff --git a/_output/phrases/bdapi_callback.txt b/_output/phrases/bdapi_callback.txt
new file mode 100644
index 00000000..b622561e
--- /dev/null
+++ b/_output/phrases/bdapi_callback.txt
@@ -0,0 +1 @@
+Callback
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_add.txt b/_output/phrases/bdapi_client_add.txt
new file mode 100644
index 00000000..38e1a1c6
--- /dev/null
+++ b/_output/phrases/bdapi_client_add.txt
@@ -0,0 +1 @@
+Add new client
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_description.txt b/_output/phrases/bdapi_client_description.txt
new file mode 100644
index 00000000..1b3ff1ef
--- /dev/null
+++ b/_output/phrases/bdapi_client_description.txt
@@ -0,0 +1 @@
+Description
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_edit.txt b/_output/phrases/bdapi_client_edit.txt
new file mode 100644
index 00000000..8e0f5748
--- /dev/null
+++ b/_output/phrases/bdapi_client_edit.txt
@@ -0,0 +1 @@
+Edit API client
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_entities.txt b/_output/phrases/bdapi_client_entities.txt
new file mode 100644
index 00000000..bb4fd08b
--- /dev/null
+++ b/_output/phrases/bdapi_client_entities.txt
@@ -0,0 +1 @@
+API Clients
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_entity.txt b/_output/phrases/bdapi_client_entity.txt
new file mode 100644
index 00000000..33d9c01c
--- /dev/null
+++ b/_output/phrases/bdapi_client_entity.txt
@@ -0,0 +1 @@
+API Client
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_id.txt b/_output/phrases/bdapi_client_id.txt
new file mode 100644
index 00000000..c7a23786
--- /dev/null
+++ b/_output/phrases/bdapi_client_id.txt
@@ -0,0 +1 @@
+API key
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_name.txt b/_output/phrases/bdapi_client_name.txt
new file mode 100644
index 00000000..822b601c
--- /dev/null
+++ b/_output/phrases/bdapi_client_name.txt
@@ -0,0 +1 @@
+Client name
\ No newline at end of file
diff --git a/_output/phrases/bdapi_client_secret.txt b/_output/phrases/bdapi_client_secret.txt
new file mode 100644
index 00000000..497d1030
--- /dev/null
+++ b/_output/phrases/bdapi_client_secret.txt
@@ -0,0 +1 @@
+API secret
\ No newline at end of file
diff --git a/_output/phrases/bdapi_column_x_table_y_not_found_for_field_z.txt b/_output/phrases/bdapi_column_x_table_y_not_found_for_field_z.txt
new file mode 100644
index 00000000..add7c582
--- /dev/null
+++ b/_output/phrases/bdapi_column_x_table_y_not_found_for_field_z.txt
@@ -0,0 +1 @@
+Database column `{table}`.`{column}` could not be found for option {field}.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_expire_date.txt b/_output/phrases/bdapi_expire_date.txt
new file mode 100644
index 00000000..a050c134
--- /dev/null
+++ b/_output/phrases/bdapi_expire_date.txt
@@ -0,0 +1 @@
+Expire date
\ No newline at end of file
diff --git a/_output/phrases/bdapi_home.txt b/_output/phrases/bdapi_home.txt
new file mode 100644
index 00000000..4d1aa321
--- /dev/null
+++ b/_output/phrases/bdapi_home.txt
@@ -0,0 +1 @@
+API Access
\ No newline at end of file
diff --git a/_output/phrases/bdapi_invalid_facebook_token.txt b/_output/phrases/bdapi_invalid_facebook_token.txt
new file mode 100644
index 00000000..9dc93e6e
--- /dev/null
+++ b/_output/phrases/bdapi_invalid_facebook_token.txt
@@ -0,0 +1 @@
+Cannot verify Facebook token.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_last_used.txt b/_output/phrases/bdapi_last_used.txt
new file mode 100644
index 00000000..96af3115
--- /dev/null
+++ b/_output/phrases/bdapi_last_used.txt
@@ -0,0 +1 @@
+Last used
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_entities.txt b/_output/phrases/bdapi_log_entities.txt
new file mode 100644
index 00000000..9701e322
--- /dev/null
+++ b/_output/phrases/bdapi_log_entities.txt
@@ -0,0 +1 @@
+Logs
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_entity.txt b/_output/phrases/bdapi_log_entity.txt
new file mode 100644
index 00000000..dce45887
--- /dev/null
+++ b/_output/phrases/bdapi_log_entity.txt
@@ -0,0 +1 @@
+Log
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_entry.txt b/_output/phrases/bdapi_log_entry.txt
new file mode 100644
index 00000000..d32ac367
--- /dev/null
+++ b/_output/phrases/bdapi_log_entry.txt
@@ -0,0 +1 @@
+Log Entry
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_ip_address.txt b/_output/phrases/bdapi_log_ip_address.txt
new file mode 100644
index 00000000..4958c399
--- /dev/null
+++ b/_output/phrases/bdapi_log_ip_address.txt
@@ -0,0 +1 @@
+IP Address
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_request_data.txt b/_output/phrases/bdapi_log_request_data.txt
new file mode 100644
index 00000000..fb6cac8c
--- /dev/null
+++ b/_output/phrases/bdapi_log_request_data.txt
@@ -0,0 +1 @@
+Request Data
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_request_date.txt b/_output/phrases/bdapi_log_request_date.txt
new file mode 100644
index 00000000..311482f8
--- /dev/null
+++ b/_output/phrases/bdapi_log_request_date.txt
@@ -0,0 +1 @@
+Request Date
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_request_method.txt b/_output/phrases/bdapi_log_request_method.txt
new file mode 100644
index 00000000..e9c1bedb
--- /dev/null
+++ b/_output/phrases/bdapi_log_request_method.txt
@@ -0,0 +1 @@
+Request Method
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_request_uri.txt b/_output/phrases/bdapi_log_request_uri.txt
new file mode 100644
index 00000000..03f8c5e9
--- /dev/null
+++ b/_output/phrases/bdapi_log_request_uri.txt
@@ -0,0 +1 @@
+Request URI
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_response_code.txt b/_output/phrases/bdapi_log_response_code.txt
new file mode 100644
index 00000000..3ecaf12f
--- /dev/null
+++ b/_output/phrases/bdapi_log_response_code.txt
@@ -0,0 +1 @@
+Response Code
\ No newline at end of file
diff --git a/_output/phrases/bdapi_log_response_output.txt b/_output/phrases/bdapi_log_response_output.txt
new file mode 100644
index 00000000..9ef713ae
--- /dev/null
+++ b/_output/phrases/bdapi_log_response_output.txt
@@ -0,0 +1 @@
+Response Output
\ No newline at end of file
diff --git a/_output/phrases/bdapi_no_facebook_association_found.txt b/_output/phrases/bdapi_no_facebook_association_found.txt
new file mode 100644
index 00000000..4e4d9882
--- /dev/null
+++ b/_output/phrases/bdapi_no_facebook_association_found.txt
@@ -0,0 +1 @@
+No user has been registered with this Facebook account.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_access_denied.txt b/_output/phrases/bdapi_oauth2_error_access_denied.txt
new file mode 100644
index 00000000..b88a44b1
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_access_denied.txt
@@ -0,0 +1 @@
+Access denied.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_invalid_client.txt b/_output/phrases/bdapi_oauth2_error_invalid_client.txt
new file mode 100644
index 00000000..f504f7c2
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_invalid_client.txt
@@ -0,0 +1 @@
+Invalid client.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_invalid_grant.txt b/_output/phrases/bdapi_oauth2_error_invalid_grant.txt
new file mode 100644
index 00000000..a79391ba
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_invalid_grant.txt
@@ -0,0 +1 @@
+Invalid OAuth2 grant.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_invalid_scope.txt b/_output/phrases/bdapi_oauth2_error_invalid_scope.txt
new file mode 100644
index 00000000..afc3a3c1
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_invalid_scope.txt
@@ -0,0 +1 @@
+Invalid OAuth2 scope.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_unauthorized_client.txt b/_output/phrases/bdapi_oauth2_error_unauthorized_client.txt
new file mode 100644
index 00000000..b88a44b1
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_unauthorized_client.txt
@@ -0,0 +1 @@
+Access denied.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_unsupported_grant_type.txt b/_output/phrases/bdapi_oauth2_error_unsupported_grant_type.txt
new file mode 100644
index 00000000..afa5c02d
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_unsupported_grant_type.txt
@@ -0,0 +1 @@
+Unsupported OAuth2 grant type.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_oauth2_error_unsupported_response_type.txt b/_output/phrases/bdapi_oauth2_error_unsupported_response_type.txt
new file mode 100644
index 00000000..c3abeccd
--- /dev/null
+++ b/_output/phrases/bdapi_oauth2_error_unsupported_response_type.txt
@@ -0,0 +1 @@
+Unsupported OAuth2 response type.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_only_accepts_post_requests.txt b/_output/phrases/bdapi_only_accepts_post_requests.txt
new file mode 100644
index 00000000..95feb2d4
--- /dev/null
+++ b/_output/phrases/bdapi_only_accepts_post_requests.txt
@@ -0,0 +1 @@
+This entry point only accepts POST requests.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_please_confirm_to_authorize_access.txt b/_output/phrases/bdapi_please_confirm_to_authorize_access.txt
new file mode 100644
index 00000000..1dcac4b1
--- /dev/null
+++ b/_output/phrases/bdapi_please_confirm_to_authorize_access.txt
@@ -0,0 +1 @@
+Please confirm to grant access to the listed client with the following permissions
\ No newline at end of file
diff --git a/_output/phrases/bdapi_please_confirm_to_authorize_access_auto.txt b/_output/phrases/bdapi_please_confirm_to_authorize_access_auto.txt
new file mode 100644
index 00000000..4201d64d
--- /dev/null
+++ b/_output/phrases/bdapi_please_confirm_to_authorize_access_auto.txt
@@ -0,0 +1 @@
+You are trying to authorize with no `client_id` therefore a random client of yours is being used. For security reason, the implicit grant flow is used and no other flows are available. Please confirm to continue.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_redirect_uri.txt b/_output/phrases/bdapi_redirect_uri.txt
new file mode 100644
index 00000000..b2e77f15
--- /dev/null
+++ b/_output/phrases/bdapi_redirect_uri.txt
@@ -0,0 +1 @@
+Redirect URI
\ No newline at end of file
diff --git a/_output/phrases/bdapi_refresh_token_add.txt b/_output/phrases/bdapi_refresh_token_add.txt
new file mode 100644
index 00000000..def6ff72
--- /dev/null
+++ b/_output/phrases/bdapi_refresh_token_add.txt
@@ -0,0 +1 @@
+Add refresh token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_refresh_token_edit.txt b/_output/phrases/bdapi_refresh_token_edit.txt
new file mode 100644
index 00000000..23921e62
--- /dev/null
+++ b/_output/phrases/bdapi_refresh_token_edit.txt
@@ -0,0 +1 @@
+Edit refresh token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_refresh_token_entities.txt b/_output/phrases/bdapi_refresh_token_entities.txt
new file mode 100644
index 00000000..486c3865
--- /dev/null
+++ b/_output/phrases/bdapi_refresh_token_entities.txt
@@ -0,0 +1 @@
+Refresh tokens
\ No newline at end of file
diff --git a/_output/phrases/bdapi_refresh_token_entity.txt b/_output/phrases/bdapi_refresh_token_entity.txt
new file mode 100644
index 00000000..64c3da0a
--- /dev/null
+++ b/_output/phrases/bdapi_refresh_token_entity.txt
@@ -0,0 +1 @@
+Refresh token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_refresh_token_text.txt b/_output/phrases/bdapi_refresh_token_text.txt
new file mode 100644
index 00000000..64c3da0a
--- /dev/null
+++ b/_output/phrases/bdapi_refresh_token_text.txt
@@ -0,0 +1 @@
+Refresh token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_request_must_authorize_to_encrypt.txt b/_output/phrases/bdapi_request_must_authorize_to_encrypt.txt
new file mode 100644
index 00000000..628d85d1
--- /dev/null
+++ b/_output/phrases/bdapi_request_must_authorize_to_encrypt.txt
@@ -0,0 +1 @@
+Request must be authorized to encrypt data.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_requested_client_not_found.txt b/_output/phrases/bdapi_requested_client_not_found.txt
new file mode 100644
index 00000000..ae0e37db
--- /dev/null
+++ b/_output/phrases/bdapi_requested_client_not_found.txt
@@ -0,0 +1 @@
+The requested API client could not be found.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_requested_scopes.txt b/_output/phrases/bdapi_requested_scopes.txt
new file mode 100644
index 00000000..01eae2d5
--- /dev/null
+++ b/_output/phrases/bdapi_requested_scopes.txt
@@ -0,0 +1 @@
+Requested permissions
\ No newline at end of file
diff --git a/_output/phrases/bdapi_requested_user_group_not_found.txt b/_output/phrases/bdapi_requested_user_group_not_found.txt
new file mode 100644
index 00000000..6234a6a0
--- /dev/null
+++ b/_output/phrases/bdapi_requested_user_group_not_found.txt
@@ -0,0 +1 @@
+Requested user group could not be found.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_requires_upload_x.txt b/_output/phrases/bdapi_requires_upload_x.txt
new file mode 100644
index 00000000..9f3c0a1d
--- /dev/null
+++ b/_output/phrases/bdapi_requires_upload_x.txt
@@ -0,0 +1 @@
+This request requires file upload `{field}`.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_revoke.txt b/_output/phrases/bdapi_revoke.txt
new file mode 100644
index 00000000..0fc729aa
--- /dev/null
+++ b/_output/phrases/bdapi_revoke.txt
@@ -0,0 +1 @@
+Revoke access
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope.txt b/_output/phrases/bdapi_scope.txt
new file mode 100644
index 00000000..595d376f
--- /dev/null
+++ b/_output/phrases/bdapi_scope.txt
@@ -0,0 +1 @@
+Scope
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope_admincp.txt b/_output/phrases/bdapi_scope_admincp.txt
new file mode 100644
index 00000000..f7fb6a02
--- /dev/null
+++ b/_output/phrases/bdapi_scope_admincp.txt
@@ -0,0 +1 @@
+Manage system-wide settings
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope_conversate.txt b/_output/phrases/bdapi_scope_conversate.txt
new file mode 100644
index 00000000..32549c9c
--- /dev/null
+++ b/_output/phrases/bdapi_scope_conversate.txt
@@ -0,0 +1 @@
+Read and start/reply to your conversations
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope_post.txt b/_output/phrases/bdapi_scope_post.txt
new file mode 100644
index 00000000..9cbfec36
--- /dev/null
+++ b/_output/phrases/bdapi_scope_post.txt
@@ -0,0 +1 @@
+Post contents (threads, posts) on behalf of you
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope_read.txt b/_output/phrases/bdapi_scope_read.txt
new file mode 100644
index 00000000..be542c8a
--- /dev/null
+++ b/_output/phrases/bdapi_scope_read.txt
@@ -0,0 +1 @@
+Read information (forums, threads, posts) with your account's permissions
\ No newline at end of file
diff --git a/_output/phrases/bdapi_scope_usercp.txt b/_output/phrases/bdapi_scope_usercp.txt
new file mode 100644
index 00000000..f0ffbd77
--- /dev/null
+++ b/_output/phrases/bdapi_scope_usercp.txt
@@ -0,0 +1 @@
+Change your account settings
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_batch_requires_json.txt b/_output/phrases/bdapi_slash_batch_requires_json.txt
new file mode 100644
index 00000000..e3e04fd5
--- /dev/null
+++ b/_output/phrases/bdapi_slash_batch_requires_json.txt
@@ -0,0 +1 @@
+/batch requires valid JSON for jobs input.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_conversation_messages_attachments_requires_ids.txt b/_output/phrases/bdapi_slash_conversation_messages_attachments_requires_ids.txt
new file mode 100644
index 00000000..1908b704
--- /dev/null
+++ b/_output/phrases/bdapi_slash_conversation_messages_attachments_requires_ids.txt
@@ -0,0 +1 @@
+/conversation-messages/attachments requires `conversation_id` for new message or `message_id` for existing message.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_lost_password_requires_username_or_email.txt b/_output/phrases/bdapi_slash_lost_password_requires_username_or_email.txt
new file mode 100644
index 00000000..84944c27
--- /dev/null
+++ b/_output/phrases/bdapi_slash_lost_password_requires_username_or_email.txt
@@ -0,0 +1 @@
+/lost-password requires `username` or `email`.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_posts_attachments_requires_ids.txt b/_output/phrases/bdapi_slash_posts_attachments_requires_ids.txt
new file mode 100644
index 00000000..b033d3f5
--- /dev/null
+++ b/_output/phrases/bdapi_slash_posts_attachments_requires_ids.txt
@@ -0,0 +1 @@
+/posts/attachments requires `thread_id` for new post or `post_id` for existing post.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_search_requires_q.txt b/_output/phrases/bdapi_slash_search_requires_q.txt
new file mode 100644
index 00000000..4551798f
--- /dev/null
+++ b/_output/phrases/bdapi_slash_search_requires_q.txt
@@ -0,0 +1 @@
+/search requires `q`.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_users_denied_dob.txt b/_output/phrases/bdapi_slash_users_denied_dob.txt
new file mode 100644
index 00000000..088a1ef3
--- /dev/null
+++ b/_output/phrases/bdapi_slash_users_denied_dob.txt
@@ -0,0 +1 @@
+You cannot change Date of Birth.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_users_denied_user_group.txt b/_output/phrases/bdapi_slash_users_denied_user_group.txt
new file mode 100644
index 00000000..f72ba46b
--- /dev/null
+++ b/_output/phrases/bdapi_slash_users_denied_user_group.txt
@@ -0,0 +1 @@
+You cannot change User Group.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_users_denied_user_title.txt b/_output/phrases/bdapi_slash_users_denied_user_title.txt
new file mode 100644
index 00000000..e6ede3e2
--- /dev/null
+++ b/_output/phrases/bdapi_slash_users_denied_user_title.txt
@@ -0,0 +1 @@
+You cannot change `user_title`.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_users_denied_username.txt b/_output/phrases/bdapi_slash_users_denied_username.txt
new file mode 100644
index 00000000..1e68120d
--- /dev/null
+++ b/_output/phrases/bdapi_slash_users_denied_username.txt
@@ -0,0 +1 @@
+You cannot change `username`.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_slash_users_requires_password_old.txt b/_output/phrases/bdapi_slash_users_requires_password_old.txt
new file mode 100644
index 00000000..dbd98f89
--- /dev/null
+++ b/_output/phrases/bdapi_slash_users_requires_password_old.txt
@@ -0,0 +1 @@
+PUT /users/:userId requires a valid `password_old`. Usage of `password_algo` is also highly recommended.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscribe_date.txt b/_output/phrases/bdapi_subscribe_date.txt
new file mode 100644
index 00000000..e8b5bf94
--- /dev/null
+++ b/_output/phrases/bdapi_subscribe_date.txt
@@ -0,0 +1 @@
+Subscribe date
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_add.txt b/_output/phrases/bdapi_subscription_add.txt
new file mode 100644
index 00000000..9386f5db
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_add.txt
@@ -0,0 +1 @@
+Add new subscription
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_callback_is_required.txt b/_output/phrases/bdapi_subscription_callback_is_required.txt
new file mode 100644
index 00000000..2019f00b
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_callback_is_required.txt
@@ -0,0 +1 @@
+`hub.callback` is required.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_cannot_verify_intent_of_subscriber.txt b/_output/phrases/bdapi_subscription_cannot_verify_intent_of_subscriber.txt
new file mode 100644
index 00000000..8e8f2fe2
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_cannot_verify_intent_of_subscriber.txt
@@ -0,0 +1 @@
+Cannot verify intent of subscriber.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_edit.txt b/_output/phrases/bdapi_subscription_edit.txt
new file mode 100644
index 00000000..ed79e889
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_edit.txt
@@ -0,0 +1 @@
+Edit subscription
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_entities.txt b/_output/phrases/bdapi_subscription_entities.txt
new file mode 100644
index 00000000..a3ffb5c1
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_entities.txt
@@ -0,0 +1 @@
+Subscriptions
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_entity.txt b/_output/phrases/bdapi_subscription_entity.txt
new file mode 100644
index 00000000..7318df14
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_entity.txt
@@ -0,0 +1 @@
+Subscription
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_mode_must_valid.txt b/_output/phrases/bdapi_subscription_mode_must_valid.txt
new file mode 100644
index 00000000..1764d43e
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_mode_must_valid.txt
@@ -0,0 +1 @@
+`hub.mode` must be either "subscribe" or "unsubscribe".
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_topic.txt b/_output/phrases/bdapi_subscription_topic.txt
new file mode 100644
index 00000000..9d8b5e15
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_topic.txt
@@ -0,0 +1 @@
+Topic
\ No newline at end of file
diff --git a/_output/phrases/bdapi_subscription_topic_not_recognized.txt b/_output/phrases/bdapi_subscription_topic_not_recognized.txt
new file mode 100644
index 00000000..c733483f
--- /dev/null
+++ b/_output/phrases/bdapi_subscription_topic_not_recognized.txt
@@ -0,0 +1 @@
+`hub.topic` could not be recognized.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_token_add.txt b/_output/phrases/bdapi_token_add.txt
new file mode 100644
index 00000000..90ac8519
--- /dev/null
+++ b/_output/phrases/bdapi_token_add.txt
@@ -0,0 +1 @@
+Add access token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_token_edit.txt b/_output/phrases/bdapi_token_edit.txt
new file mode 100644
index 00000000..27c9696b
--- /dev/null
+++ b/_output/phrases/bdapi_token_edit.txt
@@ -0,0 +1 @@
+Edit access token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_token_entities.txt b/_output/phrases/bdapi_token_entities.txt
new file mode 100644
index 00000000..31221463
--- /dev/null
+++ b/_output/phrases/bdapi_token_entities.txt
@@ -0,0 +1 @@
+Access tokens
\ No newline at end of file
diff --git a/_output/phrases/bdapi_token_entity.txt b/_output/phrases/bdapi_token_entity.txt
new file mode 100644
index 00000000..a814427d
--- /dev/null
+++ b/_output/phrases/bdapi_token_entity.txt
@@ -0,0 +1 @@
+Access token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_token_text.txt b/_output/phrases/bdapi_token_text.txt
new file mode 100644
index 00000000..3171e493
--- /dev/null
+++ b/_output/phrases/bdapi_token_text.txt
@@ -0,0 +1 @@
+Token
\ No newline at end of file
diff --git a/_output/phrases/bdapi_update_scope.txt b/_output/phrases/bdapi_update_scope.txt
new file mode 100644
index 00000000..5078ff04
--- /dev/null
+++ b/_output/phrases/bdapi_update_scope.txt
@@ -0,0 +1 @@
+Update permissions
\ No newline at end of file
diff --git a/_output/phrases/bdapi_update_scope_explain.txt b/_output/phrases/bdapi_update_scope_explain.txt
new file mode 100644
index 00000000..3761f07f
--- /dev/null
+++ b/_output/phrases/bdapi_update_scope_explain.txt
@@ -0,0 +1 @@
+You can review and/or change {name}'s permissions below. Click {revoke} to completely remove {name} access to your account.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_whitelisted_domains.txt b/_output/phrases/bdapi_whitelisted_domains.txt
new file mode 100644
index 00000000..f24b99b4
--- /dev/null
+++ b/_output/phrases/bdapi_whitelisted_domains.txt
@@ -0,0 +1 @@
+Whitelisted domains
\ No newline at end of file
diff --git a/_output/phrases/bdapi_whitelisted_domains_explain.txt b/_output/phrases/bdapi_whitelisted_domains_explain.txt
new file mode 100644
index 00000000..c8e217f8
--- /dev/null
+++ b/_output/phrases/bdapi_whitelisted_domains_explain.txt
@@ -0,0 +1 @@
+In addition to Redirect URI, the system will also allow redirection to these domains. Each domain must be in a new line and may have wildcard, for example: "*.domain.com". To enable redirection to all domains, use "*" although it is not recommended for security reason.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_x_replied_in_the_conversation_y.txt b/_output/phrases/bdapi_x_replied_in_the_conversation_y.txt
new file mode 100644
index 00000000..f597b93a
--- /dev/null
+++ b/_output/phrases/bdapi_x_replied_in_the_conversation_y.txt
@@ -0,0 +1 @@
+{name} replied in the conversation {title}.
\ No newline at end of file
diff --git a/_output/phrases/bdapi_you_will_be_redirected_x.txt b/_output/phrases/bdapi_you_will_be_redirected_x.txt
new file mode 100644
index 00000000..34bfaa68
--- /dev/null
+++ b/_output/phrases/bdapi_you_will_be_redirected_x.txt
@@ -0,0 +1 @@
+You will be redirected back to <a href="{redirectUri}">{clientName}</a>.
\ No newline at end of file
diff --git a/_output/phrases/cron_entry.bdApiCleanUpHourly.txt b/_output/phrases/cron_entry.bdApiCleanUpHourly.txt
new file mode 100644
index 00000000..375f6eee
--- /dev/null
+++ b/_output/phrases/cron_entry.bdApiCleanUpHourly.txt
@@ -0,0 +1 @@
+[bd] API: Hourly clean up
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_authCodeTTL.txt b/_output/phrases/option.bdApi_authCodeTTL.txt
new file mode 100644
index 00000000..ddc39bc5
--- /dev/null
+++ b/_output/phrases/option.bdApi_authCodeTTL.txt
@@ -0,0 +1 @@
+Authentication Code TTL
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_cors.txt b/_output/phrases/option.bdApi_cors.txt
new file mode 100644
index 00000000..a47ae576
--- /dev/null
+++ b/_output/phrases/option.bdApi_cors.txt
@@ -0,0 +1 @@
+Enable CORS
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_logRetentionDays.txt b/_output/phrases/option.bdApi_logRetentionDays.txt
new file mode 100644
index 00000000..4baf34d0
--- /dev/null
+++ b/_output/phrases/option.bdApi_logRetentionDays.txt
@@ -0,0 +1 @@
+Log Retention
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_paramLimitDefault.txt b/_output/phrases/option.bdApi_paramLimitDefault.txt
new file mode 100644
index 00000000..b0cd218f
--- /dev/null
+++ b/_output/phrases/option.bdApi_paramLimitDefault.txt
@@ -0,0 +1 @@
+Default `limit`
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_paramLimitMax.txt b/_output/phrases/option.bdApi_paramLimitMax.txt
new file mode 100644
index 00000000..93a012f9
--- /dev/null
+++ b/_output/phrases/option.bdApi_paramLimitMax.txt
@@ -0,0 +1 @@
+Maximum `limit`
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_paramPageMax.txt b/_output/phrases/option.bdApi_paramPageMax.txt
new file mode 100644
index 00000000..4c8cd9a4
--- /dev/null
+++ b/_output/phrases/option.bdApi_paramPageMax.txt
@@ -0,0 +1 @@
+Maximum `page`
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_refreshTokenTTLDays.txt b/_output/phrases/option.bdApi_refreshTokenTTLDays.txt
new file mode 100644
index 00000000..4db961fd
--- /dev/null
+++ b/_output/phrases/option.bdApi_refreshTokenTTLDays.txt
@@ -0,0 +1 @@
+Refresh Token TTL
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_restrictAccess.txt b/_output/phrases/option.bdApi_restrictAccess.txt
new file mode 100644
index 00000000..015aa634
--- /dev/null
+++ b/_output/phrases/option.bdApi_restrictAccess.txt
@@ -0,0 +1 @@
+Restrict Access
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionColumnThreadPost.txt b/_output/phrases/option.bdApi_subscriptionColumnThreadPost.txt
new file mode 100644
index 00000000..d460fb57
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionColumnThreadPost.txt
@@ -0,0 +1 @@
+Subscription column thread post
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionColumnUser.txt b/_output/phrases/option.bdApi_subscriptionColumnUser.txt
new file mode 100644
index 00000000..fefff351
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionColumnUser.txt
@@ -0,0 +1 @@
+Subscription column user
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionColumnUserNotification.txt b/_output/phrases/option.bdApi_subscriptionColumnUserNotification.txt
new file mode 100644
index 00000000..069eeccd
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionColumnUserNotification.txt
@@ -0,0 +1 @@
+Subscription column user notification
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionThreadPost.txt b/_output/phrases/option.bdApi_subscriptionThreadPost.txt
new file mode 100644
index 00000000..273e3ec8
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionThreadPost.txt
@@ -0,0 +1 @@
+Accept Subscription for Thread Post
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionUser.txt b/_output/phrases/option.bdApi_subscriptionUser.txt
new file mode 100644
index 00000000..7f40970b
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionUser.txt
@@ -0,0 +1 @@
+Accept Subscription for User
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_subscriptionUserNotification.txt b/_output/phrases/option.bdApi_subscriptionUserNotification.txt
new file mode 100644
index 00000000..0966cc13
--- /dev/null
+++ b/_output/phrases/option.bdApi_subscriptionUserNotification.txt
@@ -0,0 +1 @@
+Accept Subscription for User Alert
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_tokenTTL.txt b/_output/phrases/option.bdApi_tokenTTL.txt
new file mode 100644
index 00000000..e0dff750
--- /dev/null
+++ b/_output/phrases/option.bdApi_tokenTTL.txt
@@ -0,0 +1 @@
+Token TTL
\ No newline at end of file
diff --git a/_output/phrases/option.bdApi_userNotificationConversation.txt b/_output/phrases/option.bdApi_userNotificationConversation.txt
new file mode 100644
index 00000000..ae70b525
--- /dev/null
+++ b/_output/phrases/option.bdApi_userNotificationConversation.txt
@@ -0,0 +1 @@
+...also notify about conversation
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_authCodeTTL.txt b/_output/phrases/option_explain.bdApi_authCodeTTL.txt
new file mode 100644
index 00000000..d7f06f47
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_authCodeTTL.txt
@@ -0,0 +1 @@
+Enter the number of seconds before authentication code expires itself.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_cors.txt b/_output/phrases/option_explain.bdApi_cors.txt
new file mode 100644
index 00000000..c838382e
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_cors.txt
@@ -0,0 +1 @@
+Cross-Origin Resource Sharing (CORS) is a specification that enables truly open access across domain-boundaries. Enable this option to add the CORS headers to API responses. For more information regarding CORS, <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS" target="_blank" tabindex="-1">see here</a>.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_logRetentionDays.txt b/_output/phrases/option_explain.bdApi_logRetentionDays.txt
new file mode 100644
index 00000000..26c037b7
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_logRetentionDays.txt
@@ -0,0 +1 @@
+Enter the number of days to keep API log entries. If you don't want to log anything, enter 0 (zero).
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_paramLimitDefault.txt b/_output/phrases/option_explain.bdApi_paramLimitDefault.txt
new file mode 100644
index 00000000..7e7dbaf8
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_paramLimitDefault.txt
@@ -0,0 +1 @@
+Enter the default value for a request `limit` parameter.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_paramLimitMax.txt b/_output/phrases/option_explain.bdApi_paramLimitMax.txt
new file mode 100644
index 00000000..47f37c06
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_paramLimitMax.txt
@@ -0,0 +1 @@
+Enter the maximum value for a request `limit` parameter. Enter 0 to have no limit.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_paramPageMax.txt b/_output/phrases/option_explain.bdApi_paramPageMax.txt
new file mode 100644
index 00000000..6fc6dac0
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_paramPageMax.txt
@@ -0,0 +1 @@
+Enter the maximum value for a request `page` parameter. Enter 0 to have no limit.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_refreshTokenTTLDays.txt b/_output/phrases/option_explain.bdApi_refreshTokenTTLDays.txt
new file mode 100644
index 00000000..94ee681b
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_refreshTokenTTLDays.txt
@@ -0,0 +1 @@
+Enter the number of days before refresh token expires itself.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_restrictAccess.txt b/_output/phrases/option_explain.bdApi_restrictAccess.txt
new file mode 100644
index 00000000..5c367e47
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_restrictAccess.txt
@@ -0,0 +1 @@
+Enable this option to deny access to the API if no authentication is provided. Guest access it still possible with <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#one-time-token" target="_blank" tabindex="-1">One Time Token</a>.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionColumnThreadPost.txt b/_output/phrases/option_explain.bdApi_subscriptionColumnThreadPost.txt
new file mode 100644
index 00000000..da34175c
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionColumnThreadPost.txt
@@ -0,0 +1 @@
+You have to create the field with a query like this: <code>ALTER TABLE `xf_thread` ADD COLUMN `bdapi_thread_post` MEDIUMBLOB</code>
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionColumnUser.txt b/_output/phrases/option_explain.bdApi_subscriptionColumnUser.txt
new file mode 100644
index 00000000..302ce5fa
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionColumnUser.txt
@@ -0,0 +1 @@
+You have to create the field with a query like this: <code>ALTER TABLE `xf_user_option` ADD COLUMN `bdapi_user` MEDIUMBLOB</code>
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionColumnUserNotification.txt b/_output/phrases/option_explain.bdApi_subscriptionColumnUserNotification.txt
new file mode 100644
index 00000000..80421368
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionColumnUserNotification.txt
@@ -0,0 +1 @@
+You have to create the field with a query like this: <code>ALTER TABLE `xf_user_option` ADD COLUMN `bdapi_user_notification` MEDIUMBLOB</code>
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionThreadPost.txt b/_output/phrases/option_explain.bdApi_subscriptionThreadPost.txt
new file mode 100644
index 00000000..11e84ab9
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionThreadPost.txt
@@ -0,0 +1 @@
+Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for thread post changes.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionUser.txt b/_output/phrases/option_explain.bdApi_subscriptionUser.txt
new file mode 100644
index 00000000..3896e3be
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionUser.txt
@@ -0,0 +1 @@
+Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for user changes.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_subscriptionUserNotification.txt b/_output/phrases/option_explain.bdApi_subscriptionUserNotification.txt
new file mode 100644
index 00000000..02e6cc7a
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_subscriptionUserNotification.txt
@@ -0,0 +1 @@
+Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for user alerts.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_tokenTTL.txt b/_output/phrases/option_explain.bdApi_tokenTTL.txt
new file mode 100644
index 00000000..10e0ad97
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_tokenTTL.txt
@@ -0,0 +1 @@
+Enter the number of seconds before access token expires itself.
\ No newline at end of file
diff --git a/_output/phrases/option_explain.bdApi_userNotificationConversation.txt b/_output/phrases/option_explain.bdApi_userNotificationConversation.txt
new file mode 100644
index 00000000..f478f1eb
--- /dev/null
+++ b/_output/phrases/option_explain.bdApi_userNotificationConversation.txt
@@ -0,0 +1 @@
+Enable this option to notify clients, who subscribed for user alerts, about conversation messages.
\ No newline at end of file
diff --git a/_output/phrases/option_group.bdApi.txt b/_output/phrases/option_group.bdApi.txt
new file mode 100644
index 00000000..60676377
--- /dev/null
+++ b/_output/phrases/option_group.bdApi.txt
@@ -0,0 +1 @@
+[bd] API
\ No newline at end of file
diff --git a/_output/phrases/option_group_description.bdApi.txt b/_output/phrases/option_group_description.bdApi.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/_output/phrases/permission.general_bdApi_clientNew.txt b/_output/phrases/permission.general_bdApi_clientNew.txt
new file mode 100644
index 00000000..3d5caf0e
--- /dev/null
+++ b/_output/phrases/permission.general_bdApi_clientNew.txt
@@ -0,0 +1 @@
+Create API Client
\ No newline at end of file
diff --git a/_output/routes/_metadata.json b/_output/routes/_metadata.json
new file mode 100644
index 00000000..100d4ca9
--- /dev/null
+++ b/_output/routes/_metadata.json
@@ -0,0 +1,20 @@
+{
+    "admin_api-auth-codes_.json": {
+        "hash": "6469729b1d6acf6ef3a1e48305f42d4f"
+    },
+    "admin_api-clients_.json": {
+        "hash": "c63bed7a16636cfe3c555b020924faa4"
+    },
+    "admin_api-logs_.json": {
+        "hash": "9a6ce8d88083a19dc5b06a760e46cd2a"
+    },
+    "admin_api-refresh-tokens_.json": {
+        "hash": "b5facc5b7eb59abb5f8e6c414a72de28"
+    },
+    "admin_api-subscriptions_.json": {
+        "hash": "0ab4f31d2a6edbebc3d3aec220915b66"
+    },
+    "admin_api-tokens_.json": {
+        "hash": "dd62b157057503a970bab9bc7963cf80"
+    }
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-auth-codes_.json b/_output/routes/admin_api-auth-codes_.json
new file mode 100644
index 00000000..8107790e
--- /dev/null
+++ b/_output/routes/admin_api-auth-codes_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-auth-codes",
+    "sub_name": "",
+    "format": ":int<auth_code_id>/",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:AuthCode",
+    "context": "XfrocksApiAuthCodes",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-clients_.json b/_output/routes/admin_api-clients_.json
new file mode 100644
index 00000000..4d5fa57e
--- /dev/null
+++ b/_output/routes/admin_api-clients_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-clients",
+    "sub_name": "",
+    "format": ":str<client_id>",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:Client",
+    "context": "XfrocksApiClients",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-logs_.json b/_output/routes/admin_api-logs_.json
new file mode 100644
index 00000000..6aa21946
--- /dev/null
+++ b/_output/routes/admin_api-logs_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-logs",
+    "sub_name": "",
+    "format": ":int<log_id>/",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:Log",
+    "context": "XfrocksApiLogs",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-refresh-tokens_.json b/_output/routes/admin_api-refresh-tokens_.json
new file mode 100644
index 00000000..0a4a1000
--- /dev/null
+++ b/_output/routes/admin_api-refresh-tokens_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-refresh-tokens",
+    "sub_name": "",
+    "format": ":int<refresh_token_id>/",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:RefreshToken",
+    "context": "XfrocksApiRefreshTokens",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-subscriptions_.json b/_output/routes/admin_api-subscriptions_.json
new file mode 100644
index 00000000..02da1abb
--- /dev/null
+++ b/_output/routes/admin_api-subscriptions_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-subscriptions",
+    "sub_name": "",
+    "format": ":int<subscription_id>/",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:Subscription",
+    "context": "XfrocksApiSubscriptions",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/routes/admin_api-tokens_.json b/_output/routes/admin_api-tokens_.json
new file mode 100644
index 00000000..e352efbf
--- /dev/null
+++ b/_output/routes/admin_api-tokens_.json
@@ -0,0 +1,11 @@
+{
+    "route_type": "admin",
+    "route_prefix": "api-tokens",
+    "sub_name": "",
+    "format": ":int<token_id>/",
+    "build_class": "",
+    "build_method": "",
+    "controller": "Xfrocks\\Api:Token",
+    "context": "XfrocksApiTokens",
+    "action_prefix": ""
+}
\ No newline at end of file
diff --git a/_output/style_properties/_metadata.json b/_output/style_properties/_metadata.json
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/_output/style_properties/_metadata.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/_output/template_modifications/_metadata.json b/_output/template_modifications/_metadata.json
new file mode 100644
index 00000000..dfeee0f9
--- /dev/null
+++ b/_output/template_modifications/_metadata.json
@@ -0,0 +1,8 @@
+{
+    "public/bdapi_account_wrapper.json": {
+        "hash": "16511fd73c9bb411bde6d1e58cba4ad2"
+    },
+    "public/bdapi_bb_code_tag_quote.json": {
+        "hash": "52097cabf0e25e853199e19d3f5821bb"
+    }
+}
\ No newline at end of file
diff --git a/_output/template_modifications/public/bdapi_account_wrapper.json b/_output/template_modifications/public/bdapi_account_wrapper.json
new file mode 100644
index 00000000..64e3aad6
--- /dev/null
+++ b/_output/template_modifications/public/bdapi_account_wrapper.json
@@ -0,0 +1,9 @@
+{
+    "template": "account_wrapper",
+    "description": "Render account/api link.",
+    "execution_order": 10,
+    "enabled": true,
+    "action": "str_replace",
+    "find": "<!--[XF:settings_links:bottom]-->",
+    "replace": "$0\n<xf:include template=\"bdapi_account_wrapper\"/>"
+}
\ No newline at end of file
diff --git a/_output/template_modifications/public/bdapi_bb_code_tag_quote.json b/_output/template_modifications/public/bdapi_bb_code_tag_quote.json
new file mode 100644
index 00000000..795a5ab3
--- /dev/null
+++ b/_output/template_modifications/public/bdapi_bb_code_tag_quote.json
@@ -0,0 +1,9 @@
+{
+    "template": "bb_code_tag_quote",
+    "description": "Remove click to expand element",
+    "execution_order": 10,
+    "enabled": true,
+    "action": "str_replace",
+    "find": "<div class=\"bbCodeBlock-expandLink\"><a>{{ phrase('click_to_expand') }}</a></div>",
+    "replace": "<xf:if is=\"!$xf.isApi\">$0</xf:if>"
+}
\ No newline at end of file
diff --git a/_output/templates/_metadata.json b/_output/templates/_metadata.json
new file mode 100644
index 00000000..85a2ea3c
--- /dev/null
+++ b/_output/templates/_metadata.json
@@ -0,0 +1,82 @@
+{
+    "admin/bdapi_column_option_onoff.html": {
+        "version_id": 2000014,
+        "version_string": "2.0.0 Alpha 4",
+        "hash": "0e5d7f1abae08a24192f5de9ccaa93e1"
+    },
+    "admin/bdapi_entity_delete.html": {
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "6b4d4c43aec7949d705dd36d09a53a34"
+    },
+    "admin/bdapi_entity_edit.html": {
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "de660feaf87fef084cf1385e462941e5"
+    },
+    "admin/bdapi_entity_list.html": {
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "fcaa4500cbacc33f1a01cf5a82bc0359"
+    },
+    "admin/bdapi_log_view.html": {
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "36388a7eeb2c4a8a283f72a0f240205c"
+    },
+    "public/alert_conversation_message_bdapi_reply.html": {
+        "version_id": 2000031,
+        "version_string": "2.0.0 Beta 1",
+        "hash": "67dcd4612ef598f62cd3e40f2ea0d43c"
+    },
+    "public/bdapi_account_api.html": {
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "24b1f2999cdf3cce87d1949b57f12379"
+    },
+    "public/bdapi_account_api_client_add.html": {
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "8e76df6bb301823bd561cb526743b62b"
+    },
+    "public/bdapi_account_api_client_delete.html": {
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "93e134c48636c6ae563764857313750c"
+    },
+    "public/bdapi_account_api_client_edit.html": {
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "15f93fbf695c367999738d2e2032d73f"
+    },
+    "public/bdapi_account_api_update_scope.html": {
+        "version_id": 2000134,
+        "version_string": "2.0.1 Beta 4",
+        "hash": "49e8bd00eacaa13987d8373320def269"
+    },
+    "public/bdapi_account_authorize.html": {
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "3496982c65002dbbc051ec8bdb856e3c"
+    },
+    "public/bdapi_account_wrapper.html": {
+        "version_id": 2000000,
+        "version_string": "2.0.0",
+        "hash": "ba083eca31bf1baeb18250a651af8551"
+    },
+    "public/bdapi_client_macros.html": {
+        "version_id": 2000015,
+        "version_string": "2.0.0 Alpha 5",
+        "hash": "c8ede50f973589cb68608746320a2411"
+    },
+    "public/bdapi_misc_chr.html": {
+        "version_id": 2000132,
+        "version_string": "2.0.1 Beta 2",
+        "hash": "fdb22cdc038b213a303c7a835e82450e"
+    },
+    "public/bdapi_misc_chr_container.html": {
+        "version_id": 2000132,
+        "version_string": "2.0.1 Beta 2",
+        "hash": "59ee621597c8a9b6ff52d87b79fbb9fe"
+    }
+}
\ No newline at end of file
diff --git a/_output/templates/admin/bdapi_column_option_onoff.html b/_output/templates/admin/bdapi_column_option_onoff.html
new file mode 100644
index 00000000..703b5571
--- /dev/null
+++ b/_output/templates/admin/bdapi_column_option_onoff.html
@@ -0,0 +1,10 @@
+<xf:checkboxrow name="{$inputName}" label=""
+                hint="{$hintHtml}"
+                html="{$listedHtml}">
+    <xf:option checked="{$option.option_value}">
+        <xen:label>{$option.title}</xen:label>
+        <xen:hint>
+            {$explainHtml}
+        </xen:hint>
+    </xf:option>
+</xf:checkboxrow>
\ No newline at end of file
diff --git a/_output/templates/admin/bdapi_entity_delete.html b/_output/templates/admin/bdapi_entity_delete.html
new file mode 100644
index 00000000..0bf0ae30
--- /dev/null
+++ b/_output/templates/admin/bdapi_entity_delete.html
@@ -0,0 +1,19 @@
+<xf:title>{{ phrase('confirm_action') }}</xf:title>
+
+<xf:form action="{{ link($links.delete, $entity) }}" ajax="true" class="block">
+    <div class="block-container">
+        <div class="block-body">
+            <xf:inforow rowtype="confirm">
+                {{ phrase('please_confirm_that_you_want_to_delete_following:') }}
+                <strong>
+                    <xf:if is="{$links.edit}">
+                        <a href="{{ link($links.edit, $entity) }}">{$entityLabel}</a>
+                        <xf:else/>
+                        {$entityLabel}
+                    </xf:if>
+                </strong>
+            </xf:inforow>
+        </div>
+        <xf:submitrow rowtype="simple" icon="delete"/>
+    </div>
+</xf:form>
\ No newline at end of file
diff --git a/_output/templates/admin/bdapi_entity_edit.html b/_output/templates/admin/bdapi_entity_edit.html
new file mode 100644
index 00000000..45d00d12
--- /dev/null
+++ b/_output/templates/admin/bdapi_entity_edit.html
@@ -0,0 +1,101 @@
+<xf:if is="$entity.isInsert()">
+    <xf:title>{$phrases.add|raw}</xf:title>
+    <xf:else/>
+    <xf:title>{$phrases.edit|raw}: {$controller.getEntityLabel($entity)}</xf:title>
+</xf:if>
+
+<xf:pageaction if="$links.delete && $entity.isUpdate()">
+    <xf:button href="{{ link({$links.delete}, $entity) }}" icon="delete" overlay="true"/>
+</xf:pageaction>
+
+<xf:form action="{{ link({$links.save}) }}" ajax="true" class="block">
+    <div class="block-container">
+
+        <div class="block-body">
+            <xf:macro name="columns"
+					  arg-columns="{$columns}"
+					  arg-controller="{$controller}"
+					  arg-entity="{$entity}"/>
+
+			<xf:if is="{$macroTemplateEntityEdit}">
+				<xf:macro template="{$macroTemplateEntityEdit}" name="entity_edit"
+						  arg-columns="{$columns}"
+						  arg-controller="{$controller}"
+						  arg-entity="{$entity}"/>
+			</xf:if>
+        </div>
+
+        <xf:hiddenval name="entity_id" value="{{ $entity.getEntityId() }}"/>
+        <xf:submitrow sticky="true" icon="save"/>
+    </div>
+</xf:form>
+
+<xf:macro name="columns" arg-columns="!" arg-controller="!" arg-entity="!">
+	<xf:foreach loop="$columns" key="$columnName" value="$column">
+		<xf:if is="{$column._structureData.macroTemplate}">
+			<xf:macro template="{$column._structureData.macroTemplate}" name="entity_edit_column"
+					  arg-column="{$column}"
+					  arg-columnName="{$columnName}"
+					  arg-controller="{$controller}"
+					  arg-entity="{$entity}"/>
+
+			<xf:elseif is="!{$column.label}"/>
+			<xf:hiddenval name="hidden_columns[]" value="{$columnName}"/>
+			<xf:hiddenval name="hidden_{$column.name}" value="{$column.value}"/>
+
+			<xf:elseif is="{$column.tag} === 'number-box'"/>
+			<xf:numberboxrow label="{$column.label}"
+							 min="{$column.tagOptions.min}"
+							 name="{$column.name}"
+							 value="{$column.value}"/>
+
+			<xf:elseif is="{$column.tag} === 'radio'"/>
+			<xf:radiorow label="{$column.label}"
+						  name="{$column.name}"
+						  value="{$column.value}">
+				<xf:foreach loop="$column.tagOptions.choices" value="$choice">
+					<xf:option label="{$choice.label}"
+							   value="{$choice.value}"/>
+				</xf:foreach>
+			</xf:radiorow>
+
+			<xf:elseif is="{$column.tag} === 'select'"/>
+			<xf:selectrow label="{$column.label}"
+						  name="{$column.name}"
+						  value="{$column.value}">
+				<xf:foreach loop="$column.tagOptions.choices" value="$choice">
+					<xf:option disabled="{$choice.disabled}"
+							   label="{$choice.label}"
+							   value="{$choice.value}"/>
+				</xf:foreach>
+			</xf:selectrow>
+
+			<xf:elseif is="{$column.tag} === 'text-area'"/>
+			<xf:set var="$hint">
+				<xf:if is="{$column._structureData.html}">
+					{{ phrase('you_may_use_html') }}
+				</xf:if>
+			</xf:set>
+			<xf:textarearow hint="{{ trim($hint) }}"
+							label="{$column.label}"
+							name="{$column.name}"
+							value="{{ $entity.get($columnName) }}"/>
+
+			<xf:elseif is="{$column.tag} === 'text-box'"/>
+			<xf:textboxrow label="{$column.label}"
+						   maxlength="{$column._structureData.maxLength}"
+						   name="{$column.name}"
+						   value="{$column.value}"/>
+
+			<xf:elseif is="{$column.tag} === 'username'"/>
+			<xf:hiddenval name="username_columns[]" value="{$columnName}"/>
+			<xf:textboxrow ac="single"
+						   autocomplete="off"
+						   label="{$column.label}"
+						   maxlength="{{ max_length($xf.visitor, 'username') }}"
+						   name="username_{$column.name}"
+						   placeholder="{{ phrase('name...') }}"
+						   value="{$column.tagOptions.username}"/>
+		</xf:if>
+	</xf:foreach>
+</xf:macro>
\ No newline at end of file
diff --git a/_output/templates/admin/bdapi_entity_list.html b/_output/templates/admin/bdapi_entity_list.html
new file mode 100644
index 00000000..7ae3bde4
--- /dev/null
+++ b/_output/templates/admin/bdapi_entity_list.html
@@ -0,0 +1,84 @@
+<xf:title>{$phrases.entities|raw}</xf:title>
+
+<xf:if is="{$links.add}">
+    <xf:pageaction>
+        <xf:button href="{{ link($links.add) }}" icon="add">{$phrases.add|raw}</xf:button>
+    </xf:pageaction>
+</xf:if>
+
+<xf:if is="$macroTemplateEntityListFilters">
+	<xf:macro template="{$macroTemplateEntityListFilters}"
+			  name="entity_list_filters"
+			  arg-controller="{$controller}"
+			  arg-filters="{$filters}"/>
+</xf:if>
+
+<xf:if is="$entities is not empty">
+    <div class="block">
+		<xf:if contentcheck="true">
+			<div class="block-outer">
+				<xf:contentcheck>
+					<xf:if is="$links.quickFilter">
+						<xf:macro template="filter_macros" name="quick_filter"
+								  arg-class="block-outer-opposite"
+								  arg-ajax="{{ link($links.quickFilter) }}"
+								  arg-key="{$phrases.entity}" />
+					</xf:if>
+				</xf:contentcheck>
+			</div>
+		</xf:if>
+
+        <div class="block-container">
+            <div class="block-body">
+                <xf:datalist>
+                    <xf:macro name="entity_list"
+							  arg-controller="{$controller}"
+							  arg-entities="{$entities}"
+							  arg-links="{$links}" />
+					
+					<xf:if is="$filters._xfFilter && $total > $perPage">
+						<xf:datarow rowclass="dataList-row--note dataList-row--noHover js-filterForceShow">
+							<xf:cell colspan="2">{{ phrase('more_records_matching_filter_more_specific') }}</xf:cell>
+						</xf:datarow>
+					</xf:if>
+                </xf:datalist>
+                <div class="block-footer">
+                    <span class="block-footer-counter">{{ display_totals($entities, $total) }}</span>
+                </div>
+            </div>
+        </div>
+
+        <xf:pagenav page="{$page}" perpage="{$perPage}" total="{$total}"
+                    link="{$links.index}" params="{$filters.pageNavParams}"
+                    wrapperclass="block-outer block-outer--after"/>
+    </div>
+    <xf:else/>
+    <div class="blockMessage">{{ phrase('no_items_have_been_created_yet') }}</div>
+</xf:if>
+
+<xf:macro name="entity_list" arg-controller="!" arg-entities="!" arg-links="!">
+	<xf:foreach loop="{$entities}" value="$entity">
+		<xf:set var="$editLink" value="{{ $links.edit ? link($links.edit, $entity) : '' }}"/>
+		<xf:set var="$viewLink" value="{{ (empty($editLink) && $links.view) ? link($links.view, $entity) : '' }}"/>
+		<xf:set var="$popup">
+			<xf:if is="$macroTemplateEntityListItemPopup">
+				<xf:macro template="{$macroTemplateEntityListItemPopup}"
+						  name="entity_list_item_popup"
+						  arg-controller="{$controller}"
+						  arg-entity="{$entity}"/>
+			</xf:if>
+		</xf:set>
+		<xf:datarow delete="{{ $links.delete ? link($links.delete, $entity) : '' }}"
+					explain="{$controller.getEntityExplain($entity)}"
+					hint="{$controller.getEntityHint($entity)}"
+					href="{{ $editLink ?: $viewLink }}"
+					label="{$controller.getEntityLabel($entity)}"
+					overlay="{{ !!$viewLink }}">
+			<xf:if is="trim($popup)">
+				<xf:popup label="&#8226;&#8226;&#8226;">
+					{$popup|raw}
+				</xf:popup>
+			</xf:if>
+		</xf:datarow>
+	</xf:foreach>
+</xf:macro>
\ No newline at end of file
diff --git a/_output/templates/admin/bdapi_log_view.html b/_output/templates/admin/bdapi_log_view.html
new file mode 100644
index 00000000..dd4ad300
--- /dev/null
+++ b/_output/templates/admin/bdapi_log_view.html
@@ -0,0 +1,17 @@
+<xf:title>{{ phrase('bdapi_log_entry') }}</xf:title>
+
+<div class="block">
+    <div class="block-container">
+        <div class="block-body">
+            <xf:formrow label="{{ phrase('bdapi_client_id') }}">{$log.client_id}</xf:formrow>
+            <xf:formrow label="{{ phrase('user_name') }}">{{ $log.User ? $log.User.username : '' }}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_ip_address') }}">{$log.ip_address}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_request_date') }}"><xf:date time="$log.request_date" /></xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_request_method') }}">{$log.request_method}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_request_uri') }}">{$log.request_uri}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_request_data') }}">{{ dump($log.request_data) }}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_response_code') }}">{$log.response_code}</xf:formrow>
+            <xf:formrow label="{{ phrase('bdapi_log_response_output') }}">{{ dump($log.response_output) }}</xf:formrow>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/_output/templates/public/alert_conversation_message_bdapi_reply.html b/_output/templates/public/alert_conversation_message_bdapi_reply.html
new file mode 100644
index 00000000..acd8350d
--- /dev/null
+++ b/_output/templates/public/alert_conversation_message_bdapi_reply.html
@@ -0,0 +1,4 @@
+{{ phrase('bdapi_x_replied_in_the_conversation_y', {
+    'name': username_link($user, false, {'defaultname': $alert.username}),
+    'title': '<a href="' . link('conversations/messages', $content) . '" class="fauxBlockLink-blockLink">' . $content.Conversation.title . '</a>'
+}) }}
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_api.html b/_output/templates/public/bdapi_account_api.html
new file mode 100644
index 00000000..7af8164e
--- /dev/null
+++ b/_output/templates/public/bdapi_account_api.html
@@ -0,0 +1,80 @@
+<xf:title>{{ phrase('bdapi_home') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:pageaction if="{$xf.visitor.canAddApiClient()}">
+    <xf:button href="{{ link('account/api/client-add') }}" class="button--cta" data-xf-click="overlay" icon="add">
+        {{ phrase('bdapi_client_add') }}
+    </xf:button>
+</xf:pageaction>
+
+<div class="block">
+    <div class="block-container">
+        <h2 class="block-header">{{ phrase('bdapi_client_entities') }}</h2>
+        <ol class="block-body">
+            <xf:foreach loop="$clients" value="$client">
+                <li class="block-row block-row--separated">
+                    <xf:macro template="bdapi_client_macros" name="list_item" arg-client="{$client}"/>
+                </li>
+            </xf:foreach>
+        </ol>
+    </div>
+</div>
+
+<xf:if is="$userScopesClientIds is not empty">
+    <div class="block">
+        <div class="block-container">
+            <h2 class="block-header">{{ phrase('bdapi_api_access_tokens') }}</h2>
+            <ol class="block-body">
+                <xf:foreach loop="$userScopesClientIds" value="$record">
+                    <li class="block-row block-row--separated">
+                        <xf:macro name="user_scope_item" arg-client="{$record.client}"
+                                  arg-scopes="{$scopesPhrase}"
+                                  arg-record="{$record}"/>
+                    </li>
+                </xf:foreach>
+            </ol>
+        </div>
+
+        <div class="block-outer block-outer--after">
+            <xf:pagenav page="{$page}" perpage="{$perPage}" total="{$total}"
+                        link="account/api"/>
+        </div>
+    </div>
+</xf:if>
+
+<xf:macro name="user_scope_item" arg-client="!" arg-record="!" arg-scopes="!">
+    <div class="contentRow">
+        <div class="contentRow-main">
+            <h3 class="contentRow-header">
+                <a href="{$client.redirect_uri}" target="_blank">{$client.name}</a>
+            </h3>
+
+            <div class="contentRow-lesser" dir="auto">
+                {$client.description}
+                <ul>
+                    <xf:foreach loop="$record.user_scopes" key="$scope" value="$userScope">
+                        <li class="scope-{$scope}">{$scopes.{$userScope.scope}}</li>
+                    </xf:foreach>
+                </ul>
+            </div>
+
+            <div class="contentRow-minor">
+                <ul class="listInline listInline--bullet">
+                    <li>
+                        <dl class="pairs pairs--inline">
+                            <dt>{{ phrase('bdapi_last_used') }}</dt>
+                            <dd><xf:date time="{$record.last_issue_date}" /></dd>
+                        </dl>
+                    </li>
+                    <li>
+                        <a href="{{ link('account/api/update-scope', null, {'client_id': {$client.client_id}}) }}"
+                           data-xf-click="overlay">
+                            {{ phrase('bdapi_update_scope') }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</xf:macro>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_api_client_add.html b/_output/templates/public/bdapi_account_api_client_add.html
new file mode 100644
index 00000000..961985f1
--- /dev/null
+++ b/_output/templates/public/bdapi_account_api_client_add.html
@@ -0,0 +1,5 @@
+<xf:title>{{ phrase('bdapi_client_add') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:macro template="bdapi_client_macros" name="form" arg-client="{$client}"/>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_api_client_delete.html b/_output/templates/public/bdapi_account_api_client_delete.html
new file mode 100644
index 00000000..b8e9c51b
--- /dev/null
+++ b/_output/templates/public/bdapi_account_api_client_delete.html
@@ -0,0 +1,20 @@
+<xf:title>{{ phrase('confirm_action') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:form action="{{ link('account/api/client-delete') }}" ajax="true" class="block">
+    <div class="block-container">
+        <div class="block-body">
+            <xf:inforow rowtype="confirm">
+                {{ phrase('please_confirm_that_you_want_to_delete_following:') }}
+                <strong>
+                    <a href="{$client.redirect_uri}" target="_blank">{$client.name}</a>
+                    ({{ phrase('bdapi_client_id:') }} {$client.client_id})
+                </strong>
+            </xf:inforow>
+        </div>
+
+        <xf:hiddenval name="client_id" value="{$client.client_id}"/>
+        <xf:submitrow rowtype="simple" icon="delete"/>
+    </div>
+</xf:form>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_api_client_edit.html b/_output/templates/public/bdapi_account_api_client_edit.html
new file mode 100644
index 00000000..0f361e22
--- /dev/null
+++ b/_output/templates/public/bdapi_account_api_client_edit.html
@@ -0,0 +1,5 @@
+<xf:title>{{ phrase('bdapi_client_edit') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:macro template="bdapi_client_macros" name="form" arg-client="{$client}"/>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_api_update_scope.html b/_output/templates/public/bdapi_account_api_update_scope.html
new file mode 100644
index 00000000..ad2c5a1f
--- /dev/null
+++ b/_output/templates/public/bdapi_account_api_update_scope.html
@@ -0,0 +1,31 @@
+<xf:title>{{ phrase('bdapi_update_scope') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:form method="post" action="{{ link('account/api/update-scope') }}" ajax="true" class="block">
+    <div class="block-container">
+        <div class="block-body">
+            <xf:inforow rowtype="confirm">
+                {{ phrase('bdapi_update_scope_explain', {
+                    'name': '<a href="{$client.redirect_uri}" target="_blank">' . $client.name . '</a>',
+                    'revoke': phrase('bdapi_revoke')
+                }) }}
+            </xf:inforow>
+        </div>
+
+        <xf:checkboxrow label="">
+            <xf:foreach loop="$userScopes" value="$userScope">
+                <xf:option name="scopes[]" value="{$userScope.scope}"
+                           selected="{{ true }}">{$scopesPhrase.{$userScope.scope}}</xf:option>
+            </xf:foreach>
+        </xf:checkboxrow>
+
+        <xf:submitrow icon="save">
+            <xf:html>
+                <xf:button type="submit" name="revoke" value="1" class="button--link">{{ phrase('bdapi_revoke') }}</xf:button>
+            </xf:html>
+        </xf:submitrow>
+    </div>
+
+    <xf:hiddenval name="client_id">{$client.client_id}</xf:hiddenval>
+</xf:form>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_account_authorize.html b/_output/templates/public/bdapi_account_authorize.html
new file mode 100644
index 00000000..897e1550
--- /dev/null
+++ b/_output/templates/public/bdapi_account_authorize.html
@@ -0,0 +1,42 @@
+<xf:title>{{ phrase('bdapi_authorize_access') }}</xf:title>
+
+<xf:wrap template="account_wrapper"/>
+
+<xf:form action="{{ link('account/authorize', null, $linkParams) }}" class="block">
+    <div class="block-container">
+        <div class="block-body">
+            <xf:formrow label="">
+                <xf:if is="$clientIsAuto">
+                    {{ phrase('bdapi_please_confirm_to_authorize_access_auto') }}
+
+                    <xf:else/>
+                    {{ phrase('bdapi_please_confirm_to_authorize_access:') }}
+                </xf:if>
+            </xf:formrow>
+
+            <xf:formrow label="{{ phrase('bdapi_client_entity') }}"
+                        explain="{$client.description}">
+                {$client.name}
+            </xf:formrow>
+
+            <xf:checkboxrow label="{{ phrase('bdapi_requested_scopes') }}">
+                <xf:foreach loop="$needAuthScopes" key="$scopeId" value="$scopeDescription">
+                    <xf:option name="scopes[]" value="{$scopeId}" checked="1">
+                        {$scopeDescription}
+                    </xf:option>
+                </xf:foreach>
+            </xf:checkboxrow>
+
+            <xf:formrow label="">
+                {{ phrase('bdapi_you_will_be_redirected_x', {
+                'redirectUri': {$linkParams.redirect_uri},
+                'clientName': {$client.name}
+                }) }}
+            </xf:formrow>
+        </div>
+
+        <xf:hiddenval name="client_id" value="{$client.client_id}"/>
+
+        <xf:submitrow icon="lock" sticky="true" submit="{{ phrase('bdapi_authorize_access') }}"/>
+    </div>
+</xf:form>
diff --git a/_output/templates/public/bdapi_account_wrapper.html b/_output/templates/public/bdapi_account_wrapper.html
new file mode 100644
index 00000000..ad9543f1
--- /dev/null
+++ b/_output/templates/public/bdapi_account_wrapper.html
@@ -0,0 +1,3 @@
+<a class="blockLink {{ $pageSelected == 'api' ? 'is-selected' : '' }}" href="{{ link('account/api') }}">
+    {{ phrase('bdapi_home') }}
+</a>
\ No newline at end of file
diff --git a/_output/templates/public/bdapi_client_macros.html b/_output/templates/public/bdapi_client_macros.html
new file mode 100644
index 00000000..8f333330
--- /dev/null
+++ b/_output/templates/public/bdapi_client_macros.html
@@ -0,0 +1,72 @@
+<xf:macro name="list_item" arg-client="!">
+    <div class="contentRow">
+        <div class="contentRow-main">
+            <h3 class="contentRow-header">
+                <a href="{$client.redirect_uri}" target="_blank">{$client.name}</a>
+            </h3>
+
+            <div class="contentRow-lesser" dir="auto">
+                {$client.description}
+            </div>
+
+            <div class="contentRow-minor">
+                <ul class="listInline listInline--bullet">
+                    <li>
+                        <dl class="pairs pairs--inline">
+                            <dt>{{ phrase('bdapi_client_id') }}</dt>
+                            <dd>{$client.client_id}</dd>
+                        </dl>
+                    </li>
+                    <li>
+                        <dl class="pairs pairs--inline">
+                            <dt>{{ phrase('bdapi_client_secret') }}</dt>
+                            <dd>{$client.client_secret}</dd>
+                        </dl>
+                    </li>
+                    <li>
+                        <a href="{{ link('account/api/client-edit', null, {'client_id': {$client.client_id}}) }}"
+                           data-xf-click="overlay">
+                            {{ phrase('edit') }}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{{ link('account/api/client-delete', null, {'client_id': {$client.client_id}}) }}"
+                           data-xf-click="overlay">
+                            {{ phrase('delete') }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</xf:macro>
+
+<xf:macro name="form" arg-client="">
+    <xf:form action="{{ link('account/api/client-save') }}" class="block" ajax="true">
+        <div class="block-container">
+            <div class="block-body">
+                <xf:textboxrow label="{{ phrase('bdapi_client_name') }}" name="name" value="{$client.name}"/>
+
+                <xf:textarearow label="{{ phrase('bdapi_client_description') }}" name="description"
+                                value="{$client.description}"/>
+
+                <xf:textboxrow label="{{ phrase('bdapi_redirect_uri') }}"
+                               name="redirect_uri"
+                               type="url"
+                               value="{$client.redirect_uri}"/>
+
+                <xf:textarearow explain="{{ phrase('bdapi_whitelisted_domains_explain') }}"
+                                hint="{{ phrase('optional') }}"
+                                label="{{ phrase('bdapi_whitelisted_domains') }}"
+                                name="options[whitelisted_domains]"
+                                value="{$client.options.whitelisted_domains}"/>
+            </div>
+
+            <xf:if is="{$client.exists()}">
+                <xf:hiddenval name="client_id" value="{$client.client_id}"/>
+            </xf:if>
+
+            <xf:submitrow icon="save" sticky="true"/>
+        </div>
+    </xf:form>
+</xf:macro>
diff --git a/_output/templates/public/bdapi_misc_chr.html b/_output/templates/public/bdapi_misc_chr.html
new file mode 100644
index 00000000..70c2e87f
--- /dev/null
+++ b/_output/templates/public/bdapi_misc_chr.html
@@ -0,0 +1,38 @@
+<xf:page option="template" value="bdapi_misc_chr_container"/>
+
+<xf:if is="$requiredExternals.includeCss">
+    <xf:foreach loop="$requiredExternals.includeCss" key="$src" value="$_">
+        <xf:css src="{$src}"/>
+    </xf:foreach>
+</xf:if>
+
+<xf:if is="$requiredExternals.inlineCss">
+    <xf:foreach loop="$requiredExternals.inlineCss" value="$css">
+        <xf:css>{$css|raw}</xf:css>
+    </xf:foreach>
+</xf:if>
+
+<xf:if is="$requiredExternals.includeJs">
+    <xf:foreach loop="$requiredExternals.includeJs" key="$src" value="$_">
+        <xf:js src="{$src}"/>
+    </xf:foreach>
+</xf:if>
+
+<xf:if is="$requiredExternals.inlineJs">
+    <xf:foreach loop="$requiredExternals.inlineJs" value="$js">
+        <xf:js>{$js|raw}</xf:js>
+    </xf:foreach>
+</xf:if>
+
+<xf:if is="$requiredExternals.pageParams">
+    <xf:foreach loop="$requiredExternals.pageParams" key="$option" value="$value">
+        <xf:page option="{$option}" value="{$value}"/>
+    </xf:foreach>
+</xf:if>
+
+<xf:set var="$style">border: 0; margin: 0; padding: 0</xf:set>
+<div id="content" class="bdapi_misc_chr" style="{$style|raw}">
+    <div class="pageContent" style="{$style|raw}">
+        <div class="baseHtml" style="{$style|raw}">{$html|raw}</div>
+    </div>
+</div>
diff --git a/_output/templates/public/bdapi_misc_chr_container.html b/_output/templates/public/bdapi_misc_chr_container.html
new file mode 100644
index 00000000..4aeadb36
--- /dev/null
+++ b/_output/templates/public/bdapi_misc_chr_container.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html id="XF" lang="{$xf.language.language_code}" dir="{$xf.language.text_direction}"
+      data-app="api-chr"
+      data-template="{$template}"
+      data-container-key="{$containerKey}"
+      data-content-key="{$contentKey}"
+      data-logged-in="{{ $xf.visitor.user_id ? 'true' : 'false' }}"
+      data-cookie-prefix="{$xf.cookie.prefix}"
+      data-csrf="{{ csrf_token()|escape('js') }}"
+      class="has-no-js {{ $template ? 'template-' . $template : '' }}">
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+    <xf:macro template="helper_js_global" name="head" arg-app="public"/>
+</head>
+
+<body data-template="{$template}">
+{$content|raw}
+<xf:macro template="helper_js_global" name="body" arg-app="public" arg-jsState="{$jsState}"/>
+</body>
+</html>
\ No newline at end of file
diff --git a/addon.json b/addon.json
new file mode 100644
index 00000000..9c0268a0
--- /dev/null
+++ b/addon.json
@@ -0,0 +1,19 @@
+{
+    "legacy_addon_id": "bdApi",
+    "title": "[bd] API",
+    "description": "",
+    "version_id": 2020032,
+    "version_string": "2.2.0 Beta 2",
+    "dev": "",
+    "dev_url": "",
+    "faq_url": "",
+    "support_url": "",
+    "extra_urls": [],
+    "require": {
+        "XF": [
+            2020000,
+            "XenForo 2.2.0"
+        ]
+    },
+    "icon": ""
+}
diff --git a/android_demo/README.md b/android_demo/README.md
deleted file mode 100644
index 1508fda0..00000000
--- a/android_demo/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Moved to https://github.com/xfrocks/bdApi_Android
diff --git a/build.json b/build.json
new file mode 100644
index 00000000..ccdb9da8
--- /dev/null
+++ b/build.json
@@ -0,0 +1,8 @@
+{
+  "additional_files": [
+    "api/bootstrap.php",
+    "api/index.php",
+    "js/Xfrocks/Api"
+  ],
+  "minify": "*"
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..108bd6b5
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,20 @@
+{
+  "config": {
+    "platform": {
+      "php": "5.6.0"
+    }
+  },
+  "require": {
+    "league/oauth2-server": "4.1.7"
+  },
+  "replace": {
+    "league/event": "*"
+  },
+  "scripts": {
+    "build-release": "xf-addon--build-release Xfrocks/Api",
+    "export": "composer install --quiet && composer test && xf-dev--export--addon.sh Xfrocks/Api",
+    "export-only": "xf-dev--export--addon.sh Xfrocks/Api",
+    "quick-check": "export ADDON_DIR=/var/www/html/src/addons/Xfrocks/Api && devhelper-phpcs.sh $ADDON_DIR && devhelper-phpstan.sh $ADDON_DIR",
+    "test": "cmd-php.sh xfrocks-api:pre-test && cd _files/tests && composer install --quiet && composer test"
+  }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..769a787c
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,314 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "df749d439aab1bb644b5875ea054c501",
+    "packages": [
+        {
+            "name": "league/oauth2-server",
+            "version": "4.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth2-server.git",
+                "reference": "138524984ac472652c69399529a35b6595cf22d3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/138524984ac472652c69399529a35b6595cf22d3",
+                "reference": "138524984ac472652c69399529a35b6595cf22d3",
+                "shasum": ""
+            },
+            "require": {
+                "league/event": "~2.1",
+                "php": ">=5.4.0",
+                "symfony/http-foundation": "~2.4|~3.0"
+            },
+            "replace": {
+                "league/oauth2server": "*",
+                "lncd/oauth2": "*"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "4.3.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth2\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alex Bilbie",
+                    "email": "hello@alexbilbie.com",
+                    "homepage": "http://www.alexbilbie.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
+            "homepage": "http://oauth2.thephpleague.com/",
+            "keywords": [
+                "Authentication",
+                "api",
+                "auth",
+                "authorisation",
+                "authorization",
+                "oauth",
+                "oauth 2",
+                "oauth 2.0",
+                "oauth2",
+                "protect",
+                "resource",
+                "secure",
+                "server"
+            ],
+            "time": "2018-06-23T16:27:31+00:00"
+        },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v2.0.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
+                "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/random.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2019-01-03T20:59:08+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v3.4.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fbd216d2304b1a3fe38d6392b04729c8dd356359",
+                "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php70": "~1.6"
+            },
+            "require-dev": {
+                "symfony/expression-language": "~2.8|~3.0|~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony HttpFoundation Component",
+            "homepage": "https://symfony.com",
+            "time": "2020-05-16T13:15:54+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-06-06T08:46:27+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d",
+                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-06-06T08:46:27+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "5.6.0"
+    }
+}
diff --git a/node_pushserver/README.md b/node_pushserver/README.md
deleted file mode 100644
index 25a172ae..00000000
--- a/node_pushserver/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Moved to https://github.com/xfrocks/node_pubhubsubbub_pushserver
diff --git a/php_demo/.gitignore b/php_demo/.gitignore
deleted file mode 100644
index 5a38c413..00000000
--- a/php_demo/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.htaccess
-config.php
-vendor/
diff --git a/php_demo/Procfile b/php_demo/Procfile
deleted file mode 100644
index 60aaff09..00000000
--- a/php_demo/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: vendor/bin/heroku-php-apache2 ./
\ No newline at end of file
diff --git a/php_demo/composer.json b/php_demo/composer.json
deleted file mode 100644
index 9f6d4fb5..00000000
--- a/php_demo/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "require": {
-  },
-  "require-dev": {
-    "heroku/heroku-buildpack-php": "*"
-  }
-}
\ No newline at end of file
diff --git a/php_demo/composer.lock b/php_demo/composer.lock
deleted file mode 100644
index 23567b3d..00000000
--- a/php_demo/composer.lock
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "62f7e73a170916ea57aca93de4a57c11",
-    "packages": [
-
-    ],
-    "packages-dev": [
-        {
-            "name": "heroku/heroku-buildpack-php",
-            "version": "v66",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/heroku/heroku-buildpack-php.git",
-                "reference": "f23729a3c42764b389f80a9d387c211d6061de4f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/f23729a3c42764b389f80a9d387c211d6061de4f",
-                "reference": "f23729a3c42764b389f80a9d387c211d6061de4f",
-                "shasum": ""
-            },
-            "bin": [
-                "bin/heroku-hhvm-apache2",
-                "bin/heroku-hhvm-nginx",
-                "bin/heroku-php-apache2",
-                "bin/heroku-php-nginx"
-            ],
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "David Zuelke",
-                    "email": "dz@heroku.com"
-                }
-            ],
-            "description": "Toolkit for starting a PHP application locally, with or without foreman, using the same config for PHP/HHVM and Apache2/Nginx as on Heroku",
-            "homepage": "http://github.com/heroku/heroku-buildpack-php",
-            "keywords": [
-                "apache",
-                "apache2",
-                "foreman",
-                "heroku",
-                "hhvm",
-                "nginx",
-                "php"
-            ],
-            "time": "2015-03-05 20:37:15"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": [
-
-    ],
-    "platform": [
-
-    ],
-    "platform-dev": [
-
-    ]
-}
diff --git a/php_demo/config.php.template b/php_demo/config.php.template
deleted file mode 100644
index 6f7b4391..00000000
--- a/php_demo/config.php.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// API Root
-$config['api_root'] = '';
-
-// API Key
-$config['api_key'] = '';
-
-// API Secret
-$config['api_secret'] = '';
-
-// API Scope (separated by space)
-$config['api_scope'] = 'read';
\ No newline at end of file
diff --git a/php_demo/functions.php b/php_demo/functions.php
deleted file mode 100644
index 452fd0e2..00000000
--- a/php_demo/functions.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-
-session_start();
-
-function loadConfiguration()
-{
-    $config = array();
-
-    $path = dirname(__FILE__) . '/config.php';
-    if (file_exists($path)) {
-        require($path);
-        if (empty($config['api_root'])) {
-            $config = array();
-        }
-    }
-
-    if (!empty($_SESSION['ignore_config'])) {
-        $oldConfig = $config;
-        $config = $_SESSION;
-
-        if (!empty($oldConfig['api_root'])) {
-            $config['placeholder'] = $oldConfig;
-        }
-    }
-
-    return array_merge(array(
-        'api_root' => '',
-        'api_key' => '',
-        'api_secret' => '',
-        'api_scope' => '',
-
-        'placeholder' => array(
-            'api_root' => 'http://domain.com/xenforo/api',
-            'api_key' => 'abc123',
-            'api_secret' => 'xyz456',
-            'api_scope' => 'read',
-        ),
-
-        'ignore_config' => false,
-    ), $config);
-}
-
-function displaySetup()
-{
-    require(dirname(__FILE__) . '/setup.php');
-    exit;
-}
-
-function getBaseUrl()
-{
-    // idea from http://stackoverflow.com/questions/6768793/get-the-full-url-in-php
-    $ssl = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? true : false;
-    $sp = strtolower($_SERVER['SERVER_PROTOCOL']);
-    $protocol = substr($sp, 0, strpos($sp, '/')) . (($ssl) ? 's' : '');
-
-    $port = $_SERVER['SERVER_PORT'];
-    $port = ((!$ssl && $port == '80') || ($ssl && $port == '443')) ? '' : ':' . $port;
-
-    // using HTTP_POST may have some security implication
-    $host = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : null);
-    $host = isset($host) ? $host : $_SERVER['SERVER_NAME'] . $port;
-
-    $baseUrl = $protocol . '://' . $host . $_SERVER['REQUEST_URI'];
-    $baseUrl = preg_replace('#\?.*$#', '', $baseUrl);
-    $baseUrl = rtrim($baseUrl, '/');
-
-    return $baseUrl;
-}
-
-function getCallbackUrl()
-{
-    return sprintf(
-        '%s?action=callback',
-        getBaseUrl()
-    );
-}
-
-function generateJsSdkUrl($apiRoot)
-{
-    $url = sprintf(
-        '%s/index.php?assets/sdk.js',
-        $apiRoot
-    );
-
-    return $url;
-}
-
-function generateOneTimeToken($apiKey, $apiSecret, $userId = 0, $accessToken = '', $ttl = 86400)
-{
-    $timestamp = time() + $ttl;
-    $once = md5($userId . $timestamp . $accessToken . $apiSecret);
-
-    return sprintf('%d,%d,%s,%s', $userId, $timestamp, $once, $apiKey);
-}
-
-function makeRequest($url, $apiRoot, $accessToken)
-{
-    if (strpos($url, $apiRoot) === false) {
-        $url = sprintf(
-            '%s/index.php?%s&oauth_token=%s',
-            $apiRoot,
-            $url,
-            rawurlencode($accessToken)
-        );
-    }
-
-    $body = @file_get_contents($url);
-    $json = @json_decode($body, true);
-
-    return array($body, $json);
-}
-
-function makeSubscriptionRequest($config, $topic, $fwd, $accessToken = null)
-{
-    $subscriptionUrl = sprintf(
-        '%s/index.php?subscriptions',
-        $config['api_root']
-    );
-
-    $callbackUrl = sprintf(
-        '%s/subscriptions.php?fwd=%s',
-        rtrim(preg_replace('#index.php$#', '', getBaseUrl()), '/'),
-        rawurlencode($fwd)
-    );
-
-    $postFields = array(
-        'hub.callback' => $callbackUrl,
-        'hub.mode' => !empty($accessToken) ? 'subscribe' : 'unsubscribe',
-        'hub.topic' => $topic,
-        'oauth_token' => $accessToken,
-        'client_id' => $config['api_key'],
-    );
-
-    return array('response' => makeCurlPost($subscriptionUrl, $postFields, false));
-}
-
-function makeCurlPost($url, $postFields, $getJson = true)
-{
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-    $body = curl_exec($ch);
-    curl_close($ch);
-
-    if (!$getJson) {
-        return $body;
-    }
-
-    $json = @json_decode($body, true);
-    if (empty($json)) {
-        die('Unexpected response from server: ' . $body);
-    }
-
-    return $json;
-}
-
-function renderMessageForPostRequest($url, array $postFields)
-{
-    $message = 'It looks like you are testing a local installation. ';
-    $message .= 'Since this test server cannot reach yours, please run this command in your terminal ';
-    $message .= '(or equivalent) please:<br /><br />';
-    $message .= '<div class="code">curl -XPOST "' . $url . '" \\</div>';
-
-    $postFieldKeys = array_keys($postFields);
-    $lastFieldKey = array_pop($postFieldKeys);
-    foreach ($postFields as $postFieldKey => $postFieldValue) {
-        $message .= sprintf(
-            '<div class="code"> -F %s=%s%s</div>',
-            $postFieldKey,
-            $postFieldValue,
-            $postFieldKey === $lastFieldKey ? '' : ' \\'
-        );
-    }
-
-    return $message;
-}
-
-function renderMessageForJson($url, array $json)
-{
-    global $accessToken;
-    $html = str_replace(' ', '&nbsp;&nbsp;', var_export($json, true));
-
-    if (!empty($accessToken)) {
-        $offset = 0;
-        while (true) {
-            if (preg_match('#\'(?<link>http[^\']+)\'#', $html, $matches, PREG_OFFSET_CAPTURE, $offset)) {
-                $offset = $matches[0][1] + strlen($matches[0][0]);
-                $link = $matches['link'][0];
-                $replacement = null;
-
-                if (strpos($link, $accessToken) !== false) {
-                    // found a link
-                    $targetUrl = sprintf(
-                        '%s?action=request&url=%s&access_token=%s',
-                        getBaseUrl(),
-                        rawurlencode($link),
-                        rawurlencode($accessToken)
-                    );
-
-                    $replacement = sprintf('<a href="%s">%s</a>', $targetUrl, $link);
-                } elseif (substr($link, 0, 4) === 'http') {
-                    $replacement = sprintf('<a href="%1$s" target="_blank">%1$s</a>', $link);
-                }
-
-                if (!empty($replacement)) {
-                    $html = substr_replace(
-                        $html,
-                        $replacement,
-                        $matches['link'][1],
-                        strlen($matches['link'][0])
-                    );
-                    $offset = $matches[0][1] + strlen($replacement);
-                }
-            } else {
-                break;
-            }
-        }
-    }
-
-    return sprintf(
-        '<div class="request">Sent Request: %s</div><div class="response">Received Response: %s</div>',
-        $url,
-        nl2br($html)
-    );
-}
-
-function renderAccessTokenMessage($tokenUrl, array $json)
-{
-    global $config, $accessToken;
-
-    if (!empty($json['access_token'])) {
-        $accessToken = $json['access_token'];
-        $message = sprintf(
-            'Obtained access token successfully!<br />'
-            . 'Scopes: %s<br />'
-            . 'Expires At: %s<br />',
-            $json['scope'],
-            date('c', time() + $json['expires_in'])
-        );
-
-        if (!empty($json['refresh_token'])) {
-            $message .= sprintf('Refresh Token: <a href="index.php?action=refresh&refresh_token=%1$s">%1$s</a><br />', $json['refresh_token']);
-        } else {
-            $message .= sprintf('Refresh Token: N/A<br />');
-        }
-
-        list($body, $json) = makeRequest('index', $config['api_root'], $accessToken);
-        if (!empty($json['links'])) {
-            $message .= '<hr />' . renderMessageForJson('index', $json);
-        }
-    } else {
-        $message = renderMessageForJson($tokenUrl, $json);
-    }
-
-    return $message;
-}
-
-function isLocal($apiRoot) {
-    $apiRootHost = parse_url($apiRoot, PHP_URL_HOST);
-    $isLocal = in_array($apiRootHost, array(
-        'localhost',
-        '127.0.0.1',
-        'local.dev',
-    ));
-
-    return $isLocal;
-}
-
-function bitlyShorten($token, $url)
-{
-    $bitlyUrl = sprintf(
-        '%s?access_token=%s&longUrl=%s&domain=j.mp&format=txt',
-        'https://api-ssl.bitly.com/v3/shorten',
-        rawurlencode($token),
-        rawurlencode($url)
-    );
-
-    $body = @file_get_contents($bitlyUrl);
-    if (!empty($body)) {
-        $url = $body;
-    }
-
-    return $url;
-}
\ No newline at end of file
diff --git a/php_demo/html/footer.php b/php_demo/html/footer.php
deleted file mode 100644
index 691287b6..00000000
--- a/php_demo/html/footer.php
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>
-</html>
\ No newline at end of file
diff --git a/php_demo/html/form_request.php b/php_demo/html/form_request.php
deleted file mode 100644
index 7a1fcbc0..00000000
--- a/php_demo/html/form_request.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<form id="form_request" action="index.php?action=request" method="POST">
-    <label for="access_token_ctrl">Access Token</label><br/>
-    <input id="access_token_ctrl" type="text" name="access_token" value="<?php if (!empty($accessToken)) echo $accessToken; ?>"/><br/>
-    <br/>
-
-    <select name="url">
-        <option value="users/me">Get detailed information of authorized user (GET /users/me)</option>
-        <option value="navigation">Get list of navigation elements (GET /navigation)</option>
-    </select><br/>
-    <br/>
-
-    <input type="submit" value="Make API Request"/>
-</form>
\ No newline at end of file
diff --git a/php_demo/html/header.php b/php_demo/html/header.php
deleted file mode 100644
index d9f92336..00000000
--- a/php_demo/html/header.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<!doctype html>
-<html lang=en>
-<head>
-    <meta charset=utf-8>
-    <title>[bd] API - PHP Demo</title>
-    <style>
-        a {
-            color: blue;
-        }
-
-        input[type=text],
-        input[type=button] {
-            margin-right: 5px;
-            max-width: 90%;
-            width: 400px;
-        }
-
-        .code {
-            font-family: "Courier New", Courier, monospace;
-            white-space: pre;
-        }
-
-        .pl-e {
-            color: #795da3;
-        }
-
-        .pl-ent {
-            color: #63a35c;
-        }
-
-        .pl-k, .pl-s, .pl-st {
-            color: #a71d5d;
-        }
-
-        .pl-s1 {
-            color: #df5000;
-        }
-
-        .pl-s3 {
-            color: #0086b3;
-        }
-
-        div.request {
-            overflow: hidden;
-            padding: 5px;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            max-width: 100%;
-        }
-
-        div.response {
-            background: #d3d3d3;
-            max-height: 400px;
-            overflow: scroll;
-            padding: 5px;
-            white-space: nowrap;
-            width: 100%;
-        }
-
-        .implicit {
-            display: none;
-        }
-    </style>
-</head>
-<body>
-
-<?php if (!empty($config['api_root'])): ?>
-<h1><a href="<?php echo $config['api_root']; ?>" target="_blank"><?php echo $config['api_root']; ?></a></h1>
-
-<ul>
-    <li>API Key: <?php echo $config['api_key']; ?></li>
-    <li>API Secret: <?php echo $config['api_secret']; ?></li>
-    <li>API Scope: <?php echo $config['api_scope']; ?></li>
-    <?php if (empty($_SERVER['SCRIPT_NAME']) || basename($_SERVER['SCRIPT_NAME']) != 'setup.php'): ?>
-        <li><a href="setup.php">Re-setup</a></li>
-    <?php endif; ?>
-</ul>
-<hr/>
-<?php endif; ?>
\ No newline at end of file
diff --git a/php_demo/index.php b/php_demo/index.php
deleted file mode 100644
index e1394d0f..00000000
--- a/php_demo/index.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/*
-	This is a demo for [bd] API add-on for XenForo.
-	It includes a simple OAuth 2 authorization flow which has 3 actors (XenForo, User and Demo App):
-		1. Demo App sends User to an authorization page on XenForo website
-		2. User verifies the information and grant access
-		3. XenForo sends User back to a callback page on Demo App website
-		4. Demo App obtains an access token from XenForo server
-		5. Demo App can now make request on behalf of User
-*/
-
-require_once('functions.php');
-
-$config = loadConfiguration();
-if (empty($config['api_root'])) {
-    displaySetup();
-}
-
-$message = '';
-$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
-$accessToken = !empty($_REQUEST['access_token']) ? $_REQUEST['access_token'] : '';
-
-switch ($action) {
-    case 'callback':
-        // step 3
-        if (empty($_REQUEST['code'])) {
-            $message = 'Callback request must have `code` query parameter!';
-            break;
-        }
-
-        $tokenUrl = sprintf(
-            '%s/index.php?oauth/token',
-            $config['api_root']
-        );
-
-        $postFields = array(
-            'grant_type' => 'authorization_code',
-            'client_id' => $config['api_key'],
-            'client_secret' => $config['api_secret'],
-            'code' => $_REQUEST['code'],
-            'redirect_uri' => getCallbackUrl(),
-        );
-
-        if (isLocal($config['api_root']) && !isLocal(getBaseUrl())) {
-            $message = renderMessageForPostRequest($tokenUrl, $postFields);
-            $message .= '<br />Afterwards, you can test JavaScript by clicking the link below.';
-            break;
-        }
-
-        // step 4
-        $json = makeCurlPost($tokenUrl, $postFields);
-        $message = renderAccessTokenMessage($tokenUrl, $json);
-        break;
-    case 'refresh':
-        // this is the refresh token flow
-        if (empty($_REQUEST['refresh_token'])) {
-            $message = 'Refresh request must have `refresh_token` query parameter!';
-            break;
-        }
-
-        $tokenUrl = sprintf(
-            '%s/index.php?oauth/token',
-            $config['api_root']
-        );
-
-        $postFields = array(
-            'grant_type' => 'refresh_token',
-            'client_id' => $config['api_key'],
-            'client_secret' => $config['api_secret'],
-            'refresh_token' => $_REQUEST['refresh_token'],
-        );
-
-        $json = makeCurlPost($tokenUrl, $postFields);
-        $message = renderAccessTokenMessage($tokenUrl, $json);
-        break;
-    case 'request':
-        // step 5
-        if (!empty($accessToken) && !empty($_REQUEST['url'])) {
-            list($body, $json) = makeRequest($_REQUEST['url'], $config['api_root'], $accessToken);
-            if (empty($json)) {
-                $message = 'Unexpected response from server: ' . var_export($body, true);
-            } else {
-                $message = renderMessageForJson($_REQUEST['url'], $json);
-
-                if ($_REQUEST['url'] === 'users/me') {
-                    $topic = 'user_notification_' . $json['user']['user_id'];
-                }
-            }
-        }
-        break;
-    case 'subscribe':
-    case 'unsubscribe':
-        if (empty($_REQUEST['topic'])) {
-            $message = 'Subscription request must have `topic` parameter!';
-            break;
-        }
-        $topic = $_REQUEST['topic'];
-
-        if (empty($_REQUEST['fwd'])) {
-            $message = 'Subscription request must have `fwd` parameter!';
-            break;
-        }
-        $fwd = $_REQUEST['fwd'];
-
-        if ($action == 'subscribe') {
-            $json = makeSubscriptionRequest($config, $topic, $fwd, $accessToken);
-        } else {
-            $json = makeSubscriptionRequest($config, $topic, $fwd);
-        }
-
-        $message = renderMessageForJson($action, $json);
-        break;
-    case 'authorize':
-    default:
-        // step 1
-        $authorizeUrl = sprintf(
-            '%s/index.php?oauth/authorize&response_type=code&client_id=%s&scope=%s&redirect_uri=%s',
-            $config['api_root'],
-            rawurlencode($config['api_key']),
-            rawurlencode($config['api_scope']),
-            rawurlencode(getCallbackUrl())
-        );
-
-        $message = sprintf(
-            '<h3>Authorization (step 1)</h3>'
-            . '<a href="%s">Click here</a> to go to %s and start the authorizing flow.'
-            . ' Or <a href="jwt.php">click here</a> and try the JWT Bearer grant type.',
-            $authorizeUrl,
-            parse_url($authorizeUrl, PHP_URL_HOST)
-        );
-        break;
-}
-
-?>
-
-<?php require('html/header.php'); ?>
-
-<?php if (!empty($message)): ?>
-    <div class="message"><?php echo $message; ?></div>
-    <hr/>
-<?php endif; ?>
-
-<?php if (!empty($accessToken)): ?>
-    <h3>Test Sending Request</h3>
-    <?php require('html/form_request.php'); ?>
-    <hr/>
-
-    <h3>Test Subscriptions</h3>
-    <form action="index.php" method="POST">
-        <label>Action:</label>
-        <label>
-            <input type="radio" name="action" value="subscribe" checked="checked"/>
-            Subscribe
-        </label>
-        <label>
-            <input type="radio" name="action" value="unsubscribe"/>
-            Unsubscribe
-        </label>
-        <br/>
-
-        <label for="topic_ctrl">Topic</label><br/>
-        <input id="topic_ctrl" type="text" name="topic" placeholder="user_notification_xxx"
-               value="<?php echo (!empty($topic) ? $topic : ''); ?>"/><br/>
-        <br/>
-
-        <label for="fwd_ctrl">Forward Address</label><br/>
-        <input id="fwd_ctrl" type="text" name="fwd" placeholder="http://requestb.in/123456"
-               value="<?php echo (!empty($fwd) ? $fwd : ''); ?>"/><br/>
-        <br/>
-
-        <input type="submit" value="Subscribe / Unsubscribe"/>
-        <input type="hidden" name="access_token" value="<?php echo $accessToken; ?>"/><br/>
-    </form>
-    <hr/>
-<?php endif; ?>
-
-    <h3>Test JavaScript</h3>
-    <p>Click <a href="js.php">here</a></p>
-
-<?php require('html/footer.php'); ?>
\ No newline at end of file
diff --git a/php_demo/js.php b/php_demo/js.php
deleted file mode 100644
index 2581443b..00000000
--- a/php_demo/js.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-require_once('functions.php');
-
-$config = loadConfiguration();
-if (empty($config['api_root'])) {
-    displaySetup();
-}
-
-$sdkUrl = generateJsSdkUrl($config['api_root']);
-
-$implicitAuthorizeUrl = sprintf(
-    '%s/index.php?oauth/authorize&response_type=token&client_id=%s&scope=%s&redirect_uri=%s',
-    $config['api_root'],
-    rawurlencode($config['api_key']),
-    rawurlencode($config['api_scope']),
-    rawurlencode(getCallbackUrl())
-);
-
-$isCallback = false;
-if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'callback') {
-    $isCallback = true;
-}
-
-?>
-
-<?php require('html/header.php'); ?>
-
-    <h3>JavaScript SDK</h3>
-    <p>
-        The API system supports a simple JavaScript SDK which can be included into any web page and
-        perform callback to the API server. In this demo, click the button below to issue a
-        <span class="code">.isAuthorized()</span> check to see whether user is logged in
-        <strong>and</strong> has granted the specified scope.
-    </p>
-
-    <p>
-        The code looks something like this:<br />
-
-        <div class="code">&lt;<span class="pl-ent">script</span> <span class="pl-e">src</span>=<span class="pl-s1"><span class="pl-pds">"</span>js/jquery-1.11.2.min.js<span class="pl-pds">"</span></span>&gt;&lt;/<span class="pl-ent">script</span>&gt;</div>
-        <div class="code">&lt;<span class="pl-ent">script</span> <span class="pl-e">src</span>=<span class="pl-s1"><span class="pl-pds">"</span><a href="<?php echo $sdkUrl; ?>" target="_blank"><?php echo $sdkUrl; ?></a><span class="pl-pds">"</span></span>&gt;&lt;/<span class="pl-ent">script</span>&gt;</div>
-        <div class="code"><span class="pl-s2">&lt;<span class="pl-ent">script</span>&gt;</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;<span class="pl-s">var</span> api <span class="pl-k">=</span> <span class="pl-s3">window</span>.SDK;</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;api.init({ <span class="pl-s1"><span class="pl-pds">'</span>client_id<span class="pl-pds">'</span></span><span class="pl-k">:</span> <span class="pl-s1"><span class="pl-pds">'</span><?php echo $config['api_key']; ?><span class="pl-pds">'</span></span> });</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;api.isAuthorized(<span class="pl-s1"><span class="pl-pds">'</span><span id="scope_js"><?php echo $config['api_scope']; ?></span><span class="pl-pds">'</span></span>, <span class="pl-st">function</span> (<span class="pl-vpf">isAuthorized</span>, <span class="pl-vpf">apiData</span>) {</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;&nbsp;&nbsp;<span class="pl-k">if</span> (isAuthorized) {</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="pl-s3">alert</span>(<span class="pl-s1"><span class="pl-pds">'</span>Hi <span class="pl-pds">'</span></span> <span class="pl-k">+</span> apiData.username);</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;&nbsp;&nbsp;} <span class="pl-k">else</span> {</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="pl-s3">alert</span>(<span class="pl-s1"><span class="pl-pds">'</span>isAuthorized = false<span class="pl-pds">'</span></span>);</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;&nbsp;&nbsp;}</span></div>
-        <div class="code"><span class="pl-s2">&nbsp;&nbsp;}</span></div>
-        <div class="code"><span class="pl-s2">&lt;/<span class="pl-ent">script</span>&gt;</span></div>
-    </p>
-    <script src="js/jquery-1.11.2.min.js"></script>
-    <script src="<?php echo $sdkUrl; ?>"></script>
-    <script>
-        if (typeof window.SDK != 'undefined') {
-            var api = window.SDK;
-            api.init({
-                'client_id': '<?php echo $config['api_key']; ?>'
-            });
-
-            $(document).ready(function () {
-                var $jsForm = $('#form_js');
-                var $scope = $('#scope_ctrl');
-                var $jsScope = $('#scope_js');
-
-                $jsForm.submit(function (e) {
-                    e.preventDefault();
-
-                    var scope = $scope.val();
-
-                    api.isAuthorized(scope, function (isAuthorized, apiData) {
-                        if (isAuthorized) {
-                            alert('Hi ' + apiData.username);
-                        } else {
-                            alert('isAuthorized = false');
-                        }
-                    })
-                });
-
-                $scope.keyup(function() {
-                    $jsScope.text($scope.val().trim());
-                })
-            });
-        }
-    </script>
-
-    <hr/>
-
-    <form id="form_js">
-        <label for="scope_ctrl">Scope</label><br/>
-        <input id="scope_ctrl" type="text" name="scope" value="<?php echo $config['api_scope']; ?>"/><br/>
-        <br/>
-
-        <input type="submit" value=".isAuthorized()"/>
-    </form>
-
-    <hr />
-
-    <h3>Implicit Grant Type</h3>
-    <p>
-        Other than the traditional grant types, implicit allows more creative usages of the API system.
-        <a href="http://tools.ietf.org/html/rfc6749#section-4.2" target="_blank">Read more about it here</a>.
-    </p>
-
-    <?php if ($isCallback): ?>
-        <div class="implicit">
-            <h4>Token found from window.location.hash!</h4>
-            <?php require('html/form_request.php'); ?>
-        </div>
-
-        <script>
-            if (window.location.hash.length > 0) {
-                // just a quick (and dirty) way to extract the access token
-                var matches = window.location.hash.match(/access_token=([^&]+)&/);
-                if (matches !== null) {
-                    var accessToken = matches[1];
-
-                    $('.implicit').show();
-                    $('#access_token_ctrl').val(accessToken);
-                }
-            }
-        </script>
-    <?php endif; ?>
-
-    <p>
-        <a href="<?php echo $implicitAuthorizeUrl; ?>">Click here</a>
-        <?php if ($isCallback): ?>
-            to refresh the token.
-        <?php else: ?>
-            to start the authorizing flow.
-        <?php endif; ?>
-    </p>
-
-<?php require('html/footer.php'); ?>
\ No newline at end of file
diff --git a/php_demo/js/jquery-1.11.2.min.js b/php_demo/js/jquery-1.11.2.min.js
deleted file mode 100755
index 826372a2..00000000
--- a/php_demo/js/jquery-1.11.2.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.11.2 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.2",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
-return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)
-}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
-//# sourceMappingURL=jquery.min.map
\ No newline at end of file
diff --git a/php_demo/jwt.php b/php_demo/jwt.php
deleted file mode 100644
index 3d36d122..00000000
--- a/php_demo/jwt.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-require_once('functions.php');
-require_once('jwt_functions.php');
-
-$config = loadConfiguration();
-if (empty($config['api_root'])) {
-    displaySetup();
-}
-
-if (!empty($_REQUEST['action'])
-	&& $_REQUEST['action'] == 'obtain'
-	&& !empty($_REQUEST['private_key'])
-) {
-	$assertion = generateJwtAssertion(
-		$_REQUEST['private_key'],
-		$config['api_key'],
-		(!empty($_REQUEST['user_id']) ? intval($_REQUEST['user_id']) : 0),
-		$config['api_root']
-	);
-
-	$url = sprintf('%s/index.php?oauth/token', $config['api_root']);
-	$json = makeCurlPost($url, array(
-		'grant_type' => 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-		'assertion' => $assertion,
-	));
-
-	$message = renderMessageForJson('obtain', $json);
-
-	if (!empty($json['access_token'])) {
-		$accessToken = $json['access_token'];
-	}
-}
-
-?>
-
-<?php require('html/header.php'); ?>
-
-    <h3>JWT Bearer Grant Type</h3>
-
-	<?php if (!empty($message)): ?>
-    	<div class="message"><?php echo $message; ?></div>
-
-    	<?php if (!empty($accessToken)): ?>
-    		<?php require('html/form_request.php'); ?>
-    	<?php endif; ?>
-    <?php else: ?>
-    	<p>
-	        This grant type is used when the client wants to receive access tokens without transmitting sensitive information
-	        such as the client secret. Please note that you must have a valid public / private key pair <strong>and</strong>
-	        you have configured the client with the public key.
-	        <a href="http://tools.ietf.org/html/draft-ietf-oauth-jwt-bearer-07#section-1" target="_blank">Read more about it here</a>.<br />
-	        <br />
-	        To test this grant type, enter the private key in the textarea below and click "Obtain Token".
-	    </p>
-
-	    <form id="form_jwt" action="jwt.php?action=obtain" method="POST">
-		    <label for="private_key_ctrl">Private Key</label><br/>
-		    <textarea id="private_key_ctrl" name="private_key" rows="10" style="width: 100%"></textarea>
-
-		    <input type="hidden" name="user_id" value="0" />
-		    <input type="submit" value="Obtain Token" />
-	    </form>
-	<?php endif; ?>
-
-<?php require('html/footer.php'); ?>
\ No newline at end of file
diff --git a/php_demo/jwt_functions.php b/php_demo/jwt_functions.php
deleted file mode 100644
index 0114a0d8..00000000
--- a/php_demo/jwt_functions.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/**
- * @link http://bshaffer.github.io/oauth2-server-php-docs/grant-types/jwt-bearer/
- */
-function generateJwtAssertion($privateKey, $iss, $sub, $aud, $exp = null, $nbf = null, $jti = null)
-{
-    if (!$exp) {
-        $exp = time() + 1000;
-    }
-
-    $params = array(
-        'iss' => $iss,
-        'sub' => $sub,
-        'aud' => $aud,
-        'exp' => $exp,
-        'iat' => time(),
-    );
-
-    if ($nbf) {
-        $params['nbf'] = $nbf;
-    }
-
-    if ($jti) {
-        $params['jti'] = $jti;
-    }
-
-    $jwtUtil = new JwtUtil();
-
-    return $jwtUtil->encode($params, $privateKey, 'RS256');
-}
-
-/**
- * @link https://github.com/F21/jwt
- * @author F21
- */
-class JwtUtil
-{
-    public function encode($payload, $key, $algo = 'HS256')
-    {
-        $header = $this->generateJwtHeader($payload, $algo);
-
-        $segments = array(
-            $this->urlSafeB64Encode(json_encode($header)),
-            $this->urlSafeB64Encode(json_encode($payload))
-        );
-
-        $signing_input = implode('.', $segments);
-
-        $signature = $this->sign($signing_input, $key, $algo);
-        $segments[] = $this->urlsafeB64Encode($signature);
-
-        return implode('.', $segments);
-    }
-
-    public function decode($jwt, $key = null, $allowedAlgorithms = true)
-    {
-        if (!strpos($jwt, '.')) {
-            return false;
-        }
-
-        $tks = explode('.', $jwt);
-
-        if (count($tks) != 3) {
-            return false;
-        }
-
-        list($headb64, $payloadb64, $cryptob64) = $tks;
-
-        if (null === ($header = json_decode($this->urlSafeB64Decode($headb64), true))) {
-            return false;
-        }
-
-        if (null === $payload = json_decode($this->urlSafeB64Decode($payloadb64), true)) {
-            return false;
-        }
-
-        $sig = $this->urlSafeB64Decode($cryptob64);
-
-        if ((bool) $allowedAlgorithms) {
-            if (!isset($header['alg'])) {
-                return false;
-            }
-
-            // check if bool arg supplied here to maintain BC
-            if (is_array($allowedAlgorithms) && !in_array($header['alg'], $allowedAlgorithms)) {
-                return false;
-            }
-
-            if (!$this->verifySignature($sig, "$headb64.$payloadb64", $key, $header['alg'])) {
-                return false;
-            }
-        }
-
-        return $payload;
-    }
-
-    private function verifySignature($signature, $input, $key, $algo = 'HS256')
-    {
-        // use constants when possible, for HipHop support
-        switch ($algo) {
-            case'HS256':
-            case'HS384':
-            case'HS512':
-                return $this->hash_equals(
-                    $this->sign($input, $key, $algo),
-                    $signature
-                );
-
-            case 'RS256':
-                return openssl_verify($input, $signature, $key, defined('OPENSSL_ALGO_SHA256') ? OPENSSL_ALGO_SHA256 : 'sha256')  === 1;
-
-            case 'RS384':
-                return @openssl_verify($input, $signature, $key, defined('OPENSSL_ALGO_SHA384') ? OPENSSL_ALGO_SHA384 : 'sha384') === 1;
-
-            case 'RS512':
-                return @openssl_verify($input, $signature, $key, defined('OPENSSL_ALGO_SHA512') ? OPENSSL_ALGO_SHA512 : 'sha512') === 1;
-
-            default:
-                throw new \InvalidArgumentException("Unsupported or invalid signing algorithm.");
-        }
-    }
-
-    private function sign($input, $key, $algo = 'HS256')
-    {
-        switch ($algo) {
-            case 'HS256':
-                return hash_hmac('sha256', $input, $key, true);
-
-            case 'HS384':
-                return hash_hmac('sha384', $input, $key, true);
-
-            case 'HS512':
-                return hash_hmac('sha512', $input, $key, true);
-
-            case 'RS256':
-                return $this->generateRSASignature($input, $key, defined('OPENSSL_ALGO_SHA256') ? OPENSSL_ALGO_SHA256 : 'sha256');
-
-            case 'RS384':
-                return $this->generateRSASignature($input, $key, defined('OPENSSL_ALGO_SHA384') ? OPENSSL_ALGO_SHA384 : 'sha384');
-
-            case 'RS512':
-                return $this->generateRSASignature($input, $key, defined('OPENSSL_ALGO_SHA512') ? OPENSSL_ALGO_SHA512 : 'sha512');
-
-            default:
-                throw new \Exception("Unsupported or invalid signing algorithm.");
-        }
-    }
-
-    private function generateRSASignature($input, $key, $algo)
-    {
-        if (!openssl_sign($input, $signature, $key, $algo)) {
-            throw new \Exception("Unable to sign data.");
-        }
-
-        return $signature;
-    }
-
-    public function urlSafeB64Encode($data)
-    {
-        $b64 = base64_encode($data);
-        $b64 = str_replace(array('+', '/', "\r", "\n", '='),
-                array('-', '_'),
-                $b64);
-
-        return $b64;
-    }
-
-    public function urlSafeB64Decode($b64)
-    {
-        $b64 = str_replace(array('-', '_'),
-                array('+', '/'),
-                $b64);
-
-        return base64_decode($b64);
-    }
-
-    /**
-     * Override to create a custom header
-     */
-    protected function generateJwtHeader($payload, $algorithm)
-    {
-        return array(
-            'typ' => 'JWT',
-            'alg' => $algorithm,
-        );
-    }
-    
-    protected function hash_equals($a, $b)
-    {
-        if (function_exists('hash_equals')) {
-            return hash_equals($a, $b);
-        }
-        $diff = strlen($a) ^ strlen($b);
-        for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++) {
-            $diff |= ord($a[$i]) ^ ord($b[$i]);
-        }
-        return $diff === 0;
-    }
-}
diff --git a/php_demo/push-to-heroku b/php_demo/push-to-heroku
deleted file mode 100755
index e039616d..00000000
--- a/php_demo/push-to-heroku
+++ /dev/null
@@ -1,2 +0,0 @@
-git subtree push --prefix php_demo heroku master
-
diff --git a/php_demo/setup.php b/php_demo/setup.php
deleted file mode 100644
index dc18f47a..00000000
--- a/php_demo/setup.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-require_once('functions.php');
-
-// load from request
-$apiRoot = !empty($_REQUEST['api_root']) ? $_REQUEST['api_root'] : '';
-$apiKey = !empty($_REQUEST['api_key']) ? $_REQUEST['api_key'] : '';
-$apiSecret = !empty($_REQUEST['api_secret']) ? $_REQUEST['api_secret'] : '';
-$apiScope = !empty($_REQUEST['api_scope']) ? $_REQUEST['api_scope'] : '';
-
-// fallback to config if needed
-if (empty($apiRoot) && empty($apiKey) && empty($apiSecret) && empty($apiScope)) {
-    $config = loadConfiguration();
-    $apiRoot = $config['api_root'];
-    $apiKey = $config['api_key'];
-    $apiSecret = $config['api_secret'];
-    $apiScope = $config['api_scope'];
-}
-
-// clean up
-$apiRoot = rtrim($apiRoot, '/');
-if (empty($apiScope)) {
-    $apiScope = 'read';
-}
-
-// save configuration to session
-if ((empty($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] !== 'GET')
-    && !empty($apiRoot) && !empty($apiKey) && !empty($apiSecret) && !empty($apiScope)
-) {
-    $_SESSION['api_root'] = $apiRoot;
-    $_SESSION['api_key'] = $apiKey;
-    $_SESSION['api_secret'] = $apiSecret;
-    $_SESSION['api_scope'] = $apiScope;
-    $_SESSION['ignore_config'] = true;
-
-    $location = 'index.php';
-
-    if (!empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'HEAD') {
-        // a HEAD request, redirect to setup.php with all configuration needed
-        // but only after verification (!important)
-        // used in the add-on installer when it issues HEAD request to verify itself
-        if (isLocal($apiRoot)) {
-            // accepts all local addresses
-        } else {
-            $ott = generateOneTimeToken($apiKey, $apiSecret);
-            list(, $json) = makeRequest('', $apiRoot, $ott);
-            if (empty($json['links'])) {
-                header('HTTP/1.0 403 Forbidden');
-                exit;
-            }
-        }
-
-        $location = sprintf(
-            '%s?api_root=%s&api_key=%s&api_secret=%s&api_scope=%s',
-            getBaseUrl(),
-            rawurlencode($apiRoot),
-            rawurlencode($apiKey),
-            rawurlencode($apiSecret),
-            rawurlencode($apiScope)
-        );
-
-        $bitlyToken = getenv('BITLY_TOKEN');
-        if (!empty($bitlyToken)) {
-            $location = bitlyShorten($bitlyToken, $location);
-        }
-    }
-
-    header('Location: ' . $location);
-    exit;
-}
-
-?>
-
-<?php require('html/header.php'); ?>
-
-    <div>
-        <p>There are two ways to configure this demo:</p>
-        <ul>
-            <li>
-                You can either enter all the information in the form below and they will be saved temporary
-                for your current browser session.
-            </li>
-            <li>
-                Or you can create a new <span class="code">config.php</span> using the template from
-                <span class="code">config.php.template</span> for permanent usage.
-            </li>
-        </ul>
-    </div>
-    <hr/>
-
-    <form action="setup.php" method="POST">
-        <label for="api_root_ctrl">API Root</label><br/>
-        <input id="api_root_ctrl" type="text" name="api_root" value="<?php echo $apiRoot; ?>"
-               placeholder="<?php echo $config['placeholder']['api_root']; ?>"/><br/>
-        <br/>
-
-        <label for="api_key_ctrl">API Key</label><br/>
-        <input id="api_key_ctrl" type="text" name="api_key" value="<?php echo $apiKey; ?>"
-               placeholder="<?php echo $config['placeholder']['api_key']; ?>"/><br/>
-        <br/>
-
-        <label for="api_secret_ctrl">API Secret</label><br/>
-        <input id="api_secret_ctrl" type="text" name="api_secret" value="<?php echo $apiSecret; ?>"
-               placeholder="<?php echo $config['placeholder']['api_secret']; ?>"/><br/>
-        <br/>
-
-        <label for="api_scope_ctrl">API Scope (separated by space)</label><br/>
-        <input id="api_scope_ctrl" type="text" name="api_scope" value="<?php echo $apiScope; ?>"
-               placeholder="<?php echo $config['placeholder']['api_scope']; ?>"/><br/>
-        <br/>
-
-        <input type="submit" value="Save"/>
-    </form>
-
-<?php require('html/footer.php'); ?>
\ No newline at end of file
diff --git a/php_demo/subscriptions.php b/php_demo/subscriptions.php
deleted file mode 100644
index 600e8cd5..00000000
--- a/php_demo/subscriptions.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once('functions.php');
-
-if (!empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'GET') {
-    if (!empty($_REQUEST['hub_challenge'])) {
-        // intent verification, just echo back the challenge
-        die($_REQUEST['hub_challenge']);
-    }
-} elseif (!empty($_REQUEST['fwd'])) {
-    // real callback
-    $contents = file_get_contents('php://input');
-    makeCurlPost($_REQUEST['fwd'], $contents);
-}
\ No newline at end of file
diff --git a/wordpress_consumer/README.md b/wordpress_consumer/README.md
deleted file mode 100644
index c06acdab..00000000
--- a/wordpress_consumer/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Moved to https://github.com/xfrocks/bdApi_WordPress
diff --git a/xenforo/.gitignore b/xenforo/.gitignore
deleted file mode 100644
index 8ab686ea..00000000
--- a/xenforo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Hello, World!
diff --git a/xenforo/README.md b/xenforo/README.md
deleted file mode 100644
index fbec094f..00000000
--- a/xenforo/README.md
+++ /dev/null
@@ -1,124 +0,0 @@
-# XenForo API XenForo Provider Add-on
-
-## Changelog
-
-### 1.6.1
-
-* PHP 7.2 support
-* Added option to control limit and range of data accessible via API
-* Added GET `/tags/list`
-* Added GET `/tags/:tagId`
-* Added POST `/tools/ott`
-* Added param `creator_user_id` for GET `/threads/
-* Added param `thread_prefix_id` for GET `/threads/
-* Added param `thread_tag_id` for GET `/threads/
-* Added param `quote_post_id` for POST `/posts/
-* Added `first_poster_avatar` into `links` in thread data
-* Added `post_origin` into post data
-* Added `user_external_auth` into user data (contribution from [Oleg Tsvetkov](https://github.com/olegtsvetkov))
-* Added support for subscription topic `user_0`
-* Added support for config.php configurations:
-  - `$config['api']['pingQueueUserDefer']`
-  - `$config['api']['publicSessionToken']`
-  - `$config['api']['publicSessionClientId']`
-  - `$config['api']['publicSessionScopes']`
-* BREAKING CHANGE: `user_fields` to `fields` in user data
-* Changed: mark thread read after replying (contribution from [Luu Truong](https://github.com/luutruong))
-* Other performance improvements and bug fixes
-
-### 1.5.1
-
-* Added param `reason` for post/thread/profile post deletion
-* Added `latest_posts` into thread data
-* Added `latest_comments` into profile post data
-* Added `timeline_username` into profile post data
-* Added `user_followers_total` and `user_followings_total` into user data
-* Added `username` into `associatable` user data
-* Added `user_unread_notification_count` for alert ping
-* Added support for thread prefixes
-* Added support for social accounts association (Facebook, Google)
-* Improved support for Google ID token
-* Improved attachment data output
-* Improved logging
-* Fixed bugs
-
-### 1.4.7
-
-* Added POST `/search/indexing`
-* Added `user_last_seen_date` for GET `/users`
-* Added `user_fields` for GET `/users` (deprecated `user_custom_fields`)
-* Added `permissions.edit_title` for GET `/threads`
-* Added `last_post` for GET `/threads`
-* Added `order`=`natural_reverse` for GET `/conversation-messages`
-* Added support for XenForo 1.5.0 features: content tagging, 2fa
-* Added support for pages
-* Added support for thread poll
-* Added support for user ignores
-* Added support for view logging (thread, attachment)
-* Added support for spam checking
-* Added `locale` parameter
-* Added option `trackSession`
-* Added option `userNotificationConversation`
-* Improved support for conversation message (report)
-* Added daily version check from xfrocks.com
-* Fixed bugs
-
-### 1.4.3
-
-* Added demo client for first time installation
-* Added supported for latest OAuth 2.0 rfc with new grant types: implicit, client credentials and jwt bearer
-* Added support for social login
-* Added support for user groups
-* Added support for alerts
-* Added support for profile posts
-* Added support for forum watch
-* Added support for pubsubhubbub with user data, alerts and posts
-* Added security feature: restrict access (AdminCP option)
-* Added security feature: white listed domains for client
-* Added GET /navigation
-* Added GET /users/find
-* Added PUT /users/:userId
-* Added POST /oauth/token/admin
-* Improved performance
-* Fixed bugs
-
-### 1.2
-
-* Added support for one time token
-* Added support for all requests in sdk.js
-* Added support for user custom fields
-* Added support for multiple forum ids in GET /threads
-* Added GET /notifications
-* Added `natural_reverse` order for GET /posts
-* Added `post_is_first_post` for (post)
-* Added `user_unread_conversation_count` for (user)
-* Improved session handling
-* Improved HTTPS support
-* Improved logging
-* Fixed bugs
-
-### 1.1
-
-* Added support for attachment data
-* Added support for conversation and message
-* Added support for sticky thread
-* Added support for HTTP header X-HTTP-Method-Override to override request method
-* Added DELETE /posts/:postId/attachments/
-* Added password encryption
-* Fixed bugs
-
-### 1.0
-
-* Added GET /posts/:postId/likes to get like, POST to like, DELETE to unlike
-* Added POST /users to create new user
-* Added POST /users/:userId/avatar to upload avatar, DELETE /users/:userId/avatar to delete avatar
-* Added POST /batch support to execute multiple requests at once
-* Added followers to threads and users with POST, DELETE to follow or unfollow
-* Added `attachments` to post data, POST /threads/attachment and POST /posts/attachment to upload attachment to thread or post
-* Added common parameters `fields_include`, `fields_exclude` to filter data
-* Added common parameter `order` to.. order
-* Added logging
-
-### 0.9.4
-
-* First public release
diff --git a/xenforo/api/.gitignore b/xenforo/api/.gitignore
deleted file mode 100755
index 03c88fd7..00000000
--- a/xenforo/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.htaccess
diff --git a/xenforo/api/index.php b/xenforo/api/index.php
deleted file mode 100755
index 8c735e8e..00000000
--- a/xenforo/api/index.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-// method overriding support
-if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])
-    && isset($_SERVER['REQUEST_METHOD'])
-    && $_SERVER['REQUEST_METHOD'] === 'POST'
-) {
-    // support overriding via HTTP header
-    // but only with POST requests
-    if (in_array($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'], array(
-        'PUT',
-        'DELETE',
-    ))) {
-        $_SERVER['REQUEST_METHOD'] = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-    }
-}
-
-$input = file_get_contents('php://input');
-
-$inputJson = false;
-if (isset($_SERVER['REQUEST_METHOD'])
-    && $_SERVER['REQUEST_METHOD'] === 'POST'
-) {
-    $inputJson = @json_decode($input, true);
-}
-
-if (!empty($inputJson)) {
-    // because PHP parse input incorrectly with json payload
-    // we have to reset $_POST/$_REQUEST for them
-    foreach ($_POST as $postKey => $postValue) {
-        unset($_REQUEST[$postKey]);
-    }
-    $_POST = array();
-} elseif (isset($_SERVER['REQUEST_METHOD'])
-    && in_array($_SERVER['REQUEST_METHOD'], array(
-        'PUT',
-        'DELETE',
-    ))
-) {
-    // PUT, DELETE method support
-    // PHP does not parse input unless it is POST request...
-    // TODO: security check
-    $inputParams = array();
-    parse_str($input, $inputParams);
-    foreach ($inputParams as $key => $value) {
-        $_POST[$key] = $value;
-        $_REQUEST[$key] = $value;
-    }
-}
-
-require('bootstrap.php');
-
-$fc = new XenForo_FrontController(new bdApi_Dependencies());
-
-XenForo_Application::set('_bdApi_fc', $fc);
-
-$fc->run();
diff --git a/xenforo/api/ping.php b/xenforo/api/ping.php
deleted file mode 100644
index bb752a5e..00000000
--- a/xenforo/api/ping.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require('bootstrap.php');
-
-$dependencies = new XenForo_Dependencies_Public();
-$dependencies->preLoadData();
-
-/** @var bdApi_Model_PingQueue $queueModel */
-$queueModel = XenForo_Model::create('bdApi_Model_PingQueue');
-$targetRunTime = XenForo_Application::getConfig()->get('rebuildMaxExecution');
-$hasMore = $queueModel->runQueue($targetRunTime);
-
-header('Content-Type: application/json');
-die(sprintf('{"moreDeferred":%s}', $hasMore ? 'true': 'false'));
diff --git a/xenforo/js/bdApi/templates/sdk.js b/xenforo/js/bdApi/templates/sdk.js
deleted file mode 100755
index 22214bb7..00000000
--- a/xenforo/js/bdApi/templates/sdk.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/** @param {jQuery} $ jQuery Object */
-!function ($, window, document, _undefined) {
-    var dataUri = '{data_uri}';
-    var requestBaseUri = '{request_uri}';
-
-    window['{prefix}SDK'] = {};
-    var SDK = window['{prefix}SDK'];
-    var SDK_options =
-    {
-        'client_id': false
-    };
-
-    $.extend(
-        true,
-        SDK,
-        {
-            init: function (options) {
-                $.extend(true, SDK_options, options);
-            },
-
-            isAuthorized: function (scope, callback) {
-                // callback = function(isAuthorized, apiData) {};
-                $.ajax(
-                    dataUri,
-                    {
-                        data:
-                        {
-                            'cmd': 'authorized',
-                            'client_id': SDK_options['client_id'],
-                            'scope': scope
-                        },
-                        dataType: 'jsonp',
-                        success: function (data, textStatus) {
-                            if (typeof callback != 'function') {
-                                return;
-                            }
-
-                            if (data['authorized'] == 1) {
-                                callback(true, data);
-                            } else {
-                                callback(false, null);
-                            }
-                        }
-                    }
-                );
-            },
-        
-            request: function (route, callback, accessToken, method, data) {
-                // callback = function(apiData) {};
-                var uri = requestBaseUri + '?' + route + '&_xfResponseType=jsonp';
-
-                var ajaxOptions =
-                {
-                    dataType: 'jsonp',
-                    success: function (data, textStatus) {
-                        if (typeof callback != 'function') {
-                            return;
-                        }
-
-                        callback(data);
-                    }
-                };
-
-                if (method != _undefined) {
-                    ajaxOptions.type = method;
-                } else {
-                    ajaxOptions.type = 'GET';
-                }
-
-                if (accessToken != _undefined) {
-                    if (ajaxOptions.type == 'GET') {
-                        uri += '&oauth_token=' + accessToken;
-                    } else {
-                        if (data != _undefined) {
-                            data.oauth_token = accessToken;
-                        } else {
-                            data =
-                            {
-                                oauth_token: accessToken
-                            };
-                        }
-                    }
-                }
-
-                if (data != _undefined) {
-                    ajaxOptions.data = data;
-                }
-            
-                $.ajax(
-                    uri,
-                    ajaxOptions
-                );
-            }
-        }
-    );
-
-    $(document).ready(function () {
-        if (typeof window['{prefix}Init'] == 'function') {
-            window['{prefix}Init']();
-        }
-    });
-}
-(jQuery, this, document);
\ No newline at end of file
diff --git a/xenforo/library/bdApi/AlertHandler/Ping.php b/xenforo/library/bdApi/AlertHandler/Ping.php
deleted file mode 100755
index 6cd03d67..00000000
--- a/xenforo/library/bdApi/AlertHandler/Ping.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class bdApi_AlertHandler_Ping extends XenForo_AlertHandler_Abstract
-{
-    public function getContentByIds(array $contentIds, $model, $userId, array $viewingUser)
-    {
-        $contents = array();
-
-        foreach ($contentIds as $contentId) {
-            $contents[$contentId] = array();
-        }
-
-        return $contents;
-    }
-
-    protected function _getDefaultTemplateTitle($contentType, $action)
-    {
-        return 'bdapi_alert_ping_' . $action;
-    }
-}
diff --git a/xenforo/library/bdApi/CacheRebuilder/ClientContentDeleteAll.php b/xenforo/library/bdApi/CacheRebuilder/ClientContentDeleteAll.php
deleted file mode 100644
index 015870dc..00000000
--- a/xenforo/library/bdApi/CacheRebuilder/ClientContentDeleteAll.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-class bdApi_CacheRebuilder_ClientContentDeleteAll extends XenForo_CacheRebuilder_Abstract
-{
-    public function getRebuildMessage()
-    {
-        return new XenForo_Phrase('bdapi_client_contents');
-    }
-
-    public function rebuild($position = 0, array &$options = array(), &$detailedMessage = '')
-    {
-        if (empty($options['client_id'])) {
-            return true;
-        }
-
-        $options['batch'] = isset($options['batch']) ? $options['batch'] : 50;
-        $options['batch'] = max(1, $options['batch']);
-
-        /** @var bdApi_Model_ClientContent $clientContentModel */
-        $clientContentModel = XenForo_Model::create('bdApi_Model_ClientContent');
-        $clientContents = $clientContentModel->getClientContents(array(
-            'client_id' => $options['client_id'],
-        ), array(
-            'limit' => $options['batch'],
-            'order' => 'client_content_id',
-            'direction' => 'asc',
-        ));
-        if (empty($clientContents)) {
-            return true;
-        }
-
-        foreach ($clientContents as $clientContentId => $clientContent) {
-            $position = max($position, $clientContentId);
-
-            /** @var bdApi_DataWriter_ClientContent $dw */
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_ClientContent');
-            $dw->setExistingData($clientContent, true);
-            $dw->delete();
-        }
-
-        $detailedMessage = XenForo_Locale::numberFormat($position);
-
-        return $position;
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/AuthCode.php b/xenforo/library/bdApi/ControllerAdmin/AuthCode.php
deleted file mode 100755
index dcb2d3f1..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/AuthCode.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_AuthCode extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $authCodeModel = $this->_getAuthCodeModel();
-
-        $conditions = array();
-        $fetchOptions = array(
-            'join' => bdApi_Model_AuthCode::FETCH_CLIENT + bdApi_Model_AuthCode::FETCH_USER,
-            'order' => 'issue_date',
-            'direction' => 'desc',
-        );
-
-        /* @var $helper bdApi_ControllerHelper_Admin */
-        $helper = $this->getHelper('bdApi_ControllerHelper_Admin');
-        $viewParams = $helper->prepareConditionsAndFetchOptions($conditions, $fetchOptions);
-
-        $authCodes = $authCodeModel->getAuthCodes($conditions, $fetchOptions);
-        $total = $authCodeModel->countAuthCodes($conditions, $fetchOptions);
-
-        $viewParams = array_merge($viewParams, array(
-            'authCodes' => $authCodes,
-            'total' => $total,
-        ));
-
-        return $this->responseView('bdApi_ViewAdmin_AuthCode_List', 'bdapi_auth_code_list', $viewParams);
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('auth_code_id', XenForo_Input::UINT);
-        $authCode = $this->_getAuthCodeOrError($id);
-
-        if ($this->isConfirmedPost()) {
-            $dw = $this->_getAuthCodeDataWriter();
-            $dw->setExistingData($id);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-auth-codes')
-            );
-        } else {
-            $viewParams = array('authCode' => $authCode);
-
-            return $this->responseView('bdApi_ViewAdmin_AuthCode_Delete', 'bdapi_auth_code_delete', $viewParams);
-        }
-    }
-
-    protected function _getAuthCodeOrError($id, array $fetchOptions = array())
-    {
-        $info = $this->_getAuthCodeModel()->getAuthCodeById($id, $fetchOptions);
-
-        if (empty($info)) {
-            throw $this->responseException($this->responseError(new XenForo_Phrase('bdapi_auth_code_not_found'), 404));
-        }
-
-        return $info;
-    }
-
-    /**
-     * @return bdApi_Model_AuthCode
-     */
-    protected function _getAuthCodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_AuthCode');
-    }
-
-    /**
-     * @return bdApi_DataWriter_AuthCode
-     */
-    protected function _getAuthCodeDataWriter()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_DataWriter::create('bdApi_DataWriter_AuthCode');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/Client.php b/xenforo/library/bdApi/ControllerAdmin/Client.php
deleted file mode 100755
index 31302622..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/Client.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_Client extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $clientModel = $this->_getClientModel();
-
-        $conditions = array();
-        $fetchOptions = array();
-
-        $fetchOptions['page'] = $this->_input->filterSingle('page', XenForo_Input::UINT);
-        $fetchOptions['limit'] = 50;
-
-        $filter = $this->_input->filterSingle('_filter', XenForo_Input::ARRAY_SIMPLE);
-        if ($filter && isset($filter['value'])) {
-            $conditions['filter'] = array(
-                $filter['value'],
-                empty($filter['prefix']) ? 'lr' : 'r'
-            );
-            $filterView = true;
-        } else {
-            $filterView = false;
-        }
-
-        $clients = $clientModel->getClients($conditions, $fetchOptions);
-        $total = $clientModel->countClients($conditions, $fetchOptions);
-
-        $viewParams = array(
-            'clients' => $clients,
-
-            'page' => $fetchOptions['page'],
-            'perPage' => $fetchOptions['limit'],
-            'total' => $total,
-
-            'filterView' => $filterView,
-            'filterMore' => ($filterView AND $total > $fetchOptions['limit'])
-        );
-
-        return $this->responseView('bdApi_ViewAdmin_Client_List', 'bdapi_client_list', $viewParams);
-    }
-
-    public function actionAdd()
-    {
-        $viewParams = array('client' => array());
-
-        return $this->responseView('bdApi_ViewAdmin_Client_Edit', 'bdapi_client_edit', $viewParams);
-    }
-
-    public function actionEdit()
-    {
-        $id = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        $client = $this->_getClientOrError($id);
-
-        $viewParams = array('client' => $client);
-
-        return $this->responseView('bdApi_ViewAdmin_Client_Edit', 'bdapi_client_edit', $viewParams);
-    }
-
-    public function actionSave()
-    {
-        $this->_assertPostOnly();
-
-        $id = $this->_input->filterSingle('existing_client_id', XenForo_Input::STRING);
-        if (!empty($id)) {
-            $client = $this->_getClientOrError($id);
-        }
-
-        $dwInput = $this->_input->filter(array(
-            'name' => XenForo_Input::STRING,
-            'description' => XenForo_Input::STRING,
-            'client_id' => XenForo_Input::STRING,
-            'client_secret' => XenForo_Input::STRING,
-            'redirect_uri' => XenForo_Input::STRING,
-        ));
-
-        $optionsInput = new XenForo_Input($this->_input->filterSingle('options', XenForo_Input::ARRAY_SIMPLE));
-        $dwInput['options'] = $optionsInput->filter(array(
-            'whitelisted_domains' => XenForo_Input::STRING,
-            'public_key' => XenForo_Input::STRING,
-            'auto_authorize' => XenForo_Input::ARRAY_SIMPLE,
-            'allow_search_indexing' => XenForo_Input::BOOLEAN,
-            'allow_user_0_subscription' => XenForo_Input::BOOLEAN,
-        ));
-
-        $dw = $this->_getClientDataWriter();
-        if (!empty($client)) {
-            $dw->setExistingData($client, true);
-            $dwInput['options'] = array_merge($client['options'], $dwInput['options']);
-        }
-
-        $dw->bulkSet($dwInput);
-        if (!$dw->get('user_id')) {
-            $dw->set('user_id', XenForo_Visitor::getUserId());
-        }
-
-        $dw->save();
-
-        return $this->responseRedirect(
-            XenForo_ControllerResponse_Redirect::SUCCESS,
-            XenForo_Link::buildAdminLink('api-clients')
-        );
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        $client = $this->_getClientOrError($id);
-
-        if ($this->isConfirmedPost()) {
-            $dw = $this->_getClientDataWriter();
-            $dw->setExistingData($client, true);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-clients')
-            );
-        } else {
-            $viewParams = array('client' => $client);
-
-            return $this->responseView('bdApi_ViewAdmin_Client_Delete', 'bdapi_client_delete', $viewParams);
-        }
-    }
-
-    protected function _getClientOrError($id, array $fetchOptions = array())
-    {
-        $info = $this->_getClientModel()->getClientById($id, $fetchOptions);
-
-        if (empty($info)) {
-            throw $this->responseException($this->responseError(new XenForo_Phrase('bdapi_client_not_found'), 404));
-        }
-
-        return $info;
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    protected function _getClientModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Client');
-    }
-
-    /**
-     * @return bdApi_DataWriter_Client
-     */
-    protected function _getClientDataWriter()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_DataWriter::create('bdApi_DataWriter_Client');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/ClientContent.php b/xenforo/library/bdApi/ControllerAdmin/ClientContent.php
deleted file mode 100644
index ff0ba1dc..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/ClientContent.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_ClientContent extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $clientContentModel = $this->_getClientContentModel();
-
-        $conditions = array();
-        $fetchOptions = array(
-            'order' => 'date',
-            'direction' => 'desc',
-        );
-
-        /* @var $helper bdApi_ControllerHelper_Admin */
-        $helper = $this->getHelper('bdApi_ControllerHelper_Admin');
-        $viewParams = $helper->prepareConditionsAndFetchOptions($conditions, $fetchOptions);
-
-        $clientContents = $clientContentModel->getClientContents($conditions, $fetchOptions);
-        $total = $clientContentModel->countClientContents($conditions, $fetchOptions);
-
-        $viewParams = array_merge($viewParams, array(
-            'clientContents' => $clientContents,
-            'total' => $total,
-        ));
-
-        return $this->responseView('bdApi_ViewAdmin_ClientContent_List', 'bdapi_client_content_list', $viewParams);
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('client_content_id', XenForo_Input::UINT);
-        $clientContent = $this->_getClientContentModel()->getClientContentById($id, array(
-            'join' => bdApi_Model_ClientContent::FETCH_CLIENT,
-        ));
-
-        if (empty($clientContent)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('bdapi_client_content_not_found'),
-                404
-            ));
-        }
-
-        if ($this->isConfirmedPost()) {
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_ClientContent');
-            $dw->setExistingData($id);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-client-contents')
-            );
-        } else {
-            $viewParams = array(
-                'clientContent' => $clientContent,
-            );
-
-            return $this->responseView(
-                'bdApi_ViewAdmin_ClientContent_Delete',
-                'bdapi_client_content_delete',
-                $viewParams
-            );
-        }
-    }
-
-    public function actionDeleteAll()
-    {
-        /** @var bdApi_Model_Client $clientModel */
-        $clientModel = $this->getModelFromCache('bdApi_Model_Client');
-        $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        $client = $clientModel->getClientById($clientId);
-        if (empty($client)) {
-            return $this->responseNoPermission();
-        }
-
-        if ($this->isConfirmedPost()) {
-            $this->_request->setParam('cache', 'bdApi_CacheRebuilder_ClientContentDeleteAll');
-            $this->_request->setParam('options', array(
-                'client_id' => $client['client_id'],
-            ));
-
-            return $this->responseReroute('XenForo_ControllerAdmin_Tools', 'cache-rebuild');
-        } else {
-            $viewParams = array(
-                'client' => $client,
-            );
-
-            return $this->responseView(
-                'bdApi_ViewAdmin_ClientContent_DeleteAll',
-                'bdapi_client_content_delete_all',
-                $viewParams
-            );
-        }
-    }
-
-    /**
-     * @return bdApi_Model_ClientContent
-     */
-    protected function _getClientContentModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_ClientContent');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/Log.php b/xenforo/library/bdApi/ControllerAdmin/Log.php
deleted file mode 100755
index 78ae80fc..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/Log.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_Log extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $logModel = $this->_getLogModel();
-
-        $conditions = array();
-        $fetchOptions = array(
-            'order' => 'request_date',
-            'direction' => 'desc',
-        );
-
-        $fetchOptions['page'] = $this->_input->filterSingle('page', XenForo_Input::UINT);
-        $fetchOptions['limit'] = 50;
-
-        $filter = $this->_input->filterSingle('_filter', XenForo_Input::ARRAY_SIMPLE);
-        if ($filter && isset($filter['value'])) {
-            $conditions['filter'] = array(
-                $filter['value'],
-                empty($filter['prefix']) ? 'lr' : 'r'
-            );
-            $filterView = true;
-        } else {
-            $filterView = false;
-        }
-
-        $logs = $logModel->getLogs($conditions, $fetchOptions);
-        $total = $logModel->countLogs($conditions, $fetchOptions);
-
-        $viewParams = array(
-            'logs' => $logs,
-
-            'page' => $fetchOptions['page'],
-            'perPage' => $fetchOptions['limit'],
-            'total' => $total,
-
-            'filterView' => $filterView,
-            'filterMore' => ($filterView AND $total > $fetchOptions['limit'])
-        );
-
-        return $this->responseView('bdApi_ViewAdmin_Log_List', 'bdapi_log_list', $viewParams);
-    }
-
-    public function actionDetail()
-    {
-        $logId = $this->_input->filterSingle('log_id', XenForo_Input::UINT);
-        $log = $this->_getLogModel()->getLogById($logId);
-
-        if (empty($log)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_log_not_found'), 404);
-        }
-
-        /* @var $clientModel bdApi_Model_Client */
-        $clientModel = $this->getModelFromCache('bdApi_Model_Client');
-        /* @var $userModel XenForo_Model_User */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-
-        $viewParams = array(
-            'log' => $log,
-            'client' => $clientModel->getClientById($log['client_id']),
-            'user' => $userModel->getUserById($log['user_id']),
-        );
-
-        return $this->responseView('bdApi_ViewAdmin_Log_Detail', 'bdapi_log_detail', $viewParams);
-    }
-
-    /**
-     * @return bdApi_Model_Log
-     */
-    protected function _getLogModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Log');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/RefreshToken.php b/xenforo/library/bdApi/ControllerAdmin/RefreshToken.php
deleted file mode 100755
index c17a52c6..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/RefreshToken.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_RefreshToken extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $refreshTokenModel = $this->_getRefreshTokenModel();
-
-        $conditions = array();
-        $fetchOptions = array(
-            'join' => bdApi_Model_RefreshToken::FETCH_CLIENT + bdApi_Model_RefreshToken::FETCH_USER,
-            'order' => 'issue_date',
-            'direction' => 'desc',
-        );
-
-        /* @var $helper bdApi_ControllerHelper_Admin */
-        $helper = $this->getHelper('bdApi_ControllerHelper_Admin');
-        $viewParams = $helper->prepareConditionsAndFetchOptions($conditions, $fetchOptions);
-
-        $refreshTokens = $refreshTokenModel->getRefreshTokens($conditions, $fetchOptions);
-        $total = $refreshTokenModel->countRefreshTokens($conditions, $fetchOptions);
-
-        $viewParams = array_merge($viewParams, array(
-            'refreshTokens' => $refreshTokens,
-            'total' => $total,
-        ));
-
-        return $this->responseView('bdApi_ViewAdmin_RefreshToken_List', 'bdapi_refresh_token_list', $viewParams);
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('refresh_token_id', XenForo_Input::UINT);
-        $refreshToken = $this->_getRefreshTokenOrError($id);
-
-        if ($this->isConfirmedPost()) {
-            $dw = $this->_getRefreshTokenDataWriter();
-            $dw->setExistingData($id);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-refresh-tokens')
-            );
-        } else {
-            $viewParams = array('refreshToken' => $refreshToken);
-
-            return $this->responseView(
-                'bdApi_ViewAdmin_RefreshToken_Delete',
-                'bdapi_refresh_token_delete',
-                $viewParams
-            );
-        }
-    }
-
-    protected function _getRefreshTokenOrError($id, array $fetchOptions = array())
-    {
-        $info = $this->_getRefreshTokenModel()->getRefreshTokenById($id, $fetchOptions);
-
-        if (empty($info)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('bdapi_refresh_token_not_found'),
-                404
-            ));
-        }
-
-        return $info;
-    }
-
-    /**
-     * @return bdApi_Model_RefreshToken
-     */
-    protected function _getRefreshTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_RefreshToken');
-    }
-
-    /**
-     * @return bdApi_DataWriter_RefreshToken
-     */
-    protected function _getRefreshTokenDataWriter()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_DataWriter::create('bdApi_DataWriter_RefreshToken');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/Subscription.php b/xenforo/library/bdApi/ControllerAdmin/Subscription.php
deleted file mode 100644
index 2d73ff22..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/Subscription.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_Subscription extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $subscriptionModel = $this->_getSubscriptionModel();
-
-        $conditions = array();
-        $fetchOptions = array('join' => bdApi_Model_Subscription::FETCH_CLIENT);
-
-        /* @var $helper bdApi_ControllerHelper_Admin */
-        $helper = $this->getHelper('bdApi_ControllerHelper_Admin');
-        $viewParams = $helper->prepareConditionsAndFetchOptions($conditions, $fetchOptions);
-
-        $subscriptions = $subscriptionModel->getSubscriptions($conditions, $fetchOptions);
-        $total = $subscriptionModel->countSubscriptions($conditions, $fetchOptions);
-
-        $viewParams = array_merge($viewParams, array(
-            'subscriptions' => $subscriptions,
-            'total' => $total,
-        ));
-
-        return $this->responseView('bdApi_ViewAdmin_Subscription_List', 'bdapi_subscription_list', $viewParams);
-    }
-
-    public function actionDetails()
-    {
-        $id = $this->_input->filterSingle('subscription_id', XenForo_Input::UINT);
-        $subscription = $this->_getSubscriptionOrError($id);
-
-        $viewParams = array('subscription' => $subscription);
-
-        return $this->responseView('bdApi_ViewAdmin_Subscription_Details', 'bdapi_subscription_details', $viewParams);
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('subscription_id', XenForo_Input::UINT);
-        $subscription = $this->_getSubscriptionOrError($id);
-
-        if ($this->isConfirmedPost()) {
-            $dw = $this->_getSubscriptionDataWriter();
-            $dw->setExistingData($id);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-subscriptions')
-            );
-        } else {
-            $viewParams = array('subscription' => $subscription);
-
-            return $this->responseView('bdApi_ViewAdmin_Subscription_Delete', 'bdapi_subscription_delete', $viewParams);
-        }
-    }
-
-    protected function _getSubscriptionOrError($id, array $fetchOptions = array())
-    {
-        $subscription = $this->_getSubscriptionModel()->getSubscriptionById($id, $fetchOptions);
-
-        if (empty($subscription)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('bdapi_subscription_not_found'),
-                404
-            ));
-        }
-
-        return $subscription;
-    }
-
-    /**
-     * @return bdApi_Model_Subscription
-     */
-    protected function _getSubscriptionModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Subscription');
-    }
-
-    /**
-     * @return bdApi_DataWriter_Subscription
-     */
-    protected function _getSubscriptionDataWriter()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_DataWriter::create('bdApi_DataWriter_Subscription');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerAdmin/Token.php b/xenforo/library/bdApi/ControllerAdmin/Token.php
deleted file mode 100755
index 56089c11..00000000
--- a/xenforo/library/bdApi/ControllerAdmin/Token.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-class bdApi_ControllerAdmin_Token extends XenForo_ControllerAdmin_Abstract
-{
-    public function actionIndex()
-    {
-        $tokenModel = $this->_getTokenModel();
-
-        $conditions = array();
-        $fetchOptions = array(
-            'join' => bdApi_Model_Token::FETCH_CLIENT + bdApi_Model_Token::FETCH_USER,
-            'order' => 'issue_date',
-            'direction' => 'desc',
-        );
-
-        /* @var $helper bdApi_ControllerHelper_Admin */
-        $helper = $this->getHelper('bdApi_ControllerHelper_Admin');
-        $viewParams = $helper->prepareConditionsAndFetchOptions($conditions, $fetchOptions);
-
-        $tokens = $tokenModel->getTokens($conditions, $fetchOptions);
-        $total = $tokenModel->countTokens($conditions, $fetchOptions);
-
-        $viewParams = array_merge($viewParams, array(
-            'tokens' => $tokens,
-            'total' => $total,
-        ));
-
-        return $this->responseView('bdApi_ViewAdmin_Token_List', 'bdapi_token_list', $viewParams);
-    }
-
-    public function actionDelete()
-    {
-        $id = $this->_input->filterSingle('token_id', XenForo_Input::UINT);
-        $token = $this->_getTokenOrError($id);
-
-        if ($this->isConfirmedPost()) {
-            $dw = $this->_getTokenDataWriter();
-            $dw->setExistingData($id);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-tokens')
-            );
-        } else {
-            $viewParams = array('token' => $token);
-
-            return $this->responseView('bdApi_ViewAdmin_Token_Delete', 'bdapi_token_delete', $viewParams);
-        }
-    }
-
-    public function actionAdd()
-    {
-        if ($this->isConfirmedPost()) {
-            $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-            $client = $this->_getClientOrError($clientId);
-
-            $username = $this->_input->filterSingle('username', XenForo_Input::STRING);
-            /* @var $userModel XenForo_Model_User */
-            $userModel = $this->getModelFromCache('XenForo_Model_User');
-            $user = $userModel->getUserByName($username);
-            if (empty($user)) {
-                return $this->responseError(new XenForo_Phrase('requested_user_not_found'), 404);
-            }
-
-            $scopes = $this->_input->filterSingle('scopes', XenForo_Input::ARRAY_SIMPLE);
-            $scopes = bdApi_Template_Helper_Core::getInstance()->scopeJoin($scopes);
-
-            $ttl = $this->_input->filterSingle('ttl', XenForo_Input::UINT);
-            $this->_getOAuth2Model()->getServer()->createAccessToken(
-                $client['client_id'],
-                $user['user_id'],
-                $scopes,
-                $ttl,
-                false
-            );
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                XenForo_Link::buildAdminLink('api-tokens')
-            );
-        } else {
-            $viewParams = array(
-                'clients' => $this->_getClientModel()->getList(),
-                'scopes' => $this->_getOAuth2Model()->getSystemSupportedScopes(),
-            );
-
-            return $this->responseView('bdApi_ViewAdmin_Token_Add', 'bdapi_token_add', $viewParams);
-        }
-    }
-
-    protected function _getClientOrError($id, array $fetchOptions = array())
-    {
-        $info = $this->_getClientModel()->getClientById($id, $fetchOptions);
-
-        if (empty($info)) {
-            throw $this->responseException($this->responseError(new XenForo_Phrase('bdapi_client_not_found'), 404));
-        }
-
-        return $info;
-    }
-
-    protected function _getTokenOrError($id, array $fetchOptions = array())
-    {
-        $info = $this->_getTokenModel()->getTokenById($id, $fetchOptions);
-
-        if (empty($info)) {
-            throw $this->responseException($this->responseError(new XenForo_Phrase('bdapi_token_not_found'), 404));
-        }
-
-        return $info;
-    }
-
-    /**
-     * @return bdApi_Model_OAuth2
-     */
-    protected function _getOAuth2Model()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_OAuth2');
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    protected function _getClientModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Client');
-    }
-
-    /**
-     * @return bdApi_Model_Token
-     */
-    protected function _getTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Token');
-    }
-
-    /**
-     * @return bdApi_DataWriter_Token
-     */
-    protected function _getTokenDataWriter()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_DataWriter::create('bdApi_DataWriter_Token');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Abstract.php b/xenforo/library/bdApi/ControllerApi/Abstract.php
deleted file mode 100755
index 30942fd5..00000000
--- a/xenforo/library/bdApi/ControllerApi/Abstract.php
+++ /dev/null
@@ -1,766 +0,0 @@
-<?php
-
-abstract class bdApi_ControllerApi_Abstract extends XenForo_ControllerPublic_Abstract
-{
-    const FIELDS_FILTER_NONE = 0;
-    const FIELDS_FILTER_INCLUDE = 0x01;
-    const FIELDS_FILTER_EXCLUDE = 0x02;
-
-    const SPAM_RESULT_ALLOWED = 'allowed';
-    const SPAM_RESULT_MODERATED = 'moderated';
-    const SPAM_RESULT_DENIED = 'denied';
-
-    protected $_fieldsFilterType = false;
-    protected $_fieldsFilterInclude = array();
-    protected $_fieldsFilterExclude = array();
-    protected $_fieldsFilterExcludeHasWildcards = false;
-    protected $_fieldsFilterDefaults = array();
-
-    public function actionOptions()
-    {
-        $cors = $this->_request->getHeader('Access-Control-Request-Method');
-        if (!empty($cors)) {
-            return $this->responseData('bdApi_ViewApi_Helper_Options');
-        }
-
-        $action = $this->_input->filterSingle('action', XenForo_Input::STRING);
-        $action = str_replace(array('-', '/'), ' ', utf8_strtolower($action));
-        $action = str_replace(' ', '', utf8_ucwords($action));
-
-        $methods = array();
-
-        /* @var $fc XenForo_FrontController */
-        $fc = XenForo_Application::get('_bdApi_fc');
-
-        XenForo_Application::set('_bdApi_disableBatch', true);
-
-        foreach (array(
-                     'Get',
-                     'Post',
-                     'Put'
-                 ) as $method) {
-            $controllerMethod = sprintf('action%s%s', $method, $action);
-
-            if (is_callable(array($this, $controllerMethod))) {
-                $method = utf8_strtoupper($method);
-
-                bdApi_Input::bdApi_resetFilters();
-
-                $routeMatch = new XenForo_RouteMatch(
-                    $this->_routeMatch->getControllerName(),
-                    sprintf('%s-%s', $method, $action)
-                );
-
-                $response = null;
-                $responseIsNoPermission = false;
-                try {
-                    $response = $fc->dispatch($routeMatch);
-                } catch (XenForo_ControllerResponse_Exception $responseException) {
-                    $response = $responseException->getControllerResponse();
-                } catch (Exception $e) {
-                    // ignore
-                }
-
-                /** @noinspection PhpUndefinedMethodInspection */
-                if ($response !== null
-                    && $response instanceof XenForo_ControllerResponse_Error
-                    && is_object($response->errorText)
-                    && $response->errorText instanceof XenForo_Phrase
-                    && $response->errorText->getPhraseName() === 'do_not_have_permission'
-                ) {
-                    $responseIsNoPermission = true;
-                }
-
-                $params = bdApi_Input::bdApi_getFilters();
-                foreach (array_keys($params) as $paramKey) {
-                    if (in_array($paramKey, array(
-                        'fields_filter_prefix',
-                        'fields_include',
-                        'fields_exclude',
-                        'limit',
-                        'locale',
-                        'page',
-                    ), true)) {
-                        // system wide params, ignore
-                        unset($params[$paramKey]);
-                        continue;
-                    }
-
-                    if (!isset($_GET[$paramKey])
-                        && $this->_input->inRequest($paramKey)
-                    ) {
-                        // apparently this param is set by the route class
-                        unset($params[$paramKey]);
-                        continue;
-                    }
-                }
-
-                if (count($params) === 0 && $responseIsNoPermission) {
-                    continue;
-                }
-
-                ksort($params);
-                $methods[$method]['parameters'] = array_values($params);
-            }
-        }
-
-        $allowedMethods = array_keys($methods);
-        $allowedMethods[] = 'OPTIONS';
-        $this->_response->setHeader('Allow', implode(',', $allowedMethods));
-
-        return $this->responseData('bdApi_ViewApi_Helper_Options', $methods);
-    }
-
-    /**
-     * Builds are response with specified data. Basically it's the same
-     * XenForo_ControllerPublic_Abstract::responseView() but with the
-     * template name removed so only view name and data array is available.
-     * Also, the data has some rules enforced to make a good response.
-     *
-     * @param string $viewName
-     * @param array $data
-     *
-     * @return XenForo_ControllerResponse_View
-     */
-    public function responseData($viewName, array $data = array())
-    {
-        return parent::responseView($viewName, 'DEFAULT', $data);
-    }
-
-    /**
-     * @param array $errors
-     * @param int $responseCode
-     * @param array $containerParams
-     *
-     * @return XenForo_ControllerResponse_Error
-     */
-    public function responseErrors(array $errors, $responseCode = 200, array $containerParams = array())
-    {
-        return parent::responseError(reset($errors), $responseCode, $containerParams);
-    }
-
-    /**
-     * Filters param `limit` and `page` from request input.
-     *
-     * @param array $pageNavParams
-     * @param string $limitVarName
-     * @param string $pageVarName
-     * @return array
-     */
-    public function filterLimitAndPage(&$pageNavParams = array(), $limitVarName = 'limit', $pageVarName = 'page')
-    {
-        $limitDefault = bdApi_Option::get('paramLimitDefault');
-        $limit = $limitDefault;
-        $limitInput = $this->_input->filterSingle($limitVarName, XenForo_Input::STRING);
-        if (strlen($limitInput) > 0) {
-            $limit = intval($limitInput);
-
-            $limitMax = bdApi_Option::get('paramLimitMax');
-            if ($limitMax > 0) {
-                $limit = min($limitMax, $limit);
-            }
-        }
-        $limit = max(1, $limit);
-        if ($limit - $limitDefault !== 0) {
-            $pageNavParams[$limitVarName] = $limit;
-        }
-
-        $page = $this->_input->filterSingle($pageVarName, XenForo_Input::UINT);
-        $pageMax = bdApi_Option::get('paramPageMax');
-        if ($pageMax > 0) {
-            $page = min(bdApi_Option::get('paramPageMax'), $page);
-        }
-        $page = max(1, $page);
-
-        return array(intval($limit), intval($page));
-    }
-
-    /**
-     * Filters data for many resources.
-     * This method name had been prefixed with "_" before it was updated to public visibility.
-     * The name is kept for backward compatibility.
-     *
-     * @param array $resourcesData
-     * @param array $prefixes
-     * @return array
-     */
-    public function _filterDataMany(array $resourcesData, array $prefixes = array())
-    {
-        $filtered = array();
-
-        foreach ($resourcesData as $key => $resourceData) {
-            $filtered[$key] = $this->_filterDataSingle($resourceData, $prefixes);
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Filters data for one resource.
-     * This method name had been prefixed with "_" before it was updated to public visibility.
-     * The name is kept for backward compatibility.
-     *
-     * @param array $resourceData
-     * @param array $prefixes
-     * @return array
-     */
-    public function _filterDataSingle(array $resourceData, array $prefixes = array())
-    {
-        $this->_prepareFieldsFilter();
-
-        if ($this->_fieldsFilterType === self::FIELDS_FILTER_NONE) {
-            return $resourceData;
-        }
-
-        $filtered = array();
-        foreach (array_keys($resourceData) as $field) {
-            $hasChild = is_array($resourceData[$field]);
-
-            if (!is_int($field) && $this->_isFieldExcluded($field, $prefixes, $hasChild)) {
-                continue;
-            }
-
-            if ($hasChild && count($resourceData[$field]) > 0) {
-                $_prefixes = $prefixes;
-                if (!is_int($field)) {
-                    $_prefixes[] = $field;
-                }
-                $_filtered = $this->_filterDataSingle($resourceData[$field], $_prefixes);
-                if (count($_filtered) > 0) {
-                    $filtered[$field] = $_filtered;
-                }
-            } else {
-                $filtered[$field] = $resourceData[$field];
-            }
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Checks if a field is specifically requested to be included.
-     * This method name had been prefixed with "_" before it was updated to public visibility.
-     * The name is kept for backward compatibility.
-     *
-     * @param $field
-     * @param array $prefixes
-     * @param bool $hasChild
-     * @return bool
-     */
-    public function _isFieldIncluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        $this->_prepareFieldsFilter();
-
-        if (!($this->_fieldsFilterType & self::FIELDS_FILTER_INCLUDE)) {
-            return false;
-        }
-
-        $pattern = $field;
-        if (count($prefixes)) {
-            $pattern = sprintf('%s.%s', implode('.', $prefixes), $field);
-        }
-        $patternAndDot = null;
-        $patternAndDotLength = 0;
-        if ($hasChild) {
-            $patternAndDot = $pattern . '.';
-            $patternAndDotLength = strlen($patternAndDot);
-        }
-
-        foreach ($this->_fieldsFilterInclude as $_field) {
-            if ($_field === $pattern
-                || ($patternAndDotLength > 0
-                    && substr($_field, 0, $patternAndDotLength) === $patternAndDot
-                )
-            ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a field is specifically requested to be excluded.
-     * This method name had been prefixed with "_" before it was updated to public visibility.
-     * The name is kept for backward compatibility.
-     *
-     * @param $field
-     * @param array $prefixes
-     * @param bool $hasChild
-     * @return bool
-     */
-    public function _isFieldExcluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        $this->_prepareFieldsFilter();
-
-        if ($this->_fieldsFilterType & self::FIELDS_FILTER_INCLUDE) {
-            if ($this->_isFieldIncluded($field, $prefixes, $hasChild)) {
-                return false;
-            }
-
-            $includeDefault = false;
-            $_prefixes = $prefixes;
-            while (true) {
-                $_prefixesStr = count($_prefixes) === 0
-                    ? ''
-                    : (
-                    count($_prefixes) == 1
-                        ? $_prefixes[0]
-                        : implode('.', $_prefixes)
-                    );
-                if (isset($this->_fieldsFilterDefaults[$_prefixesStr])) {
-                    if ($this->_fieldsFilterDefaults[$_prefixesStr]) {
-                        $includeDefault = true;
-                    }
-                    break;
-                }
-
-                if (empty($_prefixes)) {
-                    break;
-                } else {
-                    array_pop($_prefixes);
-                }
-            }
-            if (!$includeDefault) {
-                return true;
-            }
-        }
-
-        if (!($this->_fieldsFilterType & self::FIELDS_FILTER_EXCLUDE)) {
-            return false;
-        }
-
-        $pattern = $field;
-        if (count($prefixes)) {
-            $pattern = sprintf('%s.%s', implode('.', $prefixes), $field);
-        }
-        $wildcardPattern = null;
-        if ($this->_fieldsFilterExcludeHasWildcards) {
-            $wildcardPattern = sprintf('*.%s', $field);
-        }
-
-        foreach ($this->_fieldsFilterExclude as $_field) {
-            if ($_field === $pattern) {
-                return true;
-            }
-
-            if ($wildcardPattern !== null
-                && $_field === $wildcardPattern
-            ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    protected function _prepareFieldsFilter()
-    {
-        if ($this->_fieldsFilterType === false) {
-            $this->_fieldsFilterType = self::FIELDS_FILTER_NONE;
-
-            // use values from this request specifically
-            $filterPrefix = $this->_input->filterSingle('fields_filter_prefix', XenForo_Input::STRING);
-            $filterPrefixLength = strlen($filterPrefix);
-            $include = $this->_input->filterSingle('fields_include', XenForo_Input::STRING);
-            $exclude = $this->_input->filterSingle('fields_exclude', XenForo_Input::STRING);
-            if ($filterPrefixLength > 0 && empty($include) && empty($exclude)) {
-                // use values from $_GET if a prefix is specified
-                $include = filter_input(INPUT_GET, 'fields_include');
-                $exclude = filter_input(INPUT_GET, 'fields_exclude');
-            }
-
-            if (!empty($include)) {
-                $this->_fieldsFilterType |= self::FIELDS_FILTER_INCLUDE;
-                foreach (explode(',', $include) as $field) {
-                    $field = trim($field);
-                    if ($filterPrefixLength > 0) {
-                        if (substr($field, 0, $filterPrefixLength) !== $filterPrefix) {
-                            continue;
-                        } else {
-                            $field = substr($field, $filterPrefixLength);
-                        }
-                    }
-
-                    $prefixes = explode('.', $field);
-                    $_field = array_pop($prefixes);
-                    $_prefixes = implode('.', $prefixes);
-                    if ($_field === '*') {
-                        $this->_fieldsFilterDefaults[$_prefixes] = true;
-                        if (!empty($_prefixes)) {
-                            $this->_fieldsFilterInclude[] = $_prefixes;
-                        }
-                    } else {
-                        $this->_fieldsFilterInclude[] = $field;
-                        $this->_fieldsFilterDefaults[$field] = true;
-                        if (!isset($this->_fieldsFilterDefaults[$_prefixes])) {
-                            $this->_fieldsFilterDefaults[$_prefixes] = false;
-                        }
-                    }
-                }
-            }
-
-            if (!empty($exclude)) {
-                $this->_fieldsFilterType |= self::FIELDS_FILTER_EXCLUDE;
-                foreach (explode(',', $exclude) as $field) {
-                    $field = trim($field);
-                    if ($filterPrefixLength > 0) {
-                        if (substr($field, 0, $filterPrefixLength) !== $filterPrefix) {
-                            continue;
-                        } else {
-                            $field = substr($field, $filterPrefixLength);
-                        }
-                    }
-
-                    $this->_fieldsFilterExclude[] = $field;
-
-                    if (strpos($field, '*') !== false) {
-                        $this->_fieldsFilterExcludeHasWildcards = true;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Try to check submitted data for spam.
-     * <code>$data</code> should have <code>'content'</code>
-     * and <code>'content_type'</code> for optimal operation.
-     *
-     * @param array $data
-     * @return string one of the SPAM_RESULT_* constants
-     */
-    protected function _spamCheck(array $data)
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            return self::SPAM_RESULT_ALLOWED;
-        }
-
-        /** @var XenForo_Model_SpamPrevention $spamModel */
-        $spamModel = $this->getModelFromCache('XenForo_Model_SpamPrevention');
-        $spamResult = self::SPAM_RESULT_ALLOWED;
-
-        if ($spamModel->visitorRequiresSpamCheck()) {
-            if (isset($data['content'])) {
-                switch ($spamModel->checkMessageSpam($data['content'], $data, $this->_request)) {
-                    case XenForo_Model_SpamPrevention::RESULT_ALLOWED:
-                        $spamResult = self::SPAM_RESULT_ALLOWED;
-                        break;
-                    case XenForo_Model_SpamPrevention::RESULT_MODERATED:
-                        $spamResult = self::SPAM_RESULT_MODERATED;
-                        break;
-                    case XenForo_Model_SpamPrevention::RESULT_DENIED:
-                        $spamResult = self::SPAM_RESULT_DENIED;
-                        break;
-                }
-            }
-
-            switch ($spamResult) {
-                case self::SPAM_RESULT_MODERATED:
-                case self::SPAM_RESULT_DENIED:
-                    if (isset($data['content_type'])) {
-                        $contentId = null;
-                        if (isset($data['content_id'])) {
-                            $contentId = $data['content_id'];
-                        }
-
-                        $spamModel->logSpamTrigger($data['content_type'], $contentId);
-                    }
-                    break;
-            }
-        }
-
-        return $spamResult;
-    }
-
-
-    /**
-     * Gets the required scope for a controller action. By default,
-     * all API GET actions will require the read scope, POST actions will require
-     * the post scope.
-     *
-     * Special case: if no OAuth token is specified (the session
-     * will be setup as guest), GET actions won't require the read scope anymore.
-     * That means guest-permission API requests will have the read scope
-     * automatically.
-     *
-     * @param string $action
-     *
-     * @return string required scope. One of the SCOPE_* constant in
-     * bdApi_Model_OAuth2
-     */
-    protected function _getScopeForAction($action)
-    {
-        if (strpos($action, 'Post') === 0) {
-            return bdApi_Model_OAuth2::SCOPE_POST;
-        } elseif (strpos($action, 'Put') === 0) {
-            // TODO: separate scope?
-            return bdApi_Model_OAuth2::SCOPE_POST;
-        } elseif (strpos($action, 'Delete') === 0) {
-            // TODO: separate scope?
-            return bdApi_Model_OAuth2::SCOPE_POST;
-        } else {
-            return bdApi_Model_OAuth2::SCOPE_READ;
-        }
-    }
-
-    /**
-     * Helper to check for the required scope and throw an exception
-     * if it could not be found.
-     * @param $scope
-     * @throws XenForo_ControllerResponse_Exception
-     * @throws Zend_Exception
-     */
-    protected function _assertRequiredScope($scope)
-    {
-        if (empty($scope)) {
-            // no scope is required
-            return;
-        }
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::get('session');
-
-        if (!$session->checkScope($scope)) {
-            $oauthTokenText = $session->getOAuthTokenText();
-
-            if (empty($oauthTokenText)) {
-                /** @var bdApi_Model_OAuth2 $oauth2Model */
-                $oauth2Model = XenForo_Model::create('bdApi_Model_OAuth2');
-                $controllerResponse = $oauth2Model->getServer()->getErrorControllerResponse($this);
-
-                if (empty($controllerResponse)) {
-                    $controllerResponse = $this->responseError(
-                        new XenForo_Phrase('bdapi_authorize_error_invalid_or_expired_access_token'),
-                        403
-                    );
-                }
-            }
-
-            if (empty($controllerResponse)) {
-                $controllerResponse = $this->responseError(new XenForo_Phrase(
-                    'bdapi_authorize_error_scope_x_not_granted',
-                    array('scope' => $scope)
-                ), 403);
-            }
-
-            throw $this->responseException($controllerResponse);
-        }
-    }
-
-    protected function _assertAdminPermission($permissionId)
-    {
-        $this->_assertRequiredScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM);
-
-        if (!XenForo_Visitor::getInstance()->hasAdminPermission($permissionId)) {
-            throw $this->responseException($this->responseNoPermission());
-        }
-    }
-
-    protected function _assertValidToken()
-    {
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (empty($session)) {
-            throw $this->responseException($this->responseNoPermission());
-        }
-
-        $clientId = $session->getOAuthClientId();
-        if (empty($clientId)) {
-            throw $this->responseException($this->responseNoPermission());
-        }
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-        if ($action !== 'Options') {
-            parent::_assertViewingPermissions($action);
-        }
-    }
-
-    protected function _assertBoardActive($action)
-    {
-        parent::_assertBoardActive($action);
-
-        if (strtoupper($this->_request->getMethod()) !== 'GET'
-            && XenForo_Application::isRegistered('_bdCloudServerHelper_readonly')
-        ) {
-            $response = $this->responseError(new XenForo_Phrase('bdcsh_forum_is_currently_read_only'), 503);
-            throw $this->responseException($response);
-        }
-    }
-
-    public function responseNoPermission()
-    {
-        return $this->responseReroute('bdApi_ControllerApi_Error', 'no-permission');
-    }
-
-    protected function _assertRegistrationRequired()
-    {
-        if (!XenForo_Visitor::getUserId()) {
-            throw $this->responseException($this->responseReroute(
-                'bdApi_ControllerApi_Error',
-                'registration-required'
-            ));
-        }
-    }
-
-    protected function _preDispatch($action)
-    {
-        $requiredScope = $this->_getScopeForAction($action);
-        $this->_assertRequiredScope($requiredScope);
-
-        parent::_preDispatch($action);
-    }
-
-    protected function _setupSession($action)
-    {
-        if (XenForo_Application::isRegistered('session')) {
-            return;
-        }
-
-        bdApi_Session::startApiSession($this->_request);
-    }
-
-
-    public function updateSessionActivity($controllerResponse, $controllerName, $action)
-    {
-        if (!bdApi_Option::get('trackSession')) {
-            return;
-        }
-
-        if (!$this->_request->isGet()) {
-            return;
-        }
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (empty($session)) {
-            return;
-        }
-
-        $visitorUserId = XenForo_Visitor::getUserId();
-        if ($visitorUserId === 0) {
-            return;
-        }
-
-        if ($controllerResponse instanceof XenForo_ControllerResponse_Reroute) {
-            return;
-        } elseif ($controllerResponse instanceof XenForo_ControllerResponse_Redirect) {
-            return;
-        }
-
-        $params = $this->_request->getUserParams();
-        if (!empty($params['_isApiJob'])) {
-            return;
-        }
-
-        $this->_prepareSessionActivityForApi($controllerName, $action, $params);
-
-        /** @var XenForo_Model_User $userModel */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        $userModel->updateSessionActivity(
-            $visitorUserId,
-            $this->_request->getClientIp(false),
-            $controllerName,
-            $action,
-            'valid',
-            $params
-        );
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'bdApi_ControllerApi_Index';
-        $action = '';
-        $params = array();
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (!empty($session)) {
-            $params['client_id'] = $session->getOAuthClientId();
-        }
-    }
-
-    protected function _checkCsrf($action)
-    {
-        if (isset(self::$_executed['csrf'])) {
-            return;
-        }
-        self::$_executed['csrf'] = true;
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        $client = $session->getOAuthClient();
-        if (!empty($client) && !empty($client['_isPublicSessionClient'])) {
-            // only check csrf if public session token is being used
-            $this->_checkCsrfFromToken();
-        }
-    }
-
-    protected function _postDispatch($controllerResponse, $controllerName, $action)
-    {
-        $this->_logRequest($controllerResponse, $controllerName, $action);
-
-        parent::_postDispatch($controllerResponse, $controllerName, $action);
-    }
-
-    protected function _logRequest($controllerResponse, $controller, $action)
-    {
-        $requestMethod = $this->_request->getMethod();
-        $requestUri = $this->_request->getRequestUri();
-        $requestData = $this->_request->getParams();
-        if ($controllerResponse instanceof XenForo_ControllerResponse_Abstract) {
-            if ($controllerResponse instanceof XenForo_ControllerResponse_Redirect) {
-                $responseCode = 301;
-                $responseOutput = array_merge($controllerResponse->redirectParams, array(
-                    'redirectType' => $controllerResponse->redirectType,
-                    'redirectMessage' => $controllerResponse->redirectMessage,
-                    'redirectUri' => $controllerResponse->redirectTarget,
-                ));
-            } else {
-                $responseCode = $controllerResponse->responseCode;
-                $responseOutput = $this->_getResponseOutput($controllerResponse);
-            }
-        } else {
-            $responseCode = $this->_response->getHttpResponseCode();
-            $responseOutput = array(
-                'raw' => $controllerResponse,
-                'controller' => $controller,
-                'action' => $action,
-            );
-        }
-
-        if ($responseOutput !== false) {
-            /* @var $logModel bdApi_Model_Log */
-            $logModel = $this->getModelFromCache('bdApi_Model_Log');
-            $logModel->logRequest($requestMethod, $requestUri, $requestData, $responseCode, $responseOutput);
-        }
-
-        return true;
-    }
-
-    protected function _getResponseOutput(XenForo_ControllerResponse_Abstract $controllerResponse)
-    {
-        $responseOutput = array();
-
-        if ($controllerResponse instanceof XenForo_ControllerResponse_View) {
-            $responseOutput = $controllerResponse->params;
-        } elseif ($controllerResponse instanceof XenForo_ControllerResponse_Error) {
-            $responseOutput = array('error' => $controllerResponse->errorText);
-        } elseif ($controllerResponse instanceof XenForo_ControllerResponse_Exception) {
-            $responseOutput = $this->_getResponseOutput($controllerResponse->getControllerResponse());
-        } elseif ($controllerResponse instanceof XenForo_ControllerResponse_Message) {
-            $responseOutput = array('message' => $controllerResponse->message);
-        } elseif ($controllerResponse instanceof XenForo_ControllerResponse_Reroute) {
-            return false;
-        }
-
-        return $responseOutput;
-    }
-
-    protected function _setDeprecatedHeaders($newMethod, $newLink)
-    {
-        $this->_response->setHeader('X-Api-Deprecated', sprintf(
-            'newMethod=%s, newLink=%s',
-            strtoupper($newMethod),
-            $newLink
-        ), true);
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Asset.php b/xenforo/library/bdApi/ControllerApi/Asset.php
deleted file mode 100755
index 0c6c9c59..00000000
--- a/xenforo/library/bdApi/ControllerApi/Asset.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Asset extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetSdk()
-    {
-        $prefix = $this->_input->filterSingle('prefix', XenForo_Input::STRING);
-        $prefix = preg_replace('/[^a-zA-Z0-9]/', '', $prefix);
-
-        $sdkDirPath = preg_replace('/library.+$/', '', dirname(__FILE__));
-        $sdkPath = $sdkDirPath . 'js/bdApi/templates/sdk.js';
-        $sdk = file_get_contents($sdkPath);
-        $sdk = str_replace('{prefix}', $prefix, $sdk);
-        $sdk = str_replace('{data_uri}', XenForo_Link::buildPublicLink('canonical:misc/api-data'), $sdk);
-        $sdk = str_replace('{request_uri}', bdApi_Data_Helper_Core::safeBuildApiLink('index'), $sdk);
-
-        $ttl = 31536000;
-        $expires = XenForo_Application::$time + $ttl;
-        header('Content-Type: application/x-javascript; charset=utf-8', true);
-        header('Cache-Control: public, max-age=' . $ttl, true);
-        header(sprintf('Last-Modified: %s', gmstrftime("%a, %d %b %Y %T %Z", filemtime($sdkPath))), true);
-        header(sprintf('Expires: %s', gmstrftime("%a, %d %b %Y %T %Z", $expires)), true);
-        die($sdk);
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        return false;
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-    }
-
-    protected function _assertBoardActive($action)
-    {
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Attachment.php b/xenforo/library/bdApi/ControllerApi/Attachment.php
deleted file mode 100644
index c41961a5..00000000
--- a/xenforo/library/bdApi/ControllerApi/Attachment.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Attachment extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetData()
-    {
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-        $attachment = $this->_getAttachmentModel()->getAttachmentById($attachmentId);
-        if (empty($attachment)) {
-            return $this->responseError(new XenForo_Phrase('requested_attachment_not_found'), 404);
-        }
-
-        return $this->_getAttachmentHelper()->doData($attachment);
-    }
-
-    /**
-     * @return XenForo_Model_Attachment
-     */
-    protected function _getAttachmentModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Attachment');
-    }
-
-    /**
-     * @return bdApi_ControllerHelper_Attachment
-     */
-    protected function _getAttachmentHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('bdApi_ControllerHelper_Attachment');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Batch.php b/xenforo/library/bdApi/ControllerApi/Batch.php
deleted file mode 100755
index c9cd13fa..00000000
--- a/xenforo/library/bdApi/ControllerApi/Batch.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Batch extends bdApi_ControllerApi_Abstract
-{
-    public function actionPostIndex()
-    {
-        $input = file_get_contents('php://input');
-        $batchJobs = @json_decode($input, true);
-        if (empty($batchJobs)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_batch_requires_json'), 400);
-        }
-        $jobsOutput = array();
-
-        foreach ($batchJobs as $batchJob) {
-            if (empty($batchJob['uri'])) {
-                continue;
-            }
-
-            if (empty($batchJob['id'])) {
-                $number = 0;
-
-                do {
-                    if ($number == 0) {
-                        $id = $batchJob['uri'];
-                    } else {
-                        $id = sprintf('%s_%d', $batchJob['uri'], $number);
-                    }
-
-                    $number++;
-                } while (isset($jobsOutput[$id]));
-            } else {
-                $id = $batchJob['id'];
-            }
-
-            if (empty($batchJob['method'])) {
-                $method = 'GET';
-            } else {
-                $method = strtoupper($batchJob['method']);
-            }
-
-            if (empty($batchJob['params']) OR !is_array($batchJob['params'])) {
-                $params = array();
-            } else {
-                $params = $batchJob['params'];
-            }
-
-            $params = array_merge($this->_extractUriParams($batchJob['uri']), $params);
-
-            $jobsOutput[$id] = bdApi_Data_Helper_Batch::doJob($method, $batchJob['uri'], $params);
-        }
-
-        $data = array('jobs' => $jobsOutput);
-
-        return $this->responseData('bdApi_ViewApi_Batch_Index', $data);
-    }
-
-    protected function _extractUriParams(&$uri)
-    {
-        $params = array();
-
-        $parsed = parse_url($uri);
-        if (!empty($parsed['query'])) {
-            parse_str($parsed['query'], $params);
-        }
-
-        return $params;
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        // scope check will be perform by each individual controller later
-        return false;
-    }
-
-    protected function _logRequest($controllerResponse, $controllerName, $action)
-    {
-        // skip logging for successful /batch request
-        if ($controllerResponse instanceof XenForo_ControllerResponse_View) {
-            return false;
-        }
-
-        return parent::_logRequest($controllerResponse, $controllerName, $action);
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Category.php b/xenforo/library/bdApi/ControllerApi/Category.php
deleted file mode 100755
index 1d336247..00000000
--- a/xenforo/library/bdApi/ControllerApi/Category.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Category extends bdApi_ControllerApi_Node
-{
-    protected function _getControllerName()
-    {
-        return 'bdApi_ControllerApi_Category';
-    }
-
-    protected function _getNameSingular()
-    {
-        return 'category';
-    }
-
-    protected function _getNamePlural()
-    {
-        return 'categories';
-    }
-
-    protected function _getAll($parentNodeId = false)
-    {
-        $nodes = $this->_getNodeModel()->getViewableNodeList();
-
-        $categories = array();
-        foreach ($nodes as $node) {
-            if ($parentNodeId !== false AND $node['parent_node_id'] != $parentNodeId) {
-                continue;
-            }
-
-            if ($node['node_type_id'] === 'Category') {
-                $categories[] = $node;
-            }
-        }
-
-        return $categories;
-    }
-
-    protected function _getSingle($nodeId)
-    {
-        $node = $this->_getNodeModel()->getNodeById($nodeId);
-
-        if (!empty($node) AND $node['node_type_id'] !== 'Category') {
-            // node exists but not a category
-            return false;
-        }
-
-        return $node;
-    }
-
-    protected function _isViewable(array $category)
-    {
-        return $this->_getCategoryModel()->canViewCategory($category);
-    }
-
-    protected function _prepareApiDataForNodes(array $categories)
-    {
-        return $this->_getCategoryModel()->prepareApiDataForCategories($categories);
-    }
-
-    protected function _prepareApiDataForNode(array $category)
-    {
-        return $this->_getCategoryModel()->prepareApiDataForCategory($category);
-    }
-
-    protected function _responseErrorNotFound()
-    {
-        return $this->responseError(new XenForo_Phrase('requested_category_not_found'), 404);
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Category
-     */
-    protected function _getCategoryModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Category');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Conversation.php b/xenforo/library/bdApi/ControllerApi/Conversation.php
deleted file mode 100755
index caee8739..00000000
--- a/xenforo/library/bdApi/ControllerApi/Conversation.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Conversation extends bdApi_ControllerApi_Abstract
-{
-
-    protected function _preDispatch($action)
-    {
-        $this->_assertRegistrationRequired();
-        $this->_assertRequiredScope(bdApi_Model_OAuth2::SCOPE_PARTICIPATE_IN_CONVERSATIONS);
-
-        parent::_preDispatch($action);
-    }
-
-    public function actionGetIndex()
-    {
-        $conversationId = $this->_input->filterSingle('conversation_id', XenForo_Input::UINT);
-        if (!empty($conversationId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $conditions = array();
-        $fetchOptions = array(
-            'limit' => $limit,
-            'page' => $page,
-            'join' => 0
-        );
-
-        // TODO: ordering
-
-        if (!$this->_isFieldExcluded('first_message')) {
-            $fetchOptions['join'] += XenForo_Model_Conversation::FETCH_FIRST_MESSAGE;
-        }
-
-        $getRecipients = !$this->_isFieldExcluded('recipients');
-
-        $conversations = $this->_getConversationModel()->getConversationsForUser(
-            $visitor['user_id'],
-            $conditions,
-            $this->_getConversationModel()->getFetchOptionsToPrepareApiData($fetchOptions)
-        );
-
-        $total = $this->_getConversationModel()->countConversationsForUser($visitor['user_id'], $conditions);
-
-        $data = array(
-            'conversations' => $this->_filterDataMany($this->_getConversationModel()->prepareApiDataForConversations(
-                $conversations,
-                $getRecipients
-            )),
-            'conversations_total' => $total
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'conversations',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_Conversation_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $fetchOptions = array('join' => 0);
-
-        if (!$this->_isFieldExcluded('first_message')) {
-            $fetchOptions['join'] += XenForo_Model_Conversation::FETCH_FIRST_MESSAGE;
-        }
-
-        $getRecipients = !$this->_isFieldExcluded('recipients');
-
-        $conversationId = $this->_input->filterSingle('conversation_id', XenForo_Input::UINT);
-        $conversation = $this->_getConversationOrError($conversationId, $fetchOptions);
-
-        $data = array(
-            'conversation' => $this->_filterDataSingle($this->_getConversationModel()->prepareApiDataForConversation(
-                $conversation,
-                $getRecipients
-            ))
-        );
-
-        return $this->responseData('bdApi_ViewApi_Conversation_Single', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        $input = $this->_input->filter(array(
-            'recipients' => XenForo_Input::STRING,
-            'conversation_title' => XenForo_Input::STRING
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['message_body'] = $editorHelper->getMessageText('message_body', $this->_input);
-        $input['message_body'] = XenForo_Helper_String::autoLinkBbCode($input['message_body']);
-
-        if (!$this->_getConversationModel()->canStartConversations($errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        /* @var $conversationDw XenForo_DataWriter_ConversationMaster */
-        $conversationDw = XenForo_DataWriter::create('XenForo_DataWriter_ConversationMaster');
-        $conversationDw->setExtraData(XenForo_DataWriter_ConversationMaster::DATA_ACTION_USER, $visitor->toArray());
-        $conversationDw->setExtraData(XenForo_DataWriter_ConversationMaster::DATA_MESSAGE, $input['message_body']);
-        $conversationDw->set('user_id', $visitor['user_id']);
-        $conversationDw->set('username', $visitor['username']);
-        $conversationDw->set('title', $input['conversation_title']);
-        $conversationDw->addRecipientUserNames(explode(',', $input['recipients']));
-
-        $messageDw = $conversationDw->getFirstMessageDw();
-        $messageDw->set('message', $input['message_body']);
-        $messageDw->setExtraData(
-            XenForo_DataWriter_ConversationMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash()
-        );
-
-        switch ($this->_spamCheck(array(
-            'content_type' => 'conversation',
-            'content' => $input['conversation_title'] . "\n" . $input['message_body'],
-        ))) {
-            case self::SPAM_RESULT_MODERATED:
-            case self::SPAM_RESULT_DENIED:
-                return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                break;
-        }
-
-        $conversationDw->preSave();
-
-        if ($conversationDw->hasErrors()) {
-            return $this->responseErrors($conversationDw->getErrors(), 400);
-        }
-
-        $this->assertNotFlooding('conversation');
-
-        $conversationDw->save();
-        $conversation = $conversationDw->getMergedData();
-
-        $this->_getConversationModel()->markConversationAsRead(
-            $conversation['conversation_id'],
-            XenForo_Visitor::getUserId(),
-            XenForo_Application::$time
-        );
-
-        $this->_request->setParam('conversation_id', $conversation['conversation_id']);
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionDeleteIndex()
-    {
-        $conversationId = $this->_input->filterSingle('conversation_id', XenForo_Input::UINT);
-
-        $this->_getConversationModel()->deleteConversationForUser(
-            $conversationId,
-            XenForo_Visitor::getUserId(),
-            'deleted'
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionPostAttachments()
-    {
-        $contentData = array('message_id' => 0);
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash();
-        $response = $attachmentHelper->doUpload('file', $hash, 'conversation_message');
-
-        if ($response instanceof XenForo_ControllerResponse_Abstract) {
-            return $response;
-        }
-
-        $data = array(
-            'attachment' => $this->_filterDataSingle(
-                $this->_getConversationModel()->prepareApiDataForAttachment(
-                    $response,
-                    $contentData,
-                    $contentData,
-                    $hash
-                )
-            )
-        );
-
-        return $this->responseData('bdApi_ViewApi_Conversation_Attachments', $data);
-    }
-
-    public function actionDeleteAttachments()
-    {
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash();
-        return $attachmentHelper->doDelete($hash, $attachmentId);
-    }
-
-    protected function _getConversationOrError($conversationId, array $fetchOptions = array())
-    {
-        $conversation = $this->_getConversationModel()->getConversationForUser(
-            $conversationId,
-            XenForo_Visitor::getUserId(),
-            $this->_getConversationModel()->getFetchOptionsToPrepareApiData($fetchOptions)
-        );
-
-        if (empty($conversation)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('requested_conversation_not_found'),
-                404
-            ));
-        }
-
-        return $conversation;
-    }
-
-    /**
-     *
-     * @return bdApi_Extend_Model_Conversation
-     */
-    protected function _getConversationModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Conversation');
-    }
-
-    /**
-     *
-     * @return bdApi_ControllerHelper_Attachment
-     */
-    protected function _getAttachmentHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('bdApi_ControllerHelper_Attachment');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_Conversation';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/ConversationMessage.php b/xenforo/library/bdApi/ControllerApi/ConversationMessage.php
deleted file mode 100755
index 75d421da..00000000
--- a/xenforo/library/bdApi/ControllerApi/ConversationMessage.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_ConversationMessage extends bdApi_ControllerApi_Abstract
-{
-
-    protected function _preDispatch($action)
-    {
-        $this->_assertRegistrationRequired();
-        $this->_assertRequiredScope(bdApi_Model_OAuth2::SCOPE_PARTICIPATE_IN_CONVERSATIONS);
-
-        parent::_preDispatch($action);
-    }
-
-    public function actionGetIndex()
-    {
-        $messageId = $this->_input->filterSingle('message_id', XenForo_Input::UINT);
-        if (!empty($messageId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        $conversationId = $this->_input->filterSingle('conversation_id', XenForo_Input::UINT);
-        if (empty($conversationId)) {
-            return $this->responseError(
-                new XenForo_Phrase('bdapi_slash_conversation_messages_requires_conversation_id'),
-                400
-            );
-        }
-
-        $conversation = $this->_getConversationOrError($conversationId);
-
-        $pageNavParams = array('conversation_id' => $conversation['conversation_id']);
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $fetchOptions = array(
-            'limit' => $limit,
-            'page' => $page
-        );
-
-        $order = $this->_input->filterSingle('order', XenForo_Input::STRING, array('default' => 'natural'));
-        switch ($order) {
-            case 'natural_reverse':
-                // load the class to make our constant accessible
-                $this->_getConversationModel();
-                $fetchOptions[bdApi_Extend_Model_Conversation::FETCH_OPTIONS_MESSAGES_ORDER_REVERSE] = true;
-                $pageNavParams['order'] = $order;
-                break;
-        }
-
-        $messages = $this->_getConversationModel()->getConversationMessages(
-            $conversation['conversation_id'],
-            $this->_getConversationModel()->getFetchOptionsToPrepareApiDataForMessages($fetchOptions)
-        );
-        if (!$this->_isFieldExcluded('attachments')) {
-            $messages = $this->_getConversationModel()->getAndMergeAttachmentsIntoConversationMessages($messages);
-        }
-
-        $total = $conversation['reply_count'] + 1;
-
-        $data = array(
-            'messages' => $this->_filterDataMany($this->_getConversationModel()->prepareApiDataForMessages(
-                $messages,
-                $conversation
-            )),
-            'messages_total' => $total
-        );
-
-        if (!$this->_isFieldExcluded('conversation')) {
-            $data['conversation'] = $this->_filterDataSingle(
-                $this->_getConversationModel()->prepareApiDataForConversation($conversation),
-                array('conversation')
-            );
-        }
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'conversation-messages',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_ConversationMessage_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $messageId = $this->_input->filterSingle('message_id', XenForo_Input::UINT);
-        $message = $this->_getMessageOrError($messageId);
-
-        $conversation = $this->_getConversationOrError($message['conversation_id']);
-
-        if (!$this->_isFieldExcluded('attachments')) {
-            $messages = array($message['message_id'] => $message);
-            $messages = $this->_getConversationModel()->getAndMergeAttachmentsIntoConversationMessages($messages);
-            $message = reset($messages);
-        }
-
-        $data = array(
-            'message' => $this->_filterDataSingle($this->_getConversationModel()->prepareApiDataForMessage(
-                $message,
-                $conversation
-            ))
-        );
-
-        return $this->responseData('bdApi_ViewApi_ConversationMessage_Single', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        $input = $this->_input->filter(array(
-            'conversation_id' => XenForo_Input::UINT,
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['message_body'] = $editorHelper->getMessageText('message_body', $this->_input);
-        $input['message_body'] = XenForo_Helper_String::autoLinkBbCode($input['message_body']);
-
-        $conversation = $this->_getConversationOrError($input['conversation_id']);
-
-        if (!$this->_getConversationModel()->canReplyToConversation($conversation, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        $messageDw = XenForo_DataWriter::create('XenForo_DataWriter_ConversationMessage');
-        $messageDw->setExtraData(XenForo_DataWriter_ConversationMessage::DATA_MESSAGE_SENDER, $visitor->toArray());
-        $messageDw->set('conversation_id', $conversation['conversation_id']);
-        $messageDw->set('user_id', $visitor['user_id']);
-        $messageDw->set('username', $visitor['username']);
-        $messageDw->set('message', $input['message_body']);
-        $messageDw->setExtraData(
-            XenForo_DataWriter_ConversationMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash($conversation)
-        );
-
-        switch ($this->_spamCheck(array(
-            'content_type' => 'conversation_message',
-            'content' => $input['message_body'],
-        ))) {
-            case self::SPAM_RESULT_MODERATED:
-            case self::SPAM_RESULT_DENIED:
-                return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                break;
-        }
-
-        $messageDw->preSave();
-
-        if ($messageDw->hasErrors()) {
-            return $this->responseErrors($messageDw->getErrors(), 400);
-        }
-
-        $this->assertNotFlooding('conversation');
-
-        $messageDw->save();
-        $message = $messageDw->getMergedData();
-
-        $this->_getConversationModel()->markConversationAsRead(
-            $conversation['conversation_id'],
-            XenForo_Visitor::getUserId(),
-            XenForo_Application::$time,
-            0,
-            false
-        );
-
-        $this->_request->setParam('message_id', $message['message_id']);
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionPutIndex()
-    {
-        $input = $this->_input->filter(array(
-            'message_id' => XenForo_Input::UINT,
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['message_body'] = $editorHelper->getMessageText('message_body', $this->_input);
-        $input['message_body'] = XenForo_Helper_String::autoLinkBbCode($input['message_body']);
-
-        $message = $this->_getMessageOrError($input['message_id']);
-        $conversation = $this->_getConversationOrError($message['conversation_id']);
-
-        if (!$this->_getConversationModel()->canEditMessage($message, $conversation, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $messageDw = XenForo_DataWriter::create('XenForo_DataWriter_ConversationMessage');
-        $messageDw->setExistingData($message, true);
-        $messageDw->set('message', $input['message_body']);
-        $messageDw->setExtraData(
-            XenForo_DataWriter_ConversationMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash($message)
-        );
-
-        switch ($this->_spamCheck(array(
-            'content_type' => 'conversation_message',
-            'content_id' => $message['message_id'],
-            'content' => $input['message_body'],
-        ))) {
-            case self::SPAM_RESULT_MODERATED:
-            case self::SPAM_RESULT_DENIED:
-                return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                break;
-        }
-
-        $messageDw->preSave();
-
-        if ($messageDw->hasErrors()) {
-            return $this->responseErrors($messageDw->getErrors(), 400);
-        }
-
-        $messageDw->save();
-
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionDeleteIndex()
-    {
-        // XenForo does not support message deletion
-        return $this->responseNoPermission();
-    }
-
-    public function actionGetAttachments()
-    {
-        $messageId = $this->_input->filterSingle('message_id', XenForo_Input::UINT);
-
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-        if (!empty($attachmentId)) {
-            return $this->responseReroute('bdApi_ControllerApi_Attachment', 'get-data');
-        }
-
-        $message = $this->_getMessageOrError($messageId);
-        $conversation = $this->_getConversationOrError($message['conversation_id']);
-
-        $messages = array($message['message_id'] => $message);
-        $messages = $this->_getConversationModel()->getAndMergeAttachmentsIntoConversationMessages($messages);
-        $messages = $this->_getConversationModel()->prepareApiDataForMessages($messages, $conversation);
-
-        $message = reset($messages);
-        $attachments = isset($message['attachments']) ? $message['attachments'] : array();
-
-        $data = array('attachments' => $this->_filterDataMany($attachments));
-
-        return $this->responseData('bdApi_ViewApi_ConversationMessage_Attachments', $data);
-    }
-
-    public function actionPostAttachments()
-    {
-        $contentData = $this->_input->filter(array(
-            'conversation_id' => XenForo_Input::UINT,
-            'message_id' => XenForo_Input::UINT,
-        ));
-        if (empty($contentData['conversation_id']) AND empty($contentData['message_id'])) {
-            return $this->responseError(
-                new XenForo_Phrase('bdapi_slash_conversation_messages_attachments_requires_ids'),
-                400
-            );
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        $response = $attachmentHelper->doUpload('file', $hash, 'conversation_message', $contentData);
-
-        if ($response instanceof XenForo_ControllerResponse_Abstract) {
-            return $response;
-        }
-
-        $data = array(
-            'attachment' => $this->_filterDataSingle(
-                $this->_getConversationModel()->prepareApiDataForAttachment(
-                    $response,
-                    $contentData,
-                    $contentData,
-                    $hash
-                )
-            )
-        );
-
-        return $this->responseData('bdApi_ViewApi_ConversationMessage_Attachments', $data);
-    }
-
-    public function actionDeleteAttachments()
-    {
-        $contentData = $this->_input->filter(array(
-            'conversation_id' => XenForo_Input::UINT,
-            'message_id' => XenForo_Input::UINT,
-        ));
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-
-        if (empty($contentData['conversation_id']) AND empty($contentData['message_id'])) {
-            return $this->responseError(
-                new XenForo_Phrase('bdapi_slash_conversation_messages_attachments_requires_ids'),
-                400
-            );
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        return $attachmentHelper->doDelete($hash, $attachmentId);
-    }
-
-    public function actionPostReport()
-    {
-        $messageId = $this->_input->filterSingle('message_id', XenForo_Input::UINT);
-        $reportMessage = $this->_input->filterSingle('message', XenForo_Input::STRING);
-
-        $message = $this->_getMessageOrError($messageId);
-        $conversation = $this->_getConversationOrError($message['conversation_id']);
-
-        if (!$this->_getConversationModel()->canReportMessage($message, $conversation, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        if (!$reportMessage) {
-            return $this->responseError(new XenForo_Phrase(
-                'bdapi_slash_x_report_requires_message',
-                array('route' => 'conversation-messages')
-            ), 400);
-        }
-
-        $this->assertNotFlooding('report');
-
-        $message['conversation'] = $conversation;
-
-        /* @var $reportModel XenForo_Model_Report */
-        $reportModel = $this->getModelFromCache('XenForo_Model_Report');
-        $reportModel->reportContent('conversation_message', $message, $reportMessage);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    protected function _getConversationOrError($conversationId, array $fetchOptions = array())
-    {
-        $conversation = $this->_getConversationModel()->getConversationForUser(
-            $conversationId,
-            XenForo_Visitor::getUserId(),
-            $this->_getConversationModel()->getFetchOptionsToPrepareApiData($fetchOptions)
-        );
-
-        if (empty($conversation)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('requested_conversation_not_found'),
-                404
-            ));
-        }
-
-        return $conversation;
-    }
-
-    protected function _getMessageOrError($messageId, array $fetchOptions = array())
-    {
-        $message = $this->_getConversationModel()->getConversationMessageById($messageId, $fetchOptions);
-
-        if (empty($message)) {
-            throw $this->responseException($this->responseError(
-                new XenForo_Phrase('requested_message_not_found'),
-                404
-            ));
-        }
-
-        return $message;
-    }
-
-    /**
-     *
-     * @return bdApi_Extend_Model_Conversation
-     */
-    protected function _getConversationModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Conversation');
-    }
-
-    /**
-     *
-     * @return bdApi_ControllerHelper_Attachment
-     */
-    protected function _getAttachmentHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('bdApi_ControllerHelper_Attachment');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_Conversation';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Error.php b/xenforo/library/bdApi/ControllerApi/Error.php
deleted file mode 100755
index fc81af02..00000000
--- a/xenforo/library/bdApi/ControllerApi/Error.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Error extends bdApi_ControllerApi_Abstract
-{
-    public function actionErrorNotFound()
-    {
-        $controllerName = $this->_request->getParam('_controllerName');
-        $action = $this->_request->getParam('_action');
-        if (substr($action, 0, 3) === 'Get') {
-            // try to suggest POST entry point if available
-            $newControllerName = XenForo_Application::resolveDynamicClass($controllerName, 'controller');
-            if (method_exists($newControllerName, 'actionPost' . substr($action, 3))) {
-                return $this->responseError(new XenForo_Phrase('bdapi_only_accepts_post_requests'), 400);
-            }
-        }
-
-        if (is_callable(array(
-            $this,
-            'getNotFoundResponse'
-        ))) {
-            // XenForo 1.2.0+ has this
-            return $this->getNotFoundResponse();
-        }
-
-        if (XenForo_Application::debugMode()) {
-            $controllerName = $this->_request->getParam('_controllerName');
-
-            if (empty($controllerName)) {
-                return $this->responseError(new XenForo_Phrase(
-                    'controller_for_route_not_found',
-                    array('routePath' => $this->_request->getParam('_origRoutePath'))
-                ), 404);
-            } else {
-                return $this->responseError(new XenForo_Phrase('controller_x_does_not_define_action_y', array(
-                    'controller' => $controllerName,
-                    'action' => $this->_request->getParam('_action')
-                )), 404);
-            }
-        } else {
-            return $this->responseError(new XenForo_Phrase('requested_page_not_found'), 404);
-        }
-    }
-
-    public function actionErrorServer()
-    {
-        return $this->responseError(new XenForo_Phrase('server_error_occurred'), 500);
-    }
-
-    public function actionNoPermission()
-    {
-        /** @var bdApi_Model_OAuth2 $oauth2Model */
-        $oauth2Model = XenForo_Model::create('bdApi_Model_OAuth2');
-        $controllerResponse = $oauth2Model->getServer()->getErrorControllerResponse($this);
-
-        if (empty($controllerResponse)) {
-            $controllerResponse = $this->responseError(new XenForo_Phrase('do_not_have_permission'), 403);
-        }
-
-        return $controllerResponse;
-    }
-
-    public function actionRegistrationRequired()
-    {
-        return $this->responseError(new XenForo_Phrase('must_be_registered'), 403);
-    }
-
-    public function actionBanned()
-    {
-        return $this->responseError(new XenForo_Phrase('you_have_been_banned'), 403);
-    }
-
-    public function actionBannedIp()
-    {
-        return $this->responseError(new XenForo_Phrase('your_ip_address_has_been_banned'), 403);
-    }
-
-    protected function _assertIpNotBanned()
-    {
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-    }
-
-    protected function _assertNotBanned()
-    {
-    }
-
-    protected function _assertBoardActive($action)
-    {
-    }
-
-    protected function _assertCorrectVersion($action)
-    {
-    }
-
-    public function updateSessionActivity($controllerResponse, $controllerName, $action)
-    {
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        // no scope checking for this controller
-        return false;
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Forum.php b/xenforo/library/bdApi/ControllerApi/Forum.php
deleted file mode 100755
index 1fd528fa..00000000
--- a/xenforo/library/bdApi/ControllerApi/Forum.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Forum extends bdApi_ControllerApi_Node
-{
-    public function actionGetFollowed()
-    {
-        $this->_assertRegistrationRequired();
-
-        if ($this->_input->inRequest('total')) {
-            $total = 0;
-            if (XenForo_Application::$versionId >= 1020000) {
-                $total = $this->_getForumWatchModel()->bdApi_countUserForumWatchByUser(XenForo_Visitor::getUserId());
-            }
-            $data = array('forums_total' => $total);
-            return $this->responseData('bdApi_ViewApi_Forum_Followed_Total', $data);
-        }
-
-        $forums = array();
-
-        if (XenForo_Application::$versionId >= 1020000) {
-            $forumWatches = $this->_getForumWatchModel()->getUserForumWatchByUser(XenForo_Visitor::getUserId());
-
-            $nodeIds = array();
-            foreach ($forumWatches as $forumWatch) {
-                $nodeIds[] = $forumWatch['node_id'];
-            }
-
-            $forums = $this->_getForumModel()->getForumsByIds(
-                $nodeIds,
-                $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-            );
-            $forums = $this->_getForumModel()->prepareApiDataForForums($forums);
-
-            foreach ($forumWatches as $forumWatch) {
-                foreach ($forums as &$forum) {
-                    if ($forumWatch['node_id'] == $forum['forum_id']) {
-                        $forum = $this->_getForumWatchModel()->prepareApiDataForForumWatches($forum, $forumWatch);
-                    }
-                }
-            }
-        }
-
-        $data = array('forums' => $this->_filterDataMany($forums));
-
-        return $this->responseData('bdApi_ViewApi_Forum_Followed', $data);
-    }
-
-    public function actionGetFollowers()
-    {
-        $users = array();
-
-        if (XenForo_Application::$versionId >= 1020000) {
-            $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-            $forum = $this->_getForumThreadPostHelper()->assertForumValidAndViewable($nodeId);
-
-            if ($this->_getForumModel()->canWatchForum($forum)) {
-                $visitor = XenForo_Visitor::getInstance();
-                $forumWatch = $this->_getForumWatchModel()->getUserForumWatchByForumId(
-                    $visitor['user_id'],
-                    $forum['node_id']
-                );
-
-                if (!empty($forumWatch)) {
-                    $user = array(
-                        'user_id' => $visitor['user_id'],
-                        'username' => $visitor['username'],
-                    );
-
-                    $user = $this->_getForumWatchModel()->prepareApiDataForForumWatches($user, $forumWatch);
-
-                    $users[] = $user;
-                }
-            }
-        }
-
-        $data = array('users' => $this->_filterDataMany($users));
-
-        return $this->responseData('bdApi_ViewApi_Forum_Followers', $data);
-    }
-
-    public function actionPostFollowers()
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            return $this->responseNoPermission();
-        }
-
-        $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-        $post = $this->_input->filterSingle('post', XenForo_Input::UINT);
-        $sendAlert = $this->_input->filterSingle('alert', XenForo_Input::UINT, array('default' => 1));
-        $sendEmail = $this->_input->filterSingle('email', XenForo_Input::UINT);
-
-        $forum = $this->_getForumThreadPostHelper()->assertForumValidAndViewable($nodeId);
-
-        if (!$this->_getForumModel()->canWatchForum($forum)) {
-            return $this->responseNoPermission();
-        }
-
-        $notifyOn = ($post > 0 ? 'message' : 'thread');
-        $this->_getForumWatchModel()->setForumWatchState(
-            XenForo_Visitor::getUserId(),
-            $forum['node_id'],
-            $notifyOn,
-            $sendAlert,
-            $sendEmail
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteFollowers()
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            return $this->responseNoPermission();
-        }
-
-        $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-
-        $this->_getForumWatchModel()->setForumWatchState(XenForo_Visitor::getUserId(), $nodeId, 'delete');
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    protected function _getControllerName()
-    {
-        return 'bdApi_ControllerApi_Forum';
-    }
-
-    protected function _getNameSingular()
-    {
-        return 'forum';
-    }
-
-    protected function _getNamePlural()
-    {
-        return 'forums';
-    }
-
-    protected function _getAll($parentNodeId = false)
-    {
-        $nodes = $this->_getNodeModel()->getViewableNodeList();
-
-        $forumIds = array();
-        foreach ($nodes as $node) {
-            if ($parentNodeId !== false AND $node['parent_node_id'] != $parentNodeId) {
-                continue;
-            }
-
-            if ($node['node_type_id'] === 'Forum') {
-                $forumIds[] = $node['node_id'];
-            }
-        }
-
-        return $this->_getForumModel()->getForumsByIds(
-            $forumIds,
-            $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-        );
-    }
-
-    protected function _getSingle($nodeId)
-    {
-        return $this->_getForumModel()->getForumById(
-            $nodeId,
-            $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-        );
-    }
-
-    protected function _isViewable(array $forum)
-    {
-        return $this->_getForumModel()->canViewForum($forum);
-    }
-
-    protected function _prepareApiDataForNodes(array $forums)
-    {
-        return $this->_getForumModel()->prepareApiDataForForums($forums);
-    }
-
-    protected function _prepareApiDataForNode(array $forum)
-    {
-        return $this->_getForumModel()->prepareApiDataForForum($forum);
-    }
-
-    protected function _responseErrorNotFound()
-    {
-        return $this->responseError(new XenForo_Phrase('requested_forum_not_found'), 404);
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Forum
-     */
-    protected function _getForumModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Forum');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_ForumWatch
-     */
-    protected function _getForumWatchModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_ForumWatch');
-    }
-
-    /**
-     * @return XenForo_ControllerHelper_ForumThreadPost
-     */
-    protected function _getForumThreadPostHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('ForumThreadPost');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Index.php b/xenforo/library/bdApi/ControllerApi/Index.php
deleted file mode 100755
index 59d05a5b..00000000
--- a/xenforo/library/bdApi/ControllerApi/Index.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Index extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        $systemInfo = array();
-        if ($session->getOAuthClientId() === '') {
-            $systemInfo += array(
-                'oauth/authorize' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                    'oauth/authorize',
-                    array(),
-                    array('oauth_token' => '')
-                ),
-                'oauth/token' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                    'oauth/token',
-                    array(),
-                    array('oauth_token' => '')
-                ),
-            );
-        }
-        if ($session->checkScope(bdApi_Model_OAuth2::SCOPE_POST)) {
-            $systemInfo = array(
-                // YYYYMMDD and 2 digits number (01-99), allowing maximum 99 revisions/day
-                'api_revision' => 2016062001,
-                'api_modules' => $this->_getModules(),
-            );
-        }
-
-        $data = array();
-        $data['links'] = array(
-            'search' => bdApi_Data_Helper_Core::safeBuildApiLink('search'),
-            'navigation' => bdApi_Data_Helper_Core::safeBuildApiLink('navigation', array(), array('parent' => 0)),
-            'threads/recent' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'threads/recent',
-                array(),
-                array('data_limit' => XenForo_Application::get('options')->discussionsPerPage)
-            ),
-            'users' => bdApi_Data_Helper_Core::safeBuildApiLink('users'),
-        );
-
-        if ($visitor['user_id'] > 0) {
-            $data['links']['conversations'] = bdApi_Data_Helper_Core::safeBuildApiLink('conversations');
-            $data['links']['forums/followed'] = bdApi_Data_Helper_Core::safeBuildApiLink('forums/followed');
-            $data['links']['notifications'] = bdApi_Data_Helper_Core::safeBuildApiLink('notifications');
-            $data['links']['threads/followed'] = bdApi_Data_Helper_Core::safeBuildApiLink('threads/followed');
-            $data['links']['threads/new'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'threads/new',
-                array(),
-                array('data_limit' => XenForo_Application::get('options')->discussionsPerPage)
-            );
-            $data['links']['users/ignored'] = bdApi_Data_Helper_Core::safeBuildApiLink('users/ignored');
-            $data['links']['users/me'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'users',
-                XenForo_Visitor::getInstance()->toArray(),
-                array('oauth_token' => '')
-            );
-
-            if ($visitor->canUpdateStatus()) {
-                $data['post']['status'] = bdApi_Data_Helper_Core::safeBuildApiLink('users/me/timeline');
-            }
-        }
-
-        $data['system_info'] = $systemInfo;
-
-        return $this->responseData('bdApi_ViewApi_Index', $data);
-    }
-
-    protected function _getModules()
-    {
-        $modules = array(
-            'forum' => 2017111102,
-            'oauth2' => 2016030902,
-            'subscription' => 2014092301,
-        );
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (!!$session->getOAuthClientOption('allow_search_indexing')) {
-            $modules['search/indexing'] = 2015091601;
-        }
-        if (!!$session->getOAuthClientOption('allow_user_0_subscription')) {
-            $modules['subscriptions?hub_topic=user_0'] = 2016100501;
-        }
-
-        return $modules;
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        // no scope checking for this controller
-        return false;
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-    }
-
-    protected function _assertBoardActive($action)
-    {
-    }
-
-    public static function getSessionActivityDetailsForList(array $activities)
-    {
-        $clientIds = array();
-        foreach ($activities AS $activity) {
-            if (!empty($activity['params']['client_id'])) {
-                $clientIds[] = $activity['params']['client_id'];
-            }
-        }
-
-        $clients = array();
-
-        if (!empty($clientIds)) {
-            $clientIds = array_unique($clientIds);
-
-            /** @var bdApi_Model_Client $clientModel */
-            $clientModel = XenForo_Model::create('bdApi_Model_Client');
-            $clients = $clientModel->getClients(array('client_id' => $clientIds));
-        }
-
-        $output = array();
-        foreach ($activities AS $key => $activity) {
-            $client = null;
-            if (!empty($activity['params']['client_id'])
-                && isset($clients[$activity['params']['client_id']])
-            ) {
-                $client = $clients[$activity['params']['client_id']];
-            }
-
-            if (!empty($client)) {
-                $output[$key] = array(
-                    new XenForo_Phrase('bdapi_using_client'),
-                    $client['name'],
-                    $client['redirect_uri'],
-                    false
-                );
-            } else {
-                $output[$key] = new XenForo_Phrase('viewing_forum_list');
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Navigation.php b/xenforo/library/bdApi/ControllerApi/Navigation.php
deleted file mode 100644
index 84f83088..00000000
--- a/xenforo/library/bdApi/ControllerApi/Navigation.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Navigation extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $parent = $this->_input->filterSingle('parent', XenForo_Input::STRING);
-
-        $visitor = XenForo_Visitor::getInstance();
-        $nodePermissions = $this->_getNodeModel()->getNodePermissionsForPermissionCombination();
-        foreach ($nodePermissions as $nodeId => $permissions) {
-            $visitor->setNodePermissions($nodeId, $permissions);
-        }
-
-        $elements = $this->_getElements($parent);
-
-        $viewParams = array(
-            'elements' => $this->_filterDataMany($elements),
-            'elements_count' => count($elements),
-        );
-
-        return $this->responseData('bdApi_ViewApi_Navigation_Index', $viewParams);
-    }
-
-    protected function _getElements($parent)
-    {
-        if (is_numeric($parent)) {
-            if ($parent > 0) {
-                // return children of specified element
-                $parentNode = $this->_getNodeModel()->getNodeById($parent);
-                if (empty($parentNode)) {
-                    throw $this->responseException($this->responseError(
-                        new XenForo_Phrase('bdapi_navigation_element_not_found'),
-                        404
-                    ));
-                }
-
-                $expectedParentNodeId = intval($parentNode['node_id']);
-            } else {
-                // return root elements
-                $parentNode = false;
-                $expectedParentNodeId = 0;
-            }
-        } else {
-            // return all viewable elements
-            $parentNode = false;
-            $expectedParentNodeId = null;
-        }
-
-        $nodeList = $this->_getNodeModel()->getNodeDataForListDisplay($parentNode, 0);
-        $elements = array();
-
-        if (!empty($nodeList['nodesGrouped'])) {
-            $forumIds = array();
-            $forums = array();
-            foreach ($nodeList['nodesGrouped'] as $parentNodeId => $nodes) {
-                foreach ($nodes as $node) {
-                    if ($node['node_type_id'] === 'Forum') {
-                        $forumIds[] = $node['node_id'];
-                    }
-                }
-            }
-
-            if (!empty($forumIds)) {
-                $forums = $this->_getForumModel()->getForumsByIds(
-                    $forumIds,
-                    $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-                );
-            }
-
-            $arrangeOptions = array(
-                'expectedParentNodeId' => $expectedParentNodeId,
-                'forums' => $forums,
-            );
-            $this->_arrangeElements(
-                $elements,
-                $nodeList['nodesGrouped'],
-                is_int($expectedParentNodeId) ? $expectedParentNodeId : 0,
-                $arrangeOptions
-            );
-        }
-
-        return $elements;
-    }
-
-    protected function _arrangeElements(
-        array &$elements,
-        array &$nodesGrouped,
-        $parentNodeId,
-        array &$options = array()
-    ) {
-        foreach ($nodesGrouped as $_parentNodeId => $nodes) {
-            if ($parentNodeId != $_parentNodeId) {
-                continue;
-            }
-
-            foreach ($nodes as $node) {
-                $element = false;
-
-                switch ($node['node_type_id']) {
-                    case 'Category':
-                        $element = $this->_getCategoryModel()->prepareApiDataForCategory($node);
-                        break;
-                    case 'Forum':
-                        if (!empty($options['forums'][$node['node_id']])) {
-                            $element = $this->_getForumModel()->prepareApiDataForForum($options['forums'][$node['node_id']]);
-                        }
-                        break;
-                    case 'LinkForum':
-                        $element = $this->_getLinkForumModel()->prepareApiDataForLinkForum($node);
-                        break;
-                    case 'Page':
-                        $element = $this->_getPageModel()->prepareApiDataForPage($node);
-                        break;
-                }
-
-                if (!empty($element)) {
-                    $element['navigation_type'] = strtolower($node['node_type_id']);
-                    $element['navigation_id'] = $node['node_id'];
-                    $element['navigation_parent_id'] = $node['parent_node_id'];
-
-                    $element['has_sub_elements'] = !empty($nodesGrouped[$node['node_id']]);
-                    if ($element['has_sub_elements']) {
-                        if (empty($element['links'])) {
-                            $element['links'] = array();
-                        }
-
-                        $element['links']['sub-elements'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                            'navigation',
-                            '',
-                            array('parent' => $element['navigation_id'])
-                        );
-                    }
-
-                    $elements[] = $element;
-
-                    if ($element['has_sub_elements'] && !is_int($options['expectedParentNodeId'])) {
-                        $this->_arrangeElements($elements, $nodesGrouped, intval($node['node_id']), $options);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Category
-     */
-    protected function _getCategoryModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Category');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Forum
-     */
-    protected function _getForumModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Forum');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_LinkForum
-     */
-    protected function _getLinkForumModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_LinkForum');
-    }
-
-    /**
-     * @return XenForo_Model_Node
-     */
-    protected function _getNodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Node');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Page
-     */
-    protected function _getPageModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Page');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_Forum';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Node.php b/xenforo/library/bdApi/ControllerApi/Node.php
deleted file mode 100755
index 4dd042d0..00000000
--- a/xenforo/library/bdApi/ControllerApi/Node.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-abstract class bdApi_ControllerApi_Node extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-        if (!empty($nodeId)) {
-            return $this->responseReroute($this->_getControllerName(), 'single');
-        }
-
-        $parentId = $this->_input->filterSingle('parent_category_id', XenForo_Input::STRING);
-        if ($parentId === '') {
-            $parentId = $this->_input->filterSingle('parent_forum_id', XenForo_Input::STRING);
-        }
-        if ($parentId === '') {
-            $parentId = $this->_input->filterSingle('parent_page_id', XenForo_Input::STRING);
-        }
-        if ($parentId === '') {
-            $parentId = false;
-        } else {
-            $parentId = intval($parentId);
-        }
-
-        $nodes = $this->_getAll($parentId);
-
-        $order = $this->_input->filterSingle('order', XenForo_Input::STRING, array('default' => 'natural'));
-        switch ($order) {
-            case 'list':
-                usort($nodes, function ($a, $b) {
-                    return ($a['lft'] == $b['lft'] ? 0 : ($a['lft'] < $b['lft'] ? -1 : 1));
-                });
-                break;
-        }
-
-        $data = array(
-            $this->_getNamePlural() => $this->_filterDataMany($this->_prepareApiDataForNodes($nodes)),
-            $this->_getNamePlural() . '_total' => count($nodes),
-        );
-
-        return $this->responseData('bdApi_ViewApi_Node_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-
-        $node = $this->_getSingle($nodeId);
-
-        if (empty($node) OR !$this->_isViewable($node)) {
-            return $this->_responseErrorNotFound();
-        }
-
-        $data = array(
-            $this->_getNameSingular() => $this->_filterDataSingle($this->_prepareApiDataForNode($node)),
-            '_node' => $node,
-        );
-
-        return $this->responseData('bdApi_ViewApi_Node_Single', $data);
-    }
-
-    /**
-     * @return XenForo_Model_Node
-     */
-    protected function _getNodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Node');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_Forum';
-    }
-
-    abstract protected function _getControllerName();
-
-    abstract protected function _getNameSingular();
-
-    abstract protected function _getNamePlural();
-
-    abstract protected function _getAll($parentNodeId = false);
-
-    abstract protected function _getSingle($nodeId);
-
-    abstract protected function _isViewable(array $node);
-
-    abstract protected function _prepareApiDataForNodes(array $nodes);
-
-    abstract protected function _prepareApiDataForNode(array $node);
-
-    abstract protected function _responseErrorNotFound();
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Notification.php b/xenforo/library/bdApi/ControllerApi/Notification.php
deleted file mode 100755
index c642bf6b..00000000
--- a/xenforo/library/bdApi/ControllerApi/Notification.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Notification extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $this->_assertRegistrationRequired();
-
-        $alertModel = $this->_getAlertModel();
-        $visitor = XenForo_Visitor::getInstance();
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $alertResults = $alertModel->getAlertsForUser(
-            $visitor['user_id'],
-            XenForo_Model_Alert::FETCH_MODE_RECENT,
-            array(
-                'page' => $page,
-                'limit' => $limit
-            )
-        );
-        $alerts =& $alertResults['alerts'];
-
-        $total = $alertModel->countAlertsForUser($visitor['user_id']);
-
-        $data = array(
-            'notifications' => $this->_filterDataMany($this->_getAlertModel()->prepareApiDataForAlerts($alerts)),
-            'notifications_total' => $total,
-            'links' => array(
-                'read' => bdApi_Data_Helper_Core::safeBuildApiLink('notifications/read'),
-            ),
-
-            '_alerts' => $alerts,
-            '_alertHandlers' => $alertResults['alertHandlers'],
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'notifications',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_Notification_List', $data);
-    }
-
-    public function actionPostRead()
-    {
-        $this->_assertRegistrationRequired();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if ($visitor['alerts_unread'] > 0) {
-            $this->_getAlertModel()->markAllAlertsReadForUser($visitor['user_id']);
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-
-    public function actionGetContent()
-    {
-        $id = $this->_input->filterSingle('notification_id', XenForo_Input::UINT);
-        $alert = $this->_getAlertModel()->getAlertById($id);
-        if (empty($alert)) {
-            return $this->responseNoPermission();
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-        if ($visitor['user_id'] != $alert['alerted_user_id']) {
-            return $this->responseNoPermission();
-        }
-
-        $controllerResponse = $this->_actionGetContent_getControllerResponse($alert);
-        if (!empty($controllerResponse)) {
-            return $controllerResponse;
-        }
-
-        // alert content type not recognized...
-        return $this->_actionGetContent_getControllerResponseNop($alert);
-    }
-
-
-    protected function _actionGetContent_getControllerResponseNop(array $alert = null)
-    {
-        return $this->responseData('bdApi_ViewApi_Notification_Content', array(
-            'notification_id' => !empty($alert['alert_id']) ? $alert['alert_id'] : null,
-        ));
-    }
-
-    protected function _actionGetContent_getControllerResponse(array $alert)
-    {
-        switch ($alert['content_type']) {
-            case 'conversation':
-                // NOTE: currently XenForo does not send this type of alert
-                switch ($alert['action']) {
-                    case 'insert':
-                    case 'join':
-                    case 'reply':
-                        $this->_request->setParam('conversation_id', $alert['content_id']);
-                        return $this->responseReroute('bdApi_ControllerApi_ConversationMessage', 'get-index');
-                }
-                $this->_request->setParam('conversation_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_Conversation', 'get-index');
-
-            case 'thread':
-                $this->_request->setParam('thread_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_Post', 'get-index');
-            case 'post':
-                $this->_request->setParam('page_of_post_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_Post', 'get-index');
-
-            case 'user':
-                switch ($alert['action']) {
-                    case 'following':
-                        $this->_request->setParam('user_id', $alert['content_id']);
-                        return $this->responseReroute('bdApi_ControllerApi_User', 'get-followers');
-                    case 'post_copy':
-                    case 'post_move':
-                    case 'thread_merge':
-                        $extra = @unserialize($alert['extra_data']);
-                        if (!empty($extra['targetLink'])) {
-                            $this->_request->setParam('link', $extra['targetLink']);
-                            return $this->responseReroute('bdApi_ControllerApi_Tool', 'get-parse-link');
-                        }
-                        break;
-                    case 'thread_move':
-                        $extra = @unserialize($alert['extra_data']);
-                        if (!empty($extra['link'])) {
-                            $this->_request->setParam('link', $extra['link']);
-                            return $this->responseReroute('bdApi_ControllerApi_Tool', 'get-parse-link');
-                        }
-                        break;
-                }
-                $this->_request->setParam('user_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_User', 'get-index');
-
-            case 'profile_post':
-                $this->_request->setParam('profile_post_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_ProfilePost', 'get-comments');
-            case 'profile_post_comment':
-                // NOTE: currently XenForo does not send this type of alert
-                $this->_request->setParam('page_of_comment_id', $alert['content_id']);
-                return $this->responseReroute('bdApi_ControllerApi_ProfilePost', 'get-comments');
-        }
-
-        return null;
-    }
-
-    /**
-     * @return bdApi_XenForo_Model_Alert
-     */
-    protected function _getAlertModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Alert');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/OAuth.php b/xenforo/library/bdApi/ControllerApi/OAuth.php
deleted file mode 100755
index d2189f20..00000000
--- a/xenforo/library/bdApi/ControllerApi/OAuth.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_OAuth extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetAuthorize()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        $authorizeParams = $this->_input->filter($oauth2Model->getAuthorizeParamsInputFilter());
-
-        return $this->responseRedirect(
-            XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT,
-            XenForo_Link::buildPublicLink('account/authorize', array(), $authorizeParams)
-        );
-    }
-
-    public function actionPostToken()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        // decrypt password for password grant type
-        // we also need to recover the client secret for verification purpose
-        $input = $this->_input->filter(array(
-            'client_id' => XenForo_Input::STRING,
-            'password' => XenForo_Input::STRING,
-            'password_algo' => XenForo_Input::STRING,
-        ));
-        if (!empty($input['client_id']) AND !empty($input['password']) AND !empty($input['password_algo'])) {
-            $client = $oauth2Model->getClientModel()->getClientById($input['client_id']);
-            if (!empty($client)) {
-                $password = bdApi_Crypt::decrypt($input['password'], $input['password_algo'], $client['client_secret']);
-                $_POST['password'] = $password;
-                $_POST['password_algo'] = '';
-                $_POST['client_secret'] = $client['client_secret'];
-            }
-        }
-
-        return $oauth2Model->getServer()->actionOauthToken($this);
-    }
-
-    public function actionPostTokenFacebook()
-    {
-        $client = $this->_getClientOrError();
-
-        /* @var $userModel XenForo_Model_User */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        /* @var $userExternalModel XenForo_Model_UserExternal */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $facebookToken = $this->_input->filterSingle('facebook_token', XenForo_Input::STRING);
-        $facebookUser = XenForo_Helper_Facebook::getUserInfo($facebookToken);
-        $userData = array();
-        if (empty($facebookUser['id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_invalid_facebook_token'));
-        }
-
-        // create a provider key tied between current API client and Facebook ID
-        // this needs to be done because Facebook uses app-scoped user IDs and they are
-        // different from app to app (even with the same user)
-        $externalProvider = 'api_' . $client['client_id'];
-        $externalProviderKey = sprintf('fb_%s', $facebookUser['id']);
-        $facebookApp = @file_get_contents(sprintf(
-            'https://graph.facebook.com/app?access_token=%s',
-            rawurlencode($facebookToken)
-        ));
-        $facebookApp = @json_decode($facebookApp, true);
-        if (!empty($facebookApp['id'])
-            && $facebookApp['id'] === XenForo_Application::getOptions()->get('facebookAppId')
-        ) {
-            // looks like the facebook_token is generated using the same app configured for XenForo
-            // we will use the reported Facebook user ID directly to make it easier for user
-            // when he/she login via Facebook on the web
-            $externalProvider = 'facebook';
-            $externalProviderKey = $facebookUser['id'];
-        }
-
-        // attempt #1: try to find the association using our provider key
-        $facebookAssoc = $userExternalModel->getExternalAuthAssociation($externalProvider, $externalProviderKey);
-        if (!empty($facebookAssoc)) {
-            return $this->_actionPostTokenNonStandard($client, $facebookAssoc['user_id']);
-        }
-
-        if (!empty($facebookUser['email'])) {
-            $user = $userModel->getUserByEmail($facebookUser['email']);
-            if (empty($user)) {
-                // good email
-                $userData['user_email'] = $facebookUser['email'];
-            } else {
-                $userData['associatable'][$user['user_id']] = array(
-                    'user_id' => $user['user_id'],
-                    'username' => $user['username'],
-                    'user_email' => $user['email'],
-                );
-            }
-        }
-
-        if (!empty($facebookUser['name'])) {
-            $testDw = XenForo_DataWriter::create('XenForo_DataWriter_User');
-            $testDw->set('username', $facebookUser['name']);
-            if (!$testDw->hasErrors()) {
-                // good username
-                $userData['username'] = $facebookUser['name'];
-            }
-        }
-
-        $extraData = array(
-            'external_provider' => $externalProvider,
-            'external_provider_key' => $externalProviderKey,
-        );
-        if (!empty($userData['user_email'])) {
-            $extraData['user_email'] = $userData['user_email'];
-        }
-        $extraData = serialize($extraData);
-        $extraTimestamp = time() + bdApi_Option::get('refreshTokenTTLDays') * 86400;
-        $userData += array(
-            'extra_data' => bdApi_Crypt::encryptTypeOne($extraData, $extraTimestamp),
-            'extra_timestamp' => $extraTimestamp,
-        );
-
-        $data = array(
-            'status' => 'ok',
-            'message' => new XenForo_Phrase('bdapi_no_facebook_association_found'),
-            'user_data' => $userData,
-        );
-
-        return $this->responseData('bdApi_ViewApi_OAuth_TokenFacebook_NoAssoc', $data);
-    }
-
-    public function actionPostTokenTwitter()
-    {
-        $client = $this->_getClientOrError();
-
-        /* @var $userExternalModel XenForo_Model_UserExternal */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $twitterUri = $this->_input->filterSingle('twitter_uri', XenForo_Input::STRING);
-        $twitterAuth = $this->_input->filterSingle('twitter_auth', XenForo_Input::STRING);
-
-        if (!Zend_Uri::check($twitterUri)) {
-            return $this->responseNoPermission();
-        }
-        $twitterUriScheme = parse_url($twitterUri, PHP_URL_SCHEME);
-        if ($twitterUriScheme !== 'https') {
-            return $this->responseNoPermission();
-        }
-        $twitterUriHost = parse_url($twitterUri, PHP_URL_HOST);
-        if (!in_array($twitterUriHost, array('twitter.com', 'api.twitter.com'))) {
-            return $this->responseNoPermission();
-        }
-
-        $twitterClient = XenForo_Helper_Http::getClient($twitterUri);
-        $twitterClient->setHeaders('Authorization', $twitterAuth);
-        $twitterResponse = $twitterClient->request('GET');
-        $twitterUser = @json_decode($twitterResponse->getBody(), true);
-        if (empty($twitterUser['id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_invalid_twitter_token'));
-        }
-
-        $twitterAssoc = $userExternalModel->getExternalAuthAssociation('twitter', $twitterUser['id']);
-        if (!empty($twitterAssoc)) {
-            return $this->_actionPostTokenNonStandard($client, $twitterAssoc['user_id']);
-        }
-
-        $userData = array();
-
-        if (!empty($twitterUser['screen_name'])) {
-            $testDw = XenForo_DataWriter::create('XenForo_DataWriter_User');
-            $testDw->set('username', $twitterUser['screen_name']);
-            if (!$testDw->hasErrors()) {
-                // good username
-                $userData['username'] = $twitterUser['screen_name'];
-            }
-        }
-
-        $extraData = array(
-            'external_provider' => 'twitter',
-            'external_provider_key' => $twitterUser['id'],
-        );
-        $extraData = serialize($extraData);
-        $extraTimestamp = time() + bdApi_Option::get('refreshTokenTTLDays') * 86400;
-        $userData += array(
-            'extra_data' => bdApi_Crypt::encryptTypeOne($extraData, $extraTimestamp),
-            'extra_timestamp' => $extraTimestamp,
-        );
-
-        $data = array(
-            'status' => 'ok',
-            'message' => new XenForo_Phrase('bdapi_no_twitter_association_found'),
-            'user_data' => $userData,
-        );
-
-        return $this->responseData('bdApi_ViewApi_OAuth_TokenTwitter_NoAssoc', $data);
-    }
-
-    public function actionPostTokenGoogle()
-    {
-        $client = $this->_getClientOrError();
-
-        /* @var $userModel XenForo_Model_User */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        /* @var $userExternalModel XenForo_Model_UserExternal */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $googleToken = $this->_input->filterSingle('google_token', XenForo_Input::STRING);
-        $isAccessToken = true;
-
-        $parts = explode('.', $googleToken);
-        if (count($parts) === 3) {
-            $jwt = @json_decode(base64_decode($parts[1]), true);
-            if (!empty($jwt['sub'])) {
-                // looks like a valid jwt
-                $isAccessToken = false;
-            }
-        }
-
-        if ($isAccessToken) {
-            $httpClient = XenForo_Helper_Http::getClient('https://www.googleapis.com/plus/v1/people/me');
-            $httpClient->setParameterGet('access_token', $googleToken);
-            $response = $httpClient->request('GET');
-            $googleUser = json_decode($response->getBody(), true);
-            if (empty($googleUser['id'])) {
-                return $this->responseError(new XenForo_Phrase('bdapi_invalid_google_token'));
-            }
-        } else {
-            $httpClient = XenForo_Helper_Http::getClient('https://www.googleapis.com/oauth2/v3/tokeninfo');
-            $httpClient->setParameterGet('id_token', $googleToken);
-            $response = $httpClient->request('GET');
-            $googleTokenInfo = json_decode($response->getBody(), true);
-            if (empty($googleTokenInfo['sub'])) {
-                return $this->responseError(new XenForo_Phrase('bdapi_invalid_google_token'));
-            }
-            $googleUser = array(
-                'id' => $googleTokenInfo['sub'],
-            );
-            if (!empty($googleTokenInfo['name'])) {
-                $googleUser['displayName'] = $googleTokenInfo['name'];
-            }
-            if (!empty($googleTokenInfo['email'])
-                && !empty($googleTokenInfo['email_verified'])
-            ) {
-                $googleUser['emails'] = array(array('value' => $googleTokenInfo['email']));
-            }
-        }
-
-        $googleAssoc = $userExternalModel->getExternalAuthAssociation('google', $googleUser['id']);
-        if (!empty($googleAssoc)) {
-            return $this->_actionPostTokenNonStandard($client, $googleAssoc['user_id']);
-        }
-
-        $userData = array();
-
-        if (!empty($googleUser['displayName'])) {
-            $testDw = XenForo_DataWriter::create('XenForo_DataWriter_User');
-            $testDw->set('username', $googleUser['displayName']);
-            if (!$testDw->hasErrors()) {
-                // good username
-                $userData['username'] = $googleUser['displayName'];
-            }
-        }
-
-        if (!empty($googleUser['emails'])) {
-            $googleEmails = array();
-            foreach ($googleUser['emails'] as $_googleEmail) {
-                $googleEmails[] = $_googleEmail['value'];
-            }
-
-            $emailUsers = $userModel->getUsers(array(
-                'emails' => $googleEmails,
-            ));
-            foreach ($googleEmails as $googleEmail) {
-                $emailUserFound = null;
-                foreach ($emailUsers as $emailUser) {
-                    if ($emailUser['email'] == $googleEmail) {
-                        $emailUserFound = $emailUser;
-                        break;
-                    }
-                }
-
-                if ($emailUserFound === null) {
-                    $userData['user_email'] = $googleEmail;
-                } else {
-                    $userData['associatable'][$emailUserFound['user_id']] = array(
-                        'user_id' => $emailUserFound['user_id'],
-                        'username' => $emailUserFound['username'],
-                        'user_email' => $emailUserFound['email'],
-                    );
-                }
-            }
-        }
-
-        if (!empty($googleUser['birthday'])) {
-            if (preg_match(
-                '#^(?<year>\d+)-(?<month>\d+)-(?<day>\d+)$#',
-                $googleUser['birthday'],
-                $birthdayMatches
-            )) {
-                $userData['user_dob_year'] = $birthdayMatches['year'];
-                $userData['user_dob_month'] = $birthdayMatches['month'];
-                $userData['user_dob_day'] = $birthdayMatches['day'];
-            }
-        }
-
-        $extraData = array(
-            'external_provider' => 'google',
-            'external_provider_key' => $googleUser['id'],
-        );
-        if (!empty($userData['user_email'])) {
-            $extraData['user_email'] = $userData['user_email'];
-        }
-        $extraData = serialize($extraData);
-        $extraTimestamp = time() + bdApi_Option::get('refreshTokenTTLDays') * 86400;
-        $userData += array(
-            'extra_data' => bdApi_Crypt::encryptTypeOne($extraData, $extraTimestamp),
-            'extra_timestamp' => $extraTimestamp,
-        );
-
-        $data = array(
-            'status' => 'ok',
-            'message' => new XenForo_Phrase('bdapi_no_google_association_found'),
-            'user_data' => $userData,
-        );
-
-        return $this->responseData('bdApi_ViewApi_OAuth_TokenGoogle_NoAssoc', $data);
-    }
-
-    public function actionPostTokenAdmin()
-    {
-        $this->_assertAdminPermission('user');
-
-        $client = $this->_getClientOrError();
-
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        if (empty($userId)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_oauth_token_admin_requires_user_id'), 400);
-        }
-
-        return $this->_actionPostTokenNonStandard($client, $userId, false);
-    }
-
-    public function actionPostTokenAssociate()
-    {
-        $input = $this->_input->filter(array(
-            'user_id' => XenForo_Input::UINT,
-            'password' => XenForo_Input::STRING,
-            'extra_data' => XenForo_Input::STRING,
-            'extra_timestamp' => XenForo_Input::UINT,
-        ));
-        if (empty($input['user_id'])
-            || empty($input['password'])
-            || empty($input['extra_data'])
-            || empty($input['extra_timestamp'])
-        ) {
-            return $this->responseNoPermission();
-        }
-
-        /** @var XenForo_Model_User $userModel */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        $user = $userModel->getUserById($input['user_id']);
-        if (empty($user)) {
-            return $this->responseError(new XenForo_Phrase('requested_user_not_found'), 400);
-        }
-
-        $_POST['username'] = $user['username'];
-        $_POST['grant_type'] = 'password';
-        $response = $this->actionPostToken();
-        if ($response instanceof XenForo_ControllerResponse_View
-            && !empty($response->params['_statusCode'])
-            && $response->params['_statusCode'] == 200
-        ) {
-            // good
-        } else {
-            return $response;
-        }
-
-        $extraData = bdApi_Crypt::decryptTypeOne($input['extra_data'], $input['extra_timestamp']);
-        if (!empty($extraData)) {
-            $extraData = @unserialize($extraData);
-        }
-        if (empty($extraData)) {
-            $extraData = array();
-        }
-
-        if (!empty($extraData['external_provider'])
-            && !empty($extraData['external_provider_key'])
-        ) {
-            /* @var $userExternalModel XenForo_Model_UserExternal */
-            $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-            $userExternalModel->updateExternalAuthAssociation(
-                $extraData['external_provider'],
-                $extraData['external_provider_key'],
-                $user['user_id']
-            );
-        }
-
-        return $response;
-    }
-
-    protected function _getClientOrError()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-
-        $oauthClientId = $session->getOAuthClientId();
-        $client = null;
-        if (empty($oauthClientId)) {
-            $inputClientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-            $inputClientSecret = $this->_input->filterSingle('client_secret', XenForo_Input::STRING);
-
-            if (!empty($inputClientId) AND !empty($inputClientSecret)) {
-                $client = $oauth2Model->getClientModel()->getClientById($inputClientId);
-                if (!empty($client) AND !$oauth2Model->getClientModel()->verifySecret($client, $inputClientSecret)) {
-                    throw $this->getNoPermissionResponseException();
-                }
-            }
-        } else {
-            $client = $oauth2Model->getClientModel()->getClientById($oauthClientId);
-        }
-
-        if (empty($client)) {
-            throw $this->getNoPermissionResponseException();
-        }
-
-        return $client;
-    }
-
-    protected function _actionPostTokenNonStandard(array $client, $userId, $includeRefreshToken = true)
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-        $scopes = $oauth2Model->getAutoAndUserScopes($client['client_id'], $userId);
-
-        $token = $oauth2Model->getServer()->createAccessToken(
-            $client['client_id'],
-            $userId,
-            $scopes,
-            null,
-            $includeRefreshToken
-        );
-
-        return $this->responseData('bdApi_ViewApi_OAuth_TokenNonStandard', $token);
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        // no scope checking for this controller
-        return false;
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-    }
-
-    protected function _assertBoardActive($action)
-    {
-    }
-
-    protected function _assertTfaRequirement($action)
-    {
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Page.php b/xenforo/library/bdApi/ControllerApi/Page.php
deleted file mode 100755
index 8ea153bf..00000000
--- a/xenforo/library/bdApi/ControllerApi/Page.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Page extends bdApi_ControllerApi_Node
-{
-    public function actionSingle()
-    {
-        $response = parent::actionSingle();
-
-        if ($response instanceof XenForo_ControllerResponse_View
-            && !empty($response->params['page'])
-            && !empty($response->params['_node'])
-        ) {
-            $page = $response->params['_node'];
-            $response->viewName = 'bdApi_ViewApi_Page_Single';
-            $response->params['_pageTemplateTitle'] = $this->_getPageModel()->getTemplateTitle($page);
-
-            if (!empty($page['log_visits'])) {
-                $this->_getPageModel()->logVisit(
-                    $page,
-                    XenForo_Visitor::getInstance()->toArray(),
-                    XenForo_Application::$time
-                );
-                $response->params['page']['page_view_count']++;
-            }
-        }
-
-        return $response;
-    }
-
-
-    protected function _getControllerName()
-    {
-        return 'bdApi_ControllerApi_Page';
-    }
-
-    protected function _getNameSingular()
-    {
-        return 'page';
-    }
-
-    protected function _getNamePlural()
-    {
-        return 'pages';
-    }
-
-    protected function _getAll($parentNodeId = false)
-    {
-        $nodes = $this->_getNodeModel()->getViewableNodeList();
-
-        $pages = array();
-        foreach ($nodes as $node) {
-            if ($parentNodeId !== false
-                && $node['parent_node_id'] != $parentNodeId
-            ) {
-                continue;
-            }
-
-            if ($node['node_type_id'] === 'Page') {
-                $pages[] = $node;
-            }
-        }
-
-        return $pages;
-    }
-
-    protected function _getSingle($nodeId)
-    {
-        return $this->_getPageModel()->getPageById($nodeId);
-    }
-
-    protected function _isViewable(array $page)
-    {
-        return $this->_getPageModel()->canViewPage($page);
-    }
-
-    protected function _prepareApiDataForNodes(array $pages)
-    {
-        return $this->_getPageModel()->prepareApiDataForPages($pages);
-    }
-
-    protected function _prepareApiDataForNode(array $page)
-    {
-        return $this->_getPageModel()->prepareApiDataForPage($page);
-    }
-
-    protected function _responseErrorNotFound()
-    {
-        return $this->responseError(new XenForo_Phrase('requested_category_not_found'), 404);
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Page
-     */
-    protected function _getPageModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Page');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        switch ($action) {
-            case 'Single':
-                $controllerName = 'XenForo_ControllerPublic_Page';
-
-                $nodeId = $this->_input->filterSingle('node_id', XenForo_Input::UINT);
-                if (!empty($nodeId)) {
-                    $page = $this->_getPageModel()->getPageById($nodeId);
-                    if (!empty($page)) {
-                        $params['node_name'] = $page['node_name'];
-                    }
-                }
-
-                break;
-            default:
-                parent::_prepareSessionActivityForApi($controllerName, $action, $params);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Post.php b/xenforo/library/bdApi/ControllerApi/Post.php
deleted file mode 100755
index 3df420e8..00000000
--- a/xenforo/library/bdApi/ControllerApi/Post.php
+++ /dev/null
@@ -1,864 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Post extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-        if (!empty($postId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        $postIds = $this->_input->filterSingle('post_ids', XenForo_Input::STRING);
-        if (!empty($postIds)) {
-            return $this->responseReroute(__CLASS__, 'multiple');
-        }
-
-        $pageOfPost = null;
-        $thread = null;
-        $forum = null;
-
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        $pageOfPostId = $this->_input->filterSingle('page_of_post_id', XenForo_Input::UINT);
-        $order = $this->_input->filterSingle('order', XenForo_Input::STRING, array('default' => 'natural'));
-
-        if ($threadId > 0) {
-            list($thread, $forum) = $this->_getForumThreadPostHelper()->assertThreadValidAndViewable(
-                $threadId,
-                $this->_getThreadModel()->getFetchOptionsToPrepareApiData(),
-                $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        if ($pageOfPostId > 0) {
-            list($pageOfPost, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable(
-                $pageOfPostId,
-                array(),
-                $this->_getThreadModel()->getFetchOptionsToPrepareApiData(),
-                $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $conditions = array();
-        $fetchOptions = array(
-            'deleted' => false,
-            'moderated' => false,
-            'limit' => $limit,
-            'page' => $page
-        );
-
-        $total = 0;
-
-        switch ($order) {
-            case 'natural_reverse':
-                if (empty($thread['thread_id'])) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_posts_order_x_requires_thread_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                // load the class to make sure our constant is accessible
-                $this->_getPostModel();
-                $fetchOptions[bdApi_Extend_Model_Post::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE] = true;
-                $fetchOptions[bdApi_Extend_Model_Post::FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT] = $thread['reply_count'];
-                $pageNavParams['order'] = $order;
-                break;
-            case 'post_create_date':
-                if (!empty($thread['thread_id'])) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_posts_order_x_no_thread_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                // disable paging for this order
-                $fetchOptions['page'] = 0;
-
-                $fetchOptions['order'] = 'post_date';
-                $fetchOptions['direction'] = 'asc';
-                $pageNavParams['order'] = $order;
-                break;
-            case 'post_create_date_reverse':
-                if (!empty($thread['thread_id'])) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_posts_order_x_no_thread_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                // disable paging for this order
-                $fetchOptions['page'] = 0;
-
-                $fetchOptions['order'] = 'post_date';
-                $fetchOptions['direction'] = 'desc';
-                $pageNavParams['order'] = $order;
-                break;
-            default:
-                if (!is_array($thread) || empty($thread['thread_id'])) {
-                    $this->_assertValidToken();
-
-                    // manually prepare posts total count for paging
-                    $total = $this->_getPostModel()->bdApi_getLatestPostId();
-
-                    $postIdEnd = max(1, $fetchOptions['page']) * $fetchOptions['limit'];
-                    $postIdStart = $postIdEnd - $fetchOptions['limit'] + 1;
-                    $conditions[bdApi_Extend_Model_Post::CONDITIONS_POST_ID] =
-                        array('>=<', $postIdStart, $postIdEnd);
-
-                    // paging was done by conditions (see above), remove it from fetch options
-                    $fetchOptions['page'] = 0;
-                }
-        }
-
-        if ($fetchOptions['page'] !== 8 && !empty($pageOfPost)) {
-            $this->_prepareFetchOptionsForPageOfPost($fetchOptions, $pageOfPost, $thread, $forum);
-        }
-
-        if (!empty($thread['thread_id'])) {
-            $pageNavParams['thread_id'] = $thread['thread_id'];
-            $posts = $this->_getPostModel()->getPostsInThread(
-                $thread['thread_id'],
-                $this->_getPostModel()->getFetchOptionsToPrepareApiData($fetchOptions)
-            );
-            $total = $thread['reply_count'] + 1;
-        } else {
-            $posts = $this->_getPostModel()->bdApi_getPosts(
-                $conditions,
-                $this->_getPostModel()->getFetchOptionsToPrepareApiData($fetchOptions)
-            );
-        }
-
-        $postsData = $this->_preparePosts($posts, $thread, $forum);
-
-        $data = array(
-            'posts' => $this->_filterDataMany($postsData),
-            '_thread' => $thread,
-        );
-
-        if (!empty($thread['thread_id'])) {
-            $maxPostDate = 0;
-            foreach ($posts as $post) {
-                if ($post['post_date'] > $maxPostDate) {
-                    $maxPostDate = $post['post_date'];
-                }
-            }
-
-            $this->_getThreadModel()->markThreadRead($thread, $forum, $maxPostDate);
-            $this->_getThreadModel()->logThreadView($thread['thread_id']);
-
-            if (!$this->_isFieldExcluded('thread')) {
-                $data['thread'] = $this->_filterDataSingle($this->_getThreadModel()->prepareApiDataForThread(
-                    $thread,
-                    $forum,
-                    array()
-                ), array('thread'));
-            }
-        }
-
-        if ($total > 0) {
-            $data['posts_total'] = $total;
-            bdApi_Data_Helper_Core::addPageLinks(
-                $this->getInput(),
-                $data,
-                $fetchOptions['limit'],
-                $total,
-                $fetchOptions['page'],
-                'posts',
-                array(),
-                $pageNavParams
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_Post_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable(
-            $postId,
-            $this->_getPostModel()->getFetchOptionsToPrepareApiData(),
-            $this->_getThreadModel()->getFetchOptionsToPrepareApiData(),
-            $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $posts = array($post['post_id'] => $post);
-        $postsData = $this->_preparePosts($posts, $thread, $forum);
-        $postData = reset($postsData);
-
-        $data = array('post' => $this->_filterDataSingle($postData));
-
-        return $this->responseData('bdApi_ViewApi_Post_Single', $data);
-    }
-
-    public function actionMultiple()
-    {
-        $postIdsInput = $this->_input->filterSingle('post_ids', XenForo_Input::STRING);
-        $postIds = array_map('intval', explode(',', $postIdsInput));
-        if (empty($postIds)) {
-            return $this->responseNoPermission();
-        }
-
-        $posts = $this->_getPostModel()->getPostsByIds(
-            $postIds,
-            $this->_getPostModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $postsOrdered = array();
-        foreach ($postIds as $postId) {
-            if (isset($posts[$postId])) {
-                $postsOrdered[$postId] = $posts[$postId];
-            }
-        }
-
-        $postsData = $this->_preparePosts($postsOrdered);
-
-        $data = array(
-            'posts' => $this->_filterDataMany($postsData),
-        );
-
-        return $this->responseData('bdApi_ViewApi_Post_List', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        $input = $this->_input->filter(array(
-            'thread_id' => XenForo_Input::UINT,
-            'quote_post_id' => XenForo_Input::UINT,
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['post_body'] = $editorHelper->getMessageText('post_body', $this->_input);
-        $input['post_body'] = XenForo_Helper_String::autoLinkBbCode($input['post_body']);
-        if (!strlen(trim($input['post_body']))) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_post_requires_post_body'), 400);
-        }
-
-        $ftpHelper = $this->_getForumThreadPostHelper();
-        if (!empty($input['quote_post_id'])) {
-            list($quotePost, $thread, $forum) = $ftpHelper->assertPostValidAndViewable($input['quote_post_id']);
-            if ($input['thread_id'] > 0 && $quotePost['thread_id'] !== $input['thread_id']) {
-                return $this->responseNoPermission();
-            }
-
-            $quoteText = $this->_getPostModel()->getQuoteTextForPost($quotePost);
-            $input['post_body'] = $quoteText . $input['post_body'];
-        } else {
-            list($thread, $forum) = $ftpHelper->assertThreadValidAndViewable($input['thread_id']);
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (!$this->_getThreadModel()->canReplyToThread($thread, $forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        /** @var bdApi_XenForo_DataWriter_DiscussionMessage_Post $writer */
-        $writer = XenForo_DataWriter::create('XenForo_DataWriter_DiscussionMessage_Post');
-        $writer->set('user_id', $visitor['user_id']);
-        $writer->set('username', $visitor['username']);
-        $writer->set('message', $input['post_body']);
-        $writer->set('message_state', $this->_getPostModel()->getPostInsertMessageState($thread, $forum));
-        $writer->set('thread_id', $thread['thread_id']);
-        $writer->setExtraData(
-            XenForo_DataWriter_DiscussionMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash($thread)
-        );
-        $writer->setExtraData(XenForo_DataWriter_DiscussionMessage_Post::DATA_FORUM, $forum);
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        if (!empty($clientId)) {
-            $writer->bdApi_setOrigin($clientId);
-        }
-
-        switch ($this->_spamCheck(array(
-            'content_type' => 'post',
-            'content' => $input['post_body'],
-            'permalink' => XenForo_Link::buildPublicLink('canonical:threads', $thread),
-        ))) {
-            case self::SPAM_RESULT_MODERATED:
-            case self::SPAM_RESULT_DENIED:
-                return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                break;
-        }
-
-        $writer->preSave();
-
-        if ($writer->hasErrors()) {
-            return $this->responseErrors($writer->getErrors(), 400);
-        }
-
-        $this->assertNotFlooding('post');
-
-        $writer->save();
-        $post = $writer->getMergedData();
-
-        $this->_getThreadWatchModel()->setVisitorThreadWatchStateFromInput($thread['thread_id'], array(
-            // TODO
-            'watch_thread_state' => 0,
-            'watch_thread' => 0,
-            'watch_thread_email' => 0,
-        ));
-
-        // mark read to thread when user reply to thread
-        $this->_getThreadModel()->markThreadRead($thread, $forum, XenForo_Application::$time);
-
-        $this->_request->setParam('post_id', $post['post_id']);
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionPutIndex()
-    {
-        $input = $this->_input->filter(array(
-            'post_id' => XenForo_Input::UINT,
-            'thread_title' => XenForo_Input::STRING,
-            'thread_prefix_id' => XenForo_Input::STRING,
-            'thread_tags' => XenForo_Input::STRING,
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['post_body'] = $editorHelper->getMessageText('post_body', $this->_input);
-        $input['post_body'] = XenForo_Helper_String::autoLinkBbCode($input['post_body']);
-
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable($input['post_id']);
-
-        if (!$this->_getPostModel()->canEditPost($post, $thread, $forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_DiscussionMessage_Post');
-        $dw->setExistingData($post, true);
-
-        if ($this->_input->inRequest('post_body')
-            || $this->_input->inRequest('post_body_html')
-        ) {
-            $dw->set('message', $input['post_body']);
-        }
-
-        switch ($post['message_state']) {
-            case 'deleted':
-                if ($this->_getPostModel()->canUndeletePost($post, $thread, $forum)) {
-                    $dw->set('message_state', 'visible');
-                }
-                break;
-            case 'moderated':
-                if ($this->_getPostModel()->canApproveUnapprovePost($post, $thread, $forum)) {
-                    $dw->set('message_state', 'visible');
-                }
-                break;
-        }
-
-        $dw->setExtraData(
-            XenForo_DataWriter_DiscussionMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash($post)
-        );
-        $dw->setExtraData(XenForo_DataWriter_DiscussionMessage_Post::DATA_FORUM, $forum);
-
-        switch ($this->_spamCheck(array(
-            'content_type' => 'post',
-            'content_id' => $post['post_id'],
-            'content' => $input['post_body'],
-            'permalink' => XenForo_Link::buildPublicLink('canonical:threads', $thread),
-        ))) {
-            case self::SPAM_RESULT_MODERATED:
-            case self::SPAM_RESULT_DENIED:
-                return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                break;
-        }
-
-        $dw->preSave();
-
-        if ($dw->hasErrors()) {
-            return $this->responseErrors($dw->getErrors(), 400);
-        }
-
-        $threadDw = null;
-        $threadTagger = null;
-        if ($post['post_id'] == $thread['first_post_id']
-            && $this->_getThreadModel()->canEditThread($thread, $forum)
-        ) {
-            $threadDw = XenForo_DataWriter::create('XenForo_DataWriter_Discussion_Thread');
-            $threadDw->setExistingData($thread, true);
-
-            if ($this->_input->inRequest('thread_title')) {
-                $threadDw->set('title', $input['thread_title']);
-            }
-
-            if ($this->_input->inRequest('thread_prefix_id')) {
-                $prefixId = $input['thread_prefix_id'];
-                if (!is_numeric($prefixId)
-                    && !empty($forum['default_prefix_id'])
-                ) {
-                    $prefixId = $forum['default_prefix_id'];
-                }
-                $threadDw->set('prefix_id', $prefixId);
-            }
-
-            if (XenForo_Application::$versionId > 1050000
-                && $this->_input->inRequest('thread_tags')
-                && $this->_getThreadModel()->canEditTags($thread, $forum)
-            ) {
-                // thread tagging is available since XenForo 1.5.0
-                /** @var XenForo_Model_Tag $tagModel */
-                $tagModel = $this->getModelFromCache('XenForo_Model_Tag');
-                $threadTagger = $tagModel->getTagger('thread');
-                $threadTagger->setContent($thread['thread_id'])->setPermissionsFromContext($thread, $forum);
-                $threadTagger->setTags($tagModel->splitTags($input['thread_tags']));
-                $threadDw->mergeErrors($threadTagger->getErrors());
-            }
-
-            $threadDw->preSave();
-
-            if (!$threadDw->get('prefix_id')
-                && !empty($forum['require_prefix'])
-            ) {
-                /** @var bdApi_Extend_Model_ThreadPrefix $prefixModel */
-                $prefixModel = $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-                if ($prefixModel->getUsablePrefixesInForums($forum['node_id'])) {
-                    $threadDw->error(new XenForo_Phrase('please_select_a_prefix'), 'prefix_id');
-                }
-            }
-
-            if ($threadDw->hasErrors()) {
-                return $this->responseErrors($threadDw->getErrors(), 400);
-            }
-        }
-
-        XenForo_Db::beginTransaction();
-
-        $dw->save();
-
-        if ($threadDw != null
-            && $threadDw->hasChanges()
-        ) {
-            $threadDw->save();
-        }
-
-        if ($threadTagger != null) {
-            $threadTagger->save();
-        }
-
-        XenForo_Db::commit();
-
-        if (XenForo_Application::isRegistered('bdApi_responseReroute')) {
-            return call_user_func_array(
-                array($this, 'responseReroute'),
-                XenForo_Application::get('bdApi_responseReroute')
-            );
-        }
-
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionDeleteIndex()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-
-        /** @var bdApi_ControllerHelper_Delete $deleteHelper */
-        $deleteHelper = $this->getHelper('bdApi_ControllerHelper_Delete');
-        $reason = $deleteHelper->filterReason();
-
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable($postId);
-
-        $deleteType = 'soft';
-        $options = array('reason' => $reason);
-
-        if (!$this->_getPostModel()->canDeletePost($post, $thread, $forum, $deleteType, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $this->_getPostModel()->deletePost($postId, $deleteType, $options, $forum);
-
-        if ($post['post_id'] == $thread['first_post_id']) {
-            XenForo_Model_Log::logModeratorAction(
-                'thread',
-                $thread,
-                'delete_' . $deleteType,
-                array('reason' => $reason)
-            );
-        } else {
-            XenForo_Model_Log::logModeratorAction(
-                'post',
-                $post,
-                'delete_' . $deleteType,
-                array('reason' => $reason),
-                $thread
-            );
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetLikes()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-
-        /* @var $ftpHelper XenForo_ControllerHelper_ForumThreadPost */
-        $ftpHelper = $this->getHelper('ForumThreadPost');
-        list($post, ,) = $ftpHelper->assertPostValidAndViewable($postId);
-
-        $likes = $this->_getLikeModel()->getContentLikes('post', $post['post_id']);
-        $users = array();
-
-        if (!empty($likes)) {
-            foreach ($likes as $like) {
-                $users[] = array(
-                    'user_id' => $like['like_user_id'],
-                    'username' => $like['username'],
-                );
-            }
-        }
-
-        $data = array('users' => $users);
-
-        return $this->responseData('bdApi_ViewApi_Post_Likes', $data);
-    }
-
-    public function actionPostLikes()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable($postId);
-
-        if (!$this->_getPostModel()->canLikePost($post, $thread, $forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $likeModel = $this->_getLikeModel();
-
-        $existingLike = $likeModel->getContentLikeByLikeUser('post', $postId, XenForo_Visitor::getUserId());
-        if (empty($existingLike)) {
-            $latestUsers = $likeModel->likeContent('post', $postId, $post['user_id']);
-
-            if ($latestUsers === false) {
-                return $this->responseNoPermission();
-            }
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteLikes()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable($postId);
-
-        if (!$this->_getPostModel()->canLikePost($post, $thread, $forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $likeModel = $this->_getLikeModel();
-
-        $existingLike = $likeModel->getContentLikeByLikeUser('post', $postId, XenForo_Visitor::getUserId());
-        if (!empty($existingLike)) {
-            $latestUsers = $likeModel->unlikeContent($existingLike);
-
-            if ($latestUsers === false) {
-                return $this->responseNoPermission();
-            }
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetAttachments()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-        if (!empty($attachmentId)) {
-            return $this->responseReroute('bdApi_ControllerApi_Attachment', 'get-data');
-        }
-
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable(
-            $postId,
-            $this->_getPostModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $posts = array($post['post_id'] => $post);
-        $posts = $this->_getPostModel()->getAndMergeAttachmentsIntoPosts($posts);
-        $posts = $this->_getPostModel()->prepareApiDataForPosts($posts, $thread, $forum);
-
-        $post = reset($posts);
-        $attachments = isset($post['attachments']) ? $post['attachments'] : array();
-
-        $data = array('attachments' => $this->_filterDataMany($attachments));
-
-        return $this->responseData('bdApi_ViewApi_Post_Attachments', $data);
-    }
-
-    public function actionPostAttachments()
-    {
-        $contentData = $this->_input->filter(array(
-            'post_id' => XenForo_Input::UINT,
-            'thread_id' => XenForo_Input::UINT,
-        ));
-        if (empty($contentData['post_id']) AND empty($contentData['thread_id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_posts_attachments_requires_ids'), 400);
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        $response = $attachmentHelper->doUpload('file', $hash, 'post', $contentData);
-
-        if ($response instanceof XenForo_ControllerResponse_Abstract) {
-            return $response;
-        }
-
-        $data = array(
-            'attachment' => $this->_filterDataSingle(
-                $this->_getPostModel()->prepareApiDataForAttachment(
-                    $response,
-                    $contentData,
-                    $contentData,
-                    $contentData,
-                    $hash
-                )
-            )
-        );
-
-        return $this->responseData('bdApi_ViewApi_Post_Attachments', $data);
-    }
-
-    public function actionDeleteAttachments()
-    {
-        $contentData = $this->_input->filter(array(
-            'post_id' => XenForo_Input::UINT,
-            'thread_id' => XenForo_Input::UINT,
-        ));
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-
-        if (empty($contentData['post_id']) AND empty($contentData['thread_id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_posts_attachments_requires_ids'), 400);
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        return $attachmentHelper->doDelete($hash, $attachmentId);
-    }
-
-    public function actionPostReport()
-    {
-        $postId = $this->_input->filterSingle('post_id', XenForo_Input::UINT);
-        $message = $this->_input->filterSingle('message', XenForo_Input::STRING);
-
-        list($post, $thread, $forum) = $this->_getForumThreadPostHelper()->assertPostValidAndViewable($postId);
-
-        if (!$this->_getPostModel()->canReportPost($post, $thread, $forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        if (!$message) {
-            return $this->responseError(new XenForo_Phrase(
-                'bdapi_slash_x_report_requires_message',
-                array('route' => 'posts')
-            ), 400);
-        }
-
-        $this->assertNotFlooding('report');
-
-        /* @var $reportModel XenForo_Model_Report */
-        $reportModel = $this->getModelFromCache('XenForo_Model_Report');
-        $reportModel->reportContent('post', $post, $message);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    protected function _prepareFetchOptionsForPageOfPost(
-        array &$fetchOptions,
-        array $pageOfPost,
-        array $thread,
-        array $forum
-    ) {
-        $position = $pageOfPost['position'];
-        if (isset($fetchOptions[bdApi_Extend_Model_Post::FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT])) {
-            $position = $fetchOptions[bdApi_Extend_Model_Post::FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT] - $position;
-        }
-
-        $fetchOptions['page'] = floor($position / $fetchOptions['limit']) + 1;
-    }
-
-    protected function _preparePosts(array $posts, array $thread = null, array $forum = null)
-    {
-        // check for $thread being null because we only prepare `post`.`thread` for request
-        // of multiple posts from different threads (likely from actionMultiple)
-        $preparePostThread = (!$this->_isFieldExcluded('thread') && $thread === null);
-
-        $threads = array();
-        if ($thread !== null) {
-            $threads[$thread['thread_id']] = $thread;
-        }
-
-        $forums = array();
-        if ($forum !== null) {
-            $forums[$forum['node_id']] = $forum;
-        }
-
-        $threadIds = array();
-        foreach ($posts as $post) {
-            if (!isset($threads[$post['thread_id']])) {
-                $threadIds[] = $post['thread_id'];
-            }
-        }
-        if (!empty($threadIds)) {
-            $threads += $this->_getThreadModel()->getThreadsByIds(
-                $threadIds,
-                $this->_getThreadModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $forumIds = array();
-        foreach ($threads as $thread) {
-            if (!isset($forums[$thread['node_id']])) {
-                $forumIds[] = $thread['node_id'];
-            }
-        }
-        if (!empty($forumIds)) {
-            $forums += $this->_getForumModel()->getForumsByIds($forumIds);
-        }
-
-        if (!$this->_isFieldExcluded('attachments')) {
-            $posts = $this->_getPostModel()->getAndMergeAttachmentsIntoPosts($posts);
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-        $nodePermissions = $this->_getNodeModel()->getNodePermissionsForPermissionCombination();
-        foreach ($nodePermissions as $nodeId => $permissions) {
-            $visitor->setNodePermissions($nodeId, $permissions);
-        }
-
-        $postsData = array();
-        foreach ($posts as &$postRef) {
-            if (!isset($threads[$postRef['thread_id']])) {
-                continue;
-            }
-            $threadRef = &$threads[$postRef['thread_id']];
-
-            if (!isset($forums[$threadRef['node_id']])) {
-                continue;
-            }
-            $forumRef = &$forums[$threadRef['node_id']];
-
-            if (!$this->_getPostModel()->canViewPostAndContainer($postRef, $threadRef, $forumRef)) {
-                continue;
-            }
-
-            $postData = $this->_getPostModel()->prepareApiDataForPost($postRef, $threadRef, $forumRef);
-
-            if ($preparePostThread) {
-                $postData['thread'] = $this->_getThreadModel()
-                    ->prepareApiDataForThread($threadRef, $forumRef, array());
-            }
-
-            $postsData[] = $postData;
-        }
-
-        return $postsData;
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Post
-     */
-    protected function _getPostModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Post');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Thread
-     */
-    protected function _getThreadModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Thread');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Forum
-     */
-    protected function _getForumModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Forum');
-    }
-
-    /**
-     * @return XenForo_Model_Node
-     */
-    protected function _getNodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Node');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_ThreadWatch
-     */
-    protected function _getThreadWatchModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_ThreadWatch');
-    }
-
-    /**
-     * @return XenForo_Model_Like
-     */
-    protected function _getLikeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Like');
-    }
-
-    /**
-     * @return XenForo_ControllerHelper_ForumThreadPost
-     */
-    protected function _getForumThreadPostHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('ForumThreadPost');
-    }
-
-    /**
-     * @return bdApi_ControllerHelper_Attachment
-     */
-    protected function _getAttachmentHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('bdApi_ControllerHelper_Attachment');
-    }
-
-    public function _isFieldExcluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        if ($field === 'post_id') {
-            return false;
-        }
-
-        if ($field === 'post_is_first_post') {
-            return false;
-        }
-
-        return parent::_isFieldExcluded($field, $prefixes);
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        if ($action === 'GetIndex') {
-            $threadId = $this->_request->getParam('thread_id');
-            if (!empty($threadId)) {
-                $controllerName = 'XenForo_ControllerPublic_Thread';
-                $params['thread_id'] = $threadId;
-                return;
-            }
-        }
-
-        $controllerName = 'XenForo_ControllerPublic_Post';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/ProfilePost.php b/xenforo/library/bdApi/ControllerApi/ProfilePost.php
deleted file mode 100644
index 7e250c96..00000000
--- a/xenforo/library/bdApi/ControllerApi/ProfilePost.php
+++ /dev/null
@@ -1,695 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_ProfilePost extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $profilePostIds = $this->_input->filterSingle('profile_post_ids', XenForo_Input::STRING);
-        if (!empty($profilePostIds)) {
-            return $this->responseReroute(__CLASS__, 'multiple');
-        }
-
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionSingle()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable(
-            $profilePostId,
-            $this->_getProfilePostModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $profilePosts = array($profilePost['profile_post_id'] => $profilePost);
-        $profilePostsData = $this->_prepareProfilePosts($profilePosts, $user);
-        $profilePostData = reset($profilePostsData);
-
-        $data = array('profile_post' => $this->_filterDataSingle($profilePostData));
-
-        return $this->responseData('bdApi_ViewApi_ProfilePost_Single', $data);
-    }
-
-    public function actionMultiple()
-    {
-        $profilePostIdsInput = $this->_input->filterSingle('profile_post_ids', XenForo_Input::STRING);
-        $profilePostIds = array_map('intval', explode(',', $profilePostIdsInput));
-        if (empty($profilePostIds)) {
-            return $this->responseNoPermission();
-        }
-
-        $profilePosts = $this->_getProfilePostModel()->getProfilePostsByIds(
-            $profilePostIds,
-            $this->_getProfilePostModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $profilePostsOrdered = array();
-        foreach ($profilePostIds as $profilePostId) {
-            if (isset($profilePosts[$profilePostId])) {
-                $profilePostsOrdered[$profilePostId] = $profilePosts[$profilePostId];
-            }
-        }
-
-        $profilePostsData = $this->_prepareProfilePosts($profilePostsOrdered);
-
-        $data = array(
-            'profile_posts' => $this->_filterDataMany($profilePostsData),
-        );
-
-        return $this->responseData('bdApi_ViewApi_ProfilePost_Multiple', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        /** @var XenForo_Model_User $userModel */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        /** @var XenForo_Model_UserProfile $userProfileModel */
-        $userProfileModel = $this->getModelFromCache('XenForo_Model_UserProfile');
-        /** @var bdApi_Extend_Model_ProfilePost $profilePostModel */
-        $profilePostModel = $this->getModelFromCache('XenForo_Model_ProfilePost');
-
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        $postBody = $this->_input->filterSingle('post_body', XenForo_Input::STRING);
-
-        $user = $userModel->getFullUserById($userId);
-        if (empty($user)) {
-            return $this->responseNoPermission();
-        }
-
-        if (!$userProfileModel->canViewProfilePosts($user)) {
-            return $this->responseNoPermission();
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-        if ($user['user_id'] == $visitor->get('user_id')) {
-            if (!$visitor->canUpdateStatus()) {
-                return $this->responseNoPermission();
-            }
-
-            if (empty($postBody)) {
-                // special support for status
-                $postBody = $this->_input->filterSingle('status', XenForo_Input::STRING);
-            }
-
-            try {
-                $profilePostId = $userProfileModel->updateStatus($postBody);
-            } catch (XenForo_Exception $e) {
-                return $this->responseError($e->getMessage(), 400);
-            }
-        } else {
-            if (!$userProfileModel->canPostOnProfile($user)) {
-                return $this->responseNoPermission();
-            }
-
-            $writer = XenForo_DataWriter::create('XenForo_DataWriter_DiscussionMessage_ProfilePost');
-
-            $writer->set('user_id', $visitor['user_id']);
-            $writer->set('username', $visitor['username']);
-            $writer->set('message', $postBody);
-            $writer->set('profile_user_id', $user['user_id']);
-            $writer->set('message_state', $profilePostModel->getProfilePostInsertMessageState($user));
-            $writer->setExtraData(XenForo_DataWriter_DiscussionMessage_ProfilePost::DATA_PROFILE_USER, $user);
-            $writer->setOption(
-                XenForo_DataWriter_DiscussionMessage_ProfilePost::OPTION_MAX_TAGGED_USERS,
-                $visitor->hasPermission('general', 'maxTaggedUsers')
-            );
-
-            if ($writer->get('message_state') == 'visible') {
-                switch ($this->_spamCheck(array(
-                    'content_type' => 'profile_post',
-                    'content' => $postBody,
-                ))) {
-                    case XenForo_Model_SpamPrevention::RESULT_MODERATED:
-                        $writer->set('message_state', 'moderated');
-                        break;
-                    case XenForo_Model_SpamPrevention::RESULT_DENIED:
-                        return $this->responseError(
-                            new XenForo_Phrase('your_content_cannot_be_submitted_try_later'),
-                            400
-                        );
-                        break;
-                }
-            }
-
-            $writer->preSave();
-
-            if ($writer->hasErrors()) {
-                return $this->responseErrors($writer->getErrors(), 400);
-            }
-
-            $this->assertNotFlooding('post');
-
-            $writer->save();
-            $profilePostId = $writer->get('profile_post_id');
-        }
-
-        $this->_request->setParam('profile_post_id', $profilePostId);
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionPutIndex()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        $postBody = $this->_input->filterSingle('post_body', XenForo_Input::STRING);
-
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        if (!$this->_getProfilePostModel()->canEditProfilePost($profilePost, $user, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_DiscussionMessage_ProfilePost');
-        $dw->setExistingData($profilePost, true);
-        $dw->set('message', $postBody);
-
-        if ($dw->get('message_state') == 'visible') {
-            switch ($this->_spamCheck(array(
-                'content_type' => 'profile_post',
-                'content_id' => $profilePostId,
-                'content' => $postBody,
-            ))) {
-                case XenForo_Model_SpamPrevention::RESULT_MODERATED:
-                    $dw->set('message_state', 'moderated');
-                    break;
-                case XenForo_Model_SpamPrevention::RESULT_DENIED:
-                    return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                    break;
-            }
-        }
-
-        $dw->preSave();
-
-        if ($dw->hasErrors()) {
-            return $this->responseErrors($dw->getErrors(), 400);
-        }
-
-        $dw->save();
-
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionDeleteIndex()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-
-        /** @var bdApi_ControllerHelper_Delete $deleteHelper */
-        $deleteHelper = $this->getHelper('bdApi_ControllerHelper_Delete');
-        $reason = $deleteHelper->filterReason();
-
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        $deleteType = 'soft';
-        $options = array('reason' => $reason);
-
-        if (!$this->_getProfilePostModel()->canDeleteProfilePost($profilePost, $user, $deleteType, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_DiscussionMessage_ProfilePost');
-        $dw->setExistingData($profilePost, true);
-        $dw->set('message_state', 'deleted');
-        $dw->save();
-
-        XenForo_Model_Log::logModeratorAction(
-            'profile_post',
-            $profilePost,
-            'delete_soft',
-            $options,
-            $user
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetLikes()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        list($profilePost,) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        $likes = $this->_getLikeModel()->getContentLikes('profile_post', $profilePost['profile_post_id']);
-        $users = array();
-
-        if (!empty($likes)) {
-            foreach ($likes as $like) {
-                $users[] = array(
-                    'user_id' => $like['like_user_id'],
-                    'username' => $like['username'],
-                );
-            }
-        }
-
-        $data = array('users' => $users);
-
-        return $this->responseData('bdApi_ViewApi_ProfilePost_Likes', $data);
-    }
-
-    public function actionPostLikes()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        if (!$this->_getProfilePostModel()->canLikeProfilePost($profilePost, $user, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $likeModel = $this->_getLikeModel();
-
-        $existingLike = $likeModel->getContentLikeByLikeUser(
-            'profile_post',
-            $profilePost['profile_post_id'],
-            XenForo_Visitor::getUserId()
-        );
-        if (empty($existingLike)) {
-            $latestUsers = $likeModel->likeContent(
-                'profile_post',
-                $profilePost['profile_post_id'],
-                $profilePost['user_id']
-            );
-
-            if ($latestUsers === false) {
-                return $this->responseNoPermission();
-            }
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteLikes()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        if (!$this->_getProfilePostModel()->canLikeProfilePost($profilePost, $user, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $likeModel = $this->_getLikeModel();
-
-        $existingLike = $likeModel->getContentLikeByLikeUser(
-            'profile_post',
-            $profilePost['profile_post_id'],
-            XenForo_Visitor::getUserId()
-        );
-        if (!empty($existingLike)) {
-            $latestUsers = $likeModel->unlikeContent($existingLike);
-
-            if ($latestUsers === false) {
-                return $this->responseNoPermission();
-            }
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetComments()
-    {
-        $pageOfCommentId = $this->_input->filterSingle('page_of_comment_id', XenForo_Input::UINT);
-        $pageOfComment = null;
-        $commentId = $this->_input->filterSingle('comment_id', XenForo_Input::UINT);
-        $beforeDate = $this->_input->filterSingle('before', XenForo_Input::UINT);
-
-        if (!empty($pageOfCommentId)) {
-            list($pageOfComment, $profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostCommentValidAndViewable(
-                $pageOfCommentId,
-                $this->_getProfilePostModel()->getCommentFetchOptionsToPrepareApiData(),
-                $this->_getProfilePostModel()->getFetchOptionsToPrepareApiData(),
-                $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-            );
-            $profilePostId = $profilePost['profile_post_id'];
-        } else {
-            $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-            if (empty($profilePostId)) {
-                return $this->responseNoPermission();
-            }
-
-            list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable(
-                $profilePostId,
-                $this->_getProfilePostModel()->getFetchOptionsToPrepareApiData(),
-                $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-            );
-
-            // special case for single comment
-            if (!empty($commentId)) {
-                list($comment, ,) = $this->_getUserProfileHelper()->assertProfilePostCommentValidAndViewable(
-                    $commentId,
-                    $this->_getProfilePostModel()->getCommentFetchOptionsToPrepareApiData()
-                );
-                if ($comment['profile_post_id'] != $profilePost['profile_post_id']) {
-                    return $this->responseNoPermission();
-                }
-
-                $data = array(
-                    'comment' => $this->_filterDataSingle($this->_getProfilePostModel()->prepareApiDataForComment(
-                        $comment,
-                        $profilePost,
-                        $user
-                    )),
-                );
-
-                return $this->responseData('bdApi_ViewApi_ProfilePost_Comments_Single', $data);
-            }
-        }
-
-        $pageNavParams = array();
-        list($limit,) = $this->filterLimitAndPage($pageNavParams);
-
-        if (!empty($pageOfComment)) {
-            $beforeDate = $pageOfComment['comment_date'] + 1;
-        }
-
-        $fetchOptions = array(
-            'limit' => $limit,
-        );
-
-        $comments = $this->_getProfilePostModel()->getProfilePostCommentsByProfilePost(
-            $profilePostId,
-            $beforeDate,
-            $this->_getProfilePostModel()->getCommentFetchOptionsToPrepareApiData($fetchOptions)
-        );
-        $oldestComment = reset($comments);
-        $latestComment = end($comments);
-
-        $total = $profilePost['comment_count'];
-
-        $data = array(
-            'comments' => $this->_filterDataMany($this->_getProfilePostModel()->prepareApiDataForComments(
-                $comments,
-                $profilePost,
-                $user
-            )),
-            'comments_total' => $total,
-
-            '_profilePost' => $profilePost,
-            '_user' => $user,
-        );
-
-        if (!$this->_isFieldExcluded('profile_post')) {
-            $data['profile_post'] = $this->_filterDataSingle($this->_getProfilePostModel()->prepareApiDataForProfilePost(
-                $profilePost,
-                $user
-            ), array('profile_post'));
-        }
-
-        if (!$this->_isFieldExcluded('timeline_user')) {
-            $data['timeline_user'] = $this->_filterDataSingle(
-                $this->_getUserModel()->prepareApiDataForUser($user),
-                array('timeline_user')
-            );
-        }
-
-        $inputData = $this->_input->filter(array(
-            'fields_include' => XenForo_Input::STRING,
-            'fields_exclude' => XenForo_Input::STRING,
-        ));
-        if (!empty($inputData['fields_include'])) {
-            $pageNavParams['fields_include'] = $inputData['fields_include'];
-        } elseif (!empty($inputData['fields_exclude'])) {
-            $pageNavParams['fields_exclude'] = $inputData['fields_exclude'];
-        }
-        if ($oldestComment['comment_date'] != $profilePost['first_comment_date']) {
-            $data['links']['prev'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'profile-posts/comments',
-                $profilePost,
-                array_merge($pageNavParams, array(
-                    'before' => $oldestComment['comment_date'],
-                ))
-            );
-        }
-        if ($latestComment['comment_date'] != $profilePost['last_comment_date']) {
-            $data['links']['latest'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'profile-posts/comments',
-                $profilePost,
-                $pageNavParams
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_ProfilePost_Comments', $data);
-    }
-
-    public function actionPostComments()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        $commentBody = $this->_input->filterSingle('comment_body', XenForo_Input::STRING);
-
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        if (!$this->_getProfilePostModel()->canCommentOnProfilePost($profilePost, $user, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_ProfilePostComment');
-        $dw->setExtraData(XenForo_DataWriter_ProfilePostComment::DATA_PROFILE_USER, $user);
-        $dw->setExtraData(XenForo_DataWriter_ProfilePostComment::DATA_PROFILE_POST, $profilePost);
-
-        if (XenForo_Application::$versionId > 1050000) {
-            $dw->set('message_state', call_user_func(array(
-                $this->_getProfilePostModel(),
-                'getProfilePostCommentInsertMessageState'
-            ), $profilePost));
-        }
-
-        $dw->bulkSet(array(
-            'profile_post_id' => $profilePost['profile_post_id'],
-            'user_id' => $visitor['user_id'],
-            'username' => $visitor['username'],
-            'message' => $commentBody
-        ));
-        $dw->setOption(
-            XenForo_DataWriter_ProfilePostComment::OPTION_MAX_TAGGED_USERS,
-            $visitor->hasPermission('general', 'maxTaggedUsers')
-        );
-
-        if ($dw->get('message_state') == 'visible') {
-            switch ($this->_spamCheck(array(
-                'content_type' => 'profile_post_comment',
-                'content' => $commentBody,
-            ))) {
-                case XenForo_Model_SpamPrevention::RESULT_MODERATED:
-                    $dw->set('message_state', 'moderated');
-                    break;
-                case XenForo_Model_SpamPrevention::RESULT_DENIED:
-                    return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                    break;
-            }
-        }
-
-        $dw->preSave();
-
-        if ($dw->hasErrors()) {
-            return $this->responseErrors($dw->getErrors(), 400);
-        }
-
-        $this->assertNotFlooding('post');
-
-        $dw->save();
-        $comment = $dw->getMergedData();
-
-        $this->_request->setParam('comment_id', $comment['profile_post_comment_id']);
-        return $this->responseReroute(__CLASS__, 'get-comments');
-    }
-
-    public function actionDeleteComments()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        $commentId = $this->_input->filterSingle('comment_id', XenForo_Input::UINT);
-
-        /** @var bdApi_ControllerHelper_Delete $deleteHelper */
-        $deleteHelper = $this->getHelper('bdApi_ControllerHelper_Delete');
-        $reason = $deleteHelper->filterReason();
-
-        list($comment, $profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostCommentValidAndViewable(
-            $commentId,
-            $this->_getProfilePostModel()->getCommentFetchOptionsToPrepareApiData()
-        );
-        if ($profilePost['profile_post_id'] != $profilePostId) {
-            return $this->responseNoPermission();
-        }
-
-        $errorPhraseKey = '';
-        if (XenForo_Application::$versionId > 1050051) {
-            $canDelete = call_user_func_array(
-                array($this->_getProfilePostModel(), 'canDeleteProfilePostComment'),
-                array(
-                    $comment,
-                    $profilePost,
-                    $user,
-                    'soft',
-                    &$errorPhraseKey
-                )
-            );
-        } else {
-            $canDelete = call_user_func_array(
-                array($this->_getProfilePostModel(), 'canDeleteProfilePostComment'),
-                array(
-                    $comment,
-                    $profilePost,
-                    $user,
-                    &$errorPhraseKey
-                )
-            );
-        }
-        if (!$canDelete) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_ProfilePostComment');
-        $dw->setExistingData($commentId);
-        $dw->delete();
-
-        XenForo_Model_Log::logModeratorAction(
-            'profile_post',
-            $profilePost,
-            'comment_delete',
-            array(
-                'username' => $comment['username'],
-                'reason' => $reason,
-            ),
-            $user
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionPostReport()
-    {
-        $profilePostId = $this->_input->filterSingle('profile_post_id', XenForo_Input::UINT);
-        $message = $this->_input->filterSingle('message', XenForo_Input::STRING);
-
-        list($profilePost, $user) = $this->_getUserProfileHelper()->assertProfilePostValidAndViewable($profilePostId);
-
-        if (!$this->_getProfilePostModel()->canReportProfilePost($profilePost, $user, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        if (!$message) {
-            return $this->responseError(new XenForo_Phrase(
-                'bdapi_slash_x_report_requires_message',
-                array('route' => 'profile-posts')
-            ), 400);
-        }
-
-        $this->assertNotFlooding('report');
-
-        /* @var $reportModel XenForo_Model_Report */
-        $reportModel = $this->getModelFromCache('XenForo_Model_Report');
-        $reportModel->reportContent('profile_post', $profilePost, $message);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    protected function _prepareProfilePosts(array $profilePosts, array $timelineUser = null)
-    {
-        // check for $user being null because we only prepare `profile_post`.`timeline_user` for request
-        // of multiple profile posts from different users (likely from actionMultiple)
-        $prepareTimelineUser = (!$this->_isFieldExcluded('timeline_user') && $timelineUser === null);
-
-        $timelineUsers = array();
-        if ($timelineUser !== null) {
-            $timelineUsers[$timelineUser['user_id']] = $timelineUser;
-        }
-
-        $timelineUserIds = array();
-        foreach ($profilePosts as $profilePost) {
-            if (!isset($timelineUsers[$profilePost['profile_user_id']])) {
-                $timelineUserIds[] = $profilePost['profile_user_id'];
-            }
-        }
-        if (!empty($timelineUserIds)) {
-            $timelineUsers += $this->_getUserModel()->getUsersByIds(
-                $timelineUserIds,
-                $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $prepareLatestComments = false;
-        if ($this->_isFieldIncluded('latest_comments')) {
-            $prepareLatestComments = true;
-            $profilePosts = $this->_getProfilePostModel()->addProfilePostCommentsToProfilePosts(
-                $profilePosts,
-                $this->_getProfilePostModel()->getCommentFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $profilePostsData = array();
-        foreach ($profilePosts as &$profilePostRef) {
-            if (!isset($timelineUsers[$profilePostRef['profile_user_id']])) {
-                continue;
-            }
-            $timelineUserRef =& $timelineUsers[$profilePostRef['profile_user_id']];
-
-            if (!$this->_getProfilePostModel()->canViewProfilePostAndContainer($profilePostRef, $timelineUserRef)) {
-                continue;
-            }
-
-            $profilePostData = $this->_getProfilePostModel()
-                ->prepareApiDataForProfilePost($profilePostRef, $timelineUserRef);
-
-            if ($prepareTimelineUser) {
-                $profilePostData['timeline_user'] = $this->_getUserModel()->prepareApiDataForUser($timelineUserRef);
-            }
-
-            if ($prepareLatestComments) {
-                $profilePostData['latest_comments'] = array();
-                if (!empty($profilePostRef['comments'])) {
-                    $profilePostData['latest_comments'] = $this->_getProfilePostModel()
-                        ->prepareApiDataForComments($profilePostRef['comments'], $profilePostRef, $timelineUserRef);
-                }
-            }
-
-            $profilePostsData[] = $profilePostData;
-        }
-
-        return $profilePostsData;
-    }
-
-    /**
-     * @return XenForo_ControllerHelper_UserProfile
-     */
-    protected function _getUserProfileHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('UserProfile');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_User
-     */
-    protected function _getUserModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_User');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_ProfilePost
-     */
-    protected function _getProfilePostModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_ProfilePost');
-    }
-
-    /**
-     * @return XenForo_Model_Like
-     */
-    protected function _getLikeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Like');
-    }
-
-    public function _isFieldExcluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        if ($field === 'profile_post_id') {
-            return false;
-        }
-
-        return parent::_isFieldExcluded($field, $prefixes);
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_ProfilePost';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Search.php b/xenforo/library/bdApi/ControllerApi/Search.php
deleted file mode 100755
index 6891bed2..00000000
--- a/xenforo/library/bdApi/ControllerApi/Search.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Search extends bdApi_ControllerApi_Abstract
-{
-    const OPTION_NO_KEYWORDS = 'noKeywords';
-    const OPTION_ORDER = 'order';
-    const OPTION_SEARCH_TYPE = 'searchType';
-    const OPTION_SEARCH_TYPE_TAGGED = 'tagged';
-    const OPTION_SEARCH_TYPE_USER_TIMELINE = 'userTimeline';
-
-    public function actionGetIndex()
-    {
-        $data = array(
-            'links' => array(
-                'posts' => bdApi_Data_Helper_Core::safeBuildApiLink('search/posts'),
-                'threads' => bdApi_Data_Helper_Core::safeBuildApiLink('search/threads'),
-                'profile-posts' => bdApi_Data_Helper_Core::safeBuildApiLink('search/profile-posts'),
-            )
-        );
-
-        if (XenForo_Application::$versionId > 1050000) {
-            $data['links']['tagged'] = bdApi_Data_Helper_Core::safeBuildApiLink('search/tagged');
-        }
-
-        return $this->responseData('bdApi_ViewApi_Index', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        $search = $this->_doSearch();
-
-        $this->_request->setParam('search_id', $search['search_id']);
-        return $this->responseReroute(__CLASS__, 'get-results');
-    }
-
-    public function actionGetResults()
-    {
-        $searchId = $this->_input->filterSingle('search_id', XenForo_Input::UINT);
-        $search = $this->_getSearchModel()->getSearchById($searchId);
-
-        if (empty($search)
-            || $search['user_id'] != XenForo_Visitor::getUserId()
-        ) {
-            return $this->responseError(new XenForo_Phrase('requested_search_not_found'), 404);
-        }
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $search = $this->_getSearchModel()->prepareSearch($search);
-        $pageResultIds = $this->_getSearchModel()->sliceSearchResultsToPage($search, $page, $limit);
-        $results = $this->_getSearchModel()->prepareApiDataForSearchResults($pageResultIds);
-        if (!$this->_isFieldExcluded('content')) {
-            $contentData = $this->_getSearchModel()->prepareApiContentDataForSearch($results);
-        } else {
-            $contentData = $results;
-        }
-
-        $data = array(
-            '_search' => $search,
-            'data' => array_values($contentData),
-            'data_total' => $search['result_count'],
-        );
-
-        switch ($search['search_type']) {
-            case self::OPTION_SEARCH_TYPE_TAGGED:
-                if (!empty($search['searchConstraints']['tag'])) {
-                    /** @var bdApi_Extend_Model_Tag $tagModel */
-                    $tagModel = $this->getModelFromCache('XenForo_Model_Tag');
-                    $tags = $tagModel->bdApi_getTagsByIds(explode(' ', $search['searchConstraints']['tag']));
-
-                    $data['search_tags'] = $tagModel->prepareApiDataForTags($tags);
-                }
-                break;
-            case self::OPTION_SEARCH_TYPE_USER_TIMELINE:
-                foreach ($data['data'] as &$profilePostDataRef) {
-                    if (isset($profilePostDataRef['timeline_user'])) {
-                        unset($profilePostDataRef['timeline_user']);
-                    }
-                }
-
-                if (!$this->_isFieldExcluded('user')
-                    && !empty($search['searchConstraints']['user'])
-                    && is_array($search['searchConstraints']['user'])
-                    && count($search['searchConstraints']['user']) === 1
-                ) {
-                    $userId = reset($search['searchConstraints']['user']);
-
-                    /** @var bdApi_Extend_Model_User $userModel */
-                    $userModel = $this->getModelFromCache('XenForo_Model_User');
-                    $user = $userModel->getUserById($userId, $userModel->getFetchOptionsToPrepareApiData());
-                    $data['user'] = $this->_filterDataSingle($userModel->prepareApiDataForUser($user), array('user'));
-                }
-                break;
-        }
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $search['result_count'],
-            $page,
-            'search/results',
-            $search,
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_Search_Results', $data);
-    }
-
-    public function actionPostThreads()
-    {
-        $search = $this->_doSearch('thread');
-        $pageResultIds = $this->_getSearchModel()->sliceSearchResultsToPage($search, 1, null);
-        $results = $this->_getSearchModel()->prepareApiDataForSearchResults($pageResultIds);
-
-        $threads = array();
-        foreach ($results as $result) {
-            $threads[] = array('thread_id' => $result['content_id']);
-        }
-
-        $data = array('threads' => $threads);
-
-        $resultsData = $this->_fetchResultsData($results);
-        if (!empty($resultsData)) {
-            $data['data'] = $resultsData['data'];
-
-            bdApi_Data_Helper_Core::addPageLinks(
-                $this->getInput(),
-                $data,
-                $resultsData['limit'],
-                $search['result_count'],
-                $resultsData['page'],
-                'search/results',
-                $search,
-                $resultsData['pageLinkParams']
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_Search_Threads', $data);
-    }
-
-    public function actionPostPosts()
-    {
-        $constraints = array();
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        if (!empty($threadId)) {
-            $constraints['thread'] = $threadId;
-        }
-
-        $search = $this->_doSearch('post', $constraints);
-        $pageResultIds = $this->_getSearchModel()->sliceSearchResultsToPage($search, 1, null);
-        $results = $this->_getSearchModel()->prepareApiDataForSearchResults($pageResultIds);
-        $threadIds = array();
-
-        $posts = array();
-        foreach ($results as $key => $result) {
-            if ($result['content_type'] == 'post') {
-                $posts[$key] = array('post_id' => $result['content_id']);
-            } elseif ($result['content_type'] == 'thread') {
-                $posts[$key] = array('thread_id' => $result['content_id']);
-                $threadIds[intval($result['content_id'])] = $key;
-            }
-        }
-
-        if (!empty($threadIds)) {
-            /** @var XenForo_Model_Thread $threadModel */
-            $threadModel = $this->getModelFromCache('XenForo_Model_Thread');
-            $threads = $threadModel->getThreadsByIds(array_keys($threadIds));
-            foreach ($threadIds as $threadId => $key) {
-                if (isset($threads[$threadId])) {
-                    $threadRef =& $threads[$threadId];
-                    $posts[$key]['post_id'] = $threadRef['first_post_id'];
-                }
-            }
-            ksort($posts);
-        }
-
-        $data = array('posts' => $posts);
-
-        $resultsData = $this->_fetchResultsData($results);
-        if (!empty($resultsData)) {
-            $data['data'] = $resultsData['data'];
-
-            bdApi_Data_Helper_Core::addPageLinks(
-                $this->getInput(),
-                $data,
-                $resultsData['limit'],
-                $search['result_count'],
-                $resultsData['page'],
-                'search/results',
-                $search,
-                $resultsData['pageLinkParams']
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_Search_Posts', $data);
-    }
-
-    public function actionPostProfilePosts()
-    {
-        $search = $this->_doSearch('profile_post');
-
-        $this->_request->setParam('search_id', $search['search_id']);
-        return $this->responseReroute(__CLASS__, 'get-results');
-    }
-
-    public function actionPostTagged()
-    {
-        if (XenForo_Application::$versionId < 1050000) {
-            return $this->responseNoPermission();
-        }
-
-        $search = $this->_doSearch(
-            '',
-            array(),
-            array(
-                self::OPTION_NO_KEYWORDS => true,
-                self::OPTION_ORDER => 'date',
-                self::OPTION_SEARCH_TYPE => self::OPTION_SEARCH_TYPE_TAGGED,
-            )
-        );
-
-        $this->_request->setParam('search_id', $search['search_id']);
-        return $this->responseReroute(__CLASS__, 'get-results');
-    }
-
-    public function actionUserTimeline()
-    {
-        $search = $this->_doSearch('', array(), array(
-            self::OPTION_NO_KEYWORDS => true,
-            self::OPTION_ORDER => 'date',
-            self::OPTION_SEARCH_TYPE => self::OPTION_SEARCH_TYPE_USER_TIMELINE,
-        ));
-
-        $this->_request->setParam('search_id', $search['search_id']);
-        return $this->responseReroute(__CLASS__, 'get-results');
-    }
-
-    public function actionPostIndexing()
-    {
-        $input = $this->_input->filter(array(
-            'content_type' => XenForo_Input::STRING,
-            'content_id' => XenForo_Input::UINT,
-            'title' => XenForo_Input::STRING,
-            'body' => XenForo_Input::STRING,
-            'date' => array(XenForo_Input::UINT, 'default' => XenForo_Application::$time),
-            'link' => XenForo_Input::STRING,
-            'extra_data' => XenForo_Input::ARRAY_SIMPLE,
-        ));
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (!$session->getOAuthClientOption('allow_search_indexing')) {
-            return $this->responseNoPermission();
-        }
-
-        $dbKeys = array(
-            'client_id' => $session->getOAuthClientId(),
-            'content_type' => $input['content_type'],
-            'content_id' => $input['content_id'],
-        );
-        /** @var bdApi_Model_ClientContent $clientContentModel */
-        $clientContentModel = $this->getModelFromCache('bdApi_Model_ClientContent');
-        $existingContents = $clientContentModel->getClientContents($dbKeys);
-        $existingContent = null;
-        if (!empty($existingContents)) {
-            $existingContent = reset($existingContents);
-        }
-
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_ClientContent');
-        if (!empty($existingContent)) {
-            $dw->setExistingData($existingContent, true);
-            $input['extra_data'] = array_merge($existingContent['extraData'], $input['extra_data']);
-        } else {
-            $dw->bulkSet($dbKeys);
-        }
-
-        $dw->set('title', $input['title']);
-        $dw->set('body', $input['body']);
-        $dw->set('date', $input['date']);
-        $dw->set('link', $input['link']);
-        $dw->set('extra_data', $input['extra_data']);
-
-        if ($dw->isInsert()
-            || XenForo_Visitor::getUserId() > 0
-        ) {
-            $dw->set('user_id', XenForo_Visitor::getUserId());
-        }
-
-        $dw->preSave();
-
-        if ($dw->hasErrors()) {
-            return $this->responseErrors($dw->getErrors(), 400);
-        }
-
-        $dw->save();
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function _doSearch($contentType = '', array $constraints = array(), array $options = array())
-    {
-        $forumId = $this->_input->filterSingle('forum_id', XenForo_Input::UINT);
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        $tagText = $this->_input->filterSingle('tag', XenForo_Input::STRING);
-        $tagList = $this->_input->filterSingle(
-            'tags',
-            XenForo_Input::STRING,
-            array('array' => true)
-        );
-
-        if (!XenForo_Visitor::getInstance()->canSearch()) {
-            throw $this->getNoPermissionResponseException();
-        }
-
-        $input = array(
-            'keywords' => '',
-            'order' => 'relevance',
-            'group_discussion' => false,
-        );
-
-        if (empty($options[self::OPTION_NO_KEYWORDS])) {
-            $input['keywords'] = $this->_input->filterSingle('q', XenForo_Input::STRING);
-            $input['keywords'] = XenForo_Helper_String::censorString($input['keywords'], null, '');
-            // don't allow searching of censored stuff
-            if (empty($input['keywords'])) {
-                throw $this->responseException($this->responseError(
-                    new XenForo_Phrase('bdapi_slash_search_requires_q'),
-                    400
-                ));
-            }
-        }
-
-        if (!empty($options[self::OPTION_ORDER])) {
-            $input['order'] = $options[self::OPTION_ORDER];
-        }
-
-        $maxResults = XenForo_Application::getOptions()->get('maximumSearchResults');
-
-        switch ($contentType) {
-            case 'thread':
-            case 'post':
-                // only these two legacy content types support `limit` param while searching
-                // others use `limit` to control how many pieces of data are returned
-                list($limit,) = $this->filterLimitAndPage();
-                if ($limit > 0) {
-                    $maxResults = min($maxResults, $limit);
-                }
-        }
-
-        if (!empty($forumId)) {
-            $childNodeIds = array_keys($this->_getNodeModel()->getChildNodesForNodeIds(array($forumId)));
-            $nodeIds = array_unique(array_merge(array($forumId), $childNodeIds));
-            $constraints['node'] = implode(' ', $nodeIds);
-            if (!$constraints['node']) {
-                unset($constraints['node']);
-            }
-        }
-
-        if (!empty($userId)) {
-            $constraints['user'] = array($userId);
-        }
-
-        if (XenForo_Application::$versionId >= 1050000) {
-            /** @var XenForo_Model_Tag $tagModel */
-            $tagModel = $this->getModelFromCache('XenForo_Model_Tag');
-            if (empty($tagList)) {
-                $tagList = $tagModel->splitTags($tagText);
-            }
-            if (empty($tagList)
-                && !empty($options[self::OPTION_SEARCH_TYPE])
-                && $options[self::OPTION_SEARCH_TYPE] === self::OPTION_SEARCH_TYPE_TAGGED
-            ) {
-                throw $this->responseException($this->responseError(
-                    new XenForo_Phrase('bdapi_slash_search_tagged_requires_tag'),
-                    400
-                ));
-            }
-
-            $validTags = $tagModel->getTags($tagList, $notFound);
-            if ($notFound) {
-                return $this->responseError(new XenForo_Phrase(
-                    'following_tags_not_found_x',
-                    array('tags' => implode(', ', $notFound))
-                ));
-            }
-
-            $constraints['tag'] = implode(' ', array_keys($validTags));
-        }
-
-        $searchModel = $this->_getSearchModel();
-        $searcher = new XenForo_Search_Searcher($searchModel);
-
-        if (!empty($contentType)) {
-            // content type searching
-            $typeHandler = $searchModel->getSearchDataHandler($contentType);
-            if (empty($typeHandler)) {
-                throw new XenForo_Exception(sprintf('No search data handler found for content type %s', $contentType));
-            }
-
-            $results = $searcher->searchType(
-                $typeHandler,
-                $input['keywords'],
-                $constraints,
-                $input['order'],
-                $input['group_discussion'],
-                $maxResults
-            );
-        } else {
-            // general searching
-            $results = $searcher->searchGeneral($input['keywords'], $constraints, $input['order'], $maxResults);
-        }
-
-        $searchType = $contentType;
-        if (!empty($options[self::OPTION_SEARCH_TYPE])) {
-            $searchType = $options[self::OPTION_SEARCH_TYPE];
-        }
-
-        $search = $searchModel->insertSearch(
-            $results,
-            $searchType,
-            $input['keywords'],
-            $constraints,
-            $input['order'],
-            $input['group_discussion']
-        );
-
-        return $search;
-    }
-
-    protected function _fetchResultsData(array $results)
-    {
-        if (empty($results)) {
-            return $results;
-        }
-
-        // WARNING: only two legacy types (thread & post) use `data_limit` param
-        list($dataLimit,) = $this->filterLimitAndPage($tempArray, 'data_limit');
-        if (empty($dataLimit)) {
-            return array();
-        }
-
-        $dataResults = array_slice($results, 0, $dataLimit);
-
-        $searchModel = $this->_getSearchModel();
-        $contentData = $searchModel->prepareApiContentDataForSearch($dataResults);
-
-        return array(
-            'data' => array_values($contentData),
-            'limit' => $dataLimit,
-            'page' => 1,
-            'pageLinkParams' => array('limit' => $dataLimit),
-        );
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Search
-     */
-    protected function _getSearchModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Search');
-    }
-
-    /**
-     * @return XenForo_Model_Node
-     */
-    protected function _getNodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Node');
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $controllerName = 'XenForo_ControllerPublic_Search';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Subscription.php b/xenforo/library/bdApi/ControllerApi/Subscription.php
deleted file mode 100644
index 041f6a37..00000000
--- a/xenforo/library/bdApi/ControllerApi/Subscription.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Subscription extends bdApi_ControllerApi_Abstract
-{
-    public function actionPostIndex()
-    {
-        $input = $this->_input->filter(array(
-            'hub_callback' => XenForo_Input::STRING,
-            'hub_mode' => XenForo_Input::STRING,
-            'hub_topic' => XenForo_Input::STRING,
-            'hub_lease_seconds' => XenForo_Input::STRING,
-        ));
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        $isSessionClientId = true;
-        if (empty($clientId)) {
-            $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-            $isSessionClientId = false;
-        }
-        if (empty($clientId)) {
-            return $this->responseNoPermission();
-        }
-
-        if (!Zend_Uri::check($input['hub_callback'])) {
-            return $this->_responseError(new XenForo_Phrase('bdapi_subscription_callback_is_required'));
-        }
-
-        if (!in_array($input['hub_mode'], array(
-            'subscribe',
-            'unsubscribe'
-        ), true)
-        ) {
-            return $this->_responseError(new XenForo_Phrase('bdapi_subscription_mode_must_valid'));
-        }
-
-        $existingSubscriptions = array();
-        if ($input['hub_mode'] === 'subscribe') {
-            if (!$isSessionClientId) {
-                // subscribe requires authenticated session
-                return $this->responseNoPermission();
-            }
-
-            if (!$this->_getSubscriptionModel()->isValidTopic($input['hub_topic'])) {
-                return $this->_responseError(new XenForo_Phrase('bdapi_subscription_topic_not_recognized'));
-            }
-        } else {
-            $existingSubscriptions = $this->_getSubscriptionModel()->getSubscriptions(array(
-                'client_id' => $clientId,
-                'topic' => $input['hub_topic'],
-            ));
-
-            if (!empty($existingSubscriptions)) {
-                foreach (array_keys($existingSubscriptions) as $i) {
-                    if ($existingSubscriptions[$i]['callback'] != $input['hub_callback']) {
-                        unset($existingSubscriptions[$i]);
-                    }
-                }
-            }
-        }
-
-        if ($this->_getSubscriptionModel()->verifyIntentOfSubscriber(
-            $input['hub_callback'],
-            $input['hub_mode'],
-            $input['hub_topic'],
-            $input['hub_lease_seconds'],
-            array('client_id' => $clientId)
-        )
-        ) {
-            switch ($input['hub_mode']) {
-                case 'unsubscribe':
-                    foreach ($existingSubscriptions as $subscription) {
-                        $dw = XenForo_DataWriter::create('bdApi_DataWriter_Subscription');
-                        $dw->setOption(bdApi_DataWriter_Subscription::OPTION_UPDATE_CALLBACKS, false);
-                        $dw->setExistingData($subscription, true);
-                        $dw->delete();
-                    }
-
-                    $this->_getSubscriptionModel()->updateCallbacksForTopic($input['hub_topic']);
-                    break;
-                default:
-                    $subscriptions = $this->_getSubscriptionModel()->getSubscriptions(array(
-                        'client_id' => $clientId,
-                        'topic' => $input['hub_topic'],
-                    ));
-                    foreach ($subscriptions as $subscription) {
-                        if ($subscription['callback'] == $input['hub_callback']) {
-                            $duplicateDw = XenForo_DataWriter::create('bdApi_DataWriter_Subscription');
-                            $duplicateDw->setOption(bdApi_DataWriter_Subscription::OPTION_UPDATE_CALLBACKS, false);
-                            $duplicateDw->setExistingData($subscription, true);
-                            $duplicateDw->delete();
-                        }
-                    }
-
-                    $dw = XenForo_DataWriter::create('bdApi_DataWriter_Subscription');
-                    $dw->set('client_id', $clientId);
-                    $dw->set('callback', $input['hub_callback']);
-                    $dw->set('topic', $input['hub_topic']);
-                    $dw->set('subscribe_date', XenForo_Application::$time);
-
-                    if ($input['hub_lease_seconds'] > 0) {
-                        $dw->set('expire_date', XenForo_Application::$time + $input['hub_lease_seconds']);
-                    }
-
-                    $dw->save();
-            }
-
-            return $this->_responseSuccess();
-        }
-
-        return $this->_responseError(new XenForo_Phrase('bdapi_subscription_cannot_verify_intent_of_subscriber'));
-    }
-
-    /**
-     * @return bdApi_Model_Subscription
-     */
-    protected function _getSubscriptionModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Subscription');
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        return false;
-    }
-
-    protected function _responseError($error)
-    {
-        $this->_routeMatch->setResponseType('raw');
-
-        return $this->responseData('bdApi_ViewApi_Subscription_Post', array(
-            'httpResponseCode' => 400,
-            'message' => $error,
-        ));
-    }
-
-    protected function _responseSuccess()
-    {
-        $this->_routeMatch->setResponseType('raw');
-
-        return $this->responseData('bdApi_ViewApi_Subscription_Post', array('httpResponseCode' => 202));
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Tag.php b/xenforo/library/bdApi/ControllerApi/Tag.php
deleted file mode 100644
index 3fb676e0..00000000
--- a/xenforo/library/bdApi/ControllerApi/Tag.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Tag extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        if (XenForo_Application::$versionId < 1050000) {
-            return $this->responseNoPermission();
-        }
-
-        $tagId = $this->_input->filterSingle('tag_id', XenForo_Input::UINT);
-        if (!empty($tagId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        /** @var bdApi_Extend_Model_Tag $tagModel */
-        $tagModel = $this->getModelFromCache('XenForo_Model_Tag');
-
-        $options = XenForo_Application::getOptions();
-
-        if ($options->get('tagCloud', 'enabled')) {
-            $tags = $tagModel->getTagsForCloud($options->get('tagCloud', 'count'), $options->get('tagCloudMinUses'));
-        } else {
-            $tags = array();
-        }
-
-        $data = array(
-            'tags' => $tagModel->prepareApiDataForTags($tags),
-        );
-
-        return $this->responseData('bdApi_ViewData_Tag_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $tagId = $this->_input->filterSingle('tag_id', XenForo_Input::UINT);
-
-        $tagModel = $this->_getTagModel();
-        $tag = $tagModel->getTagById($tagId);
-        if (empty($tag)) {
-            return $this->responseError(new XenForo_Phrase('requested_tag_not_found'), 404);
-        }
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $cache = $tagModel->getTagResultsCache($tag['tag_id'], 0);
-        if ($cache) {
-            $contentTags = json_decode($cache['results'], true);
-        } else {
-            $xenOptions = XenForo_Application::getOptions();
-            $maximumSearchResults = $xenOptions->get('maximumSearchResults');
-            $contentTags = $tagModel->getContentIdsByTagId($tag['tag_id'], $maximumSearchResults);
-
-            $insertCache = (count($contentTags) > $limit);
-            if ($insertCache) {
-                $tagModel->insertTagResultsCache($tag['tag_id'], $contentTags, 0);
-            }
-        }
-
-        $totalResults = count($contentTags);
-        $pageResultIds = array_slice($contentTags, ($page - 1) * $limit, $limit);
-
-        /** @var bdApi_Extend_Model_Search $searchModel */
-        $searchModel = $this->getModelFromCache('XenForo_Model_Search');
-        $results = $searchModel->prepareApiDataForSearchResults($pageResultIds);
-        if (!$this->_isFieldExcluded('content')) {
-            $contentData = $searchModel->prepareApiContentDataForSearch($results);
-        } else {
-            $contentData = $results;
-        }
-
-        $data = array(
-            '_tag' => $tag,
-            'tag' => $tagModel->prepareApiDataForTag($tag),
-            'tagged' => array_values($contentData),
-            'tagged_total' => $totalResults,
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $totalResults,
-            $page,
-            'tags',
-            $tag,
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_Tag_Single', $data);
-    }
-
-    public function actionGetFind()
-    {
-        $q = $this->_input->filterSingle('tag', XenForo_Input::STRING);
-
-        if (XenForo_Application::$versionId < 1050000) {
-            return $this->responseNoPermission();
-        }
-
-        $this->_assertRequiredScope(bdApi_Model_OAuth2::SCOPE_POST);
-
-        $tagModel = $this->_getTagModel();
-        $q = $tagModel->normalizeTag($q);
-
-        if (strlen($q) >= 2) {
-            $tags = $tagModel->autoCompleteTag($q);
-        } else {
-            $tags = array();
-        }
-
-        $data = array(
-            'tags' => array_values($tagModel->prepareApiDataForTags($tags)),
-        );
-
-        return $this->responseData('bdApi_ViewData_Tag_Find', $data);
-    }
-
-    public function actionGetList()
-    {
-        $this->_assertValidToken();
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $tagModel = $this->_getTagModel();
-        $total = $tagModel->bdApi_getLatestTagId();
-
-        $tagIdEnd = $page * $limit;
-        $tagIdStart = $tagIdEnd - $limit + 1;
-        $tags = $tagModel->bdApi_getTagsByIdRange($tagIdStart, $tagIdEnd);
-
-        $data = array(
-            'tags' => $tagModel->prepareApiDataForTags($tags),
-            'tags_total' => $total,
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'tags/list',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewData_Tag_List', $data);
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Tag
-     */
-    protected function _getTagModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Tag');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Thread.php b/xenforo/library/bdApi/ControllerApi/Thread.php
deleted file mode 100755
index 61169b80..00000000
--- a/xenforo/library/bdApi/ControllerApi/Thread.php
+++ /dev/null
@@ -1,1181 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Thread extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        if (!empty($threadId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        $threadIds = $this->_input->filterSingle('thread_ids', XenForo_Input::STRING);
-        if (!empty($threadIds)) {
-            return $this->responseReroute(__CLASS__, 'multiple');
-        }
-
-        $forumIdInput = $this->_input->filterSingle('forum_id', XenForo_Input::STRING);
-        $creatorUserId = $this->_input->filterSingle('creator_user_id', XenForo_Input::UINT);
-        $threadPrefixId = $this->_input->filterSingle('thread_prefix_id', XenForo_Input::UINT);
-        $threadTagId = $this->_input->filterSingle('thread_tag_id', XenForo_Input::UINT);
-        $sticky = $this->_input->filterSingle('sticky', XenForo_Input::STRING);
-        $stickyBool = intval($sticky) > 0;
-        $order = $this->_input->filterSingle('order', XenForo_Input::STRING, array('default' => 'natural'));
-
-        $forumIdInput = preg_split('#[^0-9]#', $forumIdInput, -1, PREG_SPLIT_NO_EMPTY);
-        $viewableNodes = $this->_getNodeModel()->getViewableNodeList();
-        $viewableForums = array_filter($viewableNodes, function ($f) {
-            return $f['node_type_id'] === 'Forum';
-        });
-        $forumIdArray = array_intersect($forumIdInput, array_keys($viewableForums));
-        if (count($forumIdArray) !== count($forumIdInput)) {
-            return $this->responseError(new XenForo_Phrase('requested_forum_not_found'), 404);
-        }
-        $forumIdArray = array_unique(array_map('intval', $forumIdArray));
-        asort($forumIdArray);
-
-        $theForumId = count($forumIdArray) === 1 ? reset($forumIdArray) : 0;
-        $theForum = null;
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $conditions = array(
-            'deleted' => false,
-            'moderated' => false,
-            'sticky' => (intval($sticky) > 0),
-        );
-        $fetchOptions = array(
-            'limit' => $limit,
-            'page' => $page
-        );
-        $total = 0;
-
-        if (!empty($forumIdArray)) {
-            $pageNavParams['forum_id'] = implode(',', $forumIdArray);
-            $conditions['node_id'] = $forumIdArray;
-        }
-
-        if ($theForumId > 0) {
-            // forum threads has sticky-mixed mode (see below)
-            $conditions['sticky'] = $stickyBool;
-        } elseif (is_numeric($sticky)) {
-            // otherwise only set the thread condition if found valid value for `sticky`
-            $conditions['sticky'] = $stickyBool;
-        }
-
-        $creatorUser = null;
-        if ($creatorUserId > 0) {
-            if ($theForumId <= 0) {
-                return $this->responseError(
-                    new XenForo_Phrase('bdapi_slash_threads_creator_user_id_requires_forum_id'),
-                    400
-                );
-            }
-
-            $creatorUser = $this->_getUserModel()->getUserById(
-                $creatorUserId,
-                $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-            );
-            if (empty($creatorUser)
-                || !$this->_getUserProfileModel()->canViewFullUserProfile($creatorUser)
-            ) {
-                return $this->responseError(new XenForo_Phrase('requested_user_not_found'), 404);
-            }
-
-            $pageNavParams['creator_user_id'] = $creatorUser['user_id'];
-            $conditions['user_id'] = $creatorUser['user_id'];
-        }
-
-        if ($threadPrefixId > 0) {
-            if ($theForumId <= 0) {
-                return $this->responseError(
-                    new XenForo_Phrase('bdapi_slash_threads_thread_prefix_id_requires_forum_id'),
-                    400
-                );
-            }
-
-            $pageNavParams['thread_prefix_id'] = $threadPrefixId;
-            $conditions['prefix_id'] = $threadPrefixId;
-        }
-
-        $threadTag = null;
-        if (XenForo_Application::$versionId > 1050000
-            && $threadTagId > 0) {
-            if ($theForumId <= 0) {
-                return $this->responseError(
-                    new XenForo_Phrase('bdapi_slash_threads_thread_tag_id_requires_forum_id'),
-                    400
-                );
-            }
-
-            $threadTag = $this->_getTagModel()->getTagById($threadTagId);
-            if (empty($threadTag)) {
-                return $this->responseError(new XenForo_Phrase('requested_tag_not_found'), 404);
-            }
-
-            $pageNavParams['thread_tag_id'] = $threadTag['tag_id'];
-            $this->_getThreadModel();
-            $conditions[bdApi_Extend_Model_Thread::CONDITIONS_TAG_ID] = $threadTag['tag_id'];
-        }
-
-        switch ($order) {
-            case 'thread_create_date':
-                $fetchOptions['order'] = 'post_date';
-                $fetchOptions['orderDirection'] = 'asc';
-                $pageNavParams['order'] = $order;
-
-                if ($theForumId < 1) {
-                    // disable paging for this order if not in a forum
-                    $fetchOptions['page'] = 0;
-                }
-                break;
-            case 'thread_create_date_reverse':
-                $fetchOptions['order'] = 'post_date';
-                $fetchOptions['orderDirection'] = 'desc';
-                $pageNavParams['order'] = $order;
-
-                if ($theForumId < 1) {
-                    // disable paging for this order if not in a forum
-                    $fetchOptions['page'] = 0;
-                }
-                break;
-            case 'thread_update_date':
-                $fetchOptions['order'] = 'last_post_date';
-                $fetchOptions['orderDirection'] = 'asc';
-                $pageNavParams['order'] = $order;
-
-                if ($theForumId < 1) {
-                    // disable paging for this order if not in a forum
-                    $fetchOptions['page'] = 0;
-                }
-                break;
-            case 'thread_update_date_reverse':
-                $fetchOptions['order'] = 'last_post_date';
-                $fetchOptions['orderDirection'] = 'desc';
-                $pageNavParams['order'] = $order;
-
-                if ($theForumId < 1) {
-                    // disable paging for this order if not in a forum
-                    $fetchOptions['page'] = 0;
-                }
-                break;
-            case 'thread_view_count':
-                if ($theForumId <= 0) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_threads_order_x_requires_forum_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                $fetchOptions['order'] = 'view_count';
-                $fetchOptions['orderDirection'] = 'asc';
-                $pageNavParams['order'] = $order;
-                break;
-            case 'thread_view_count_reverse':
-                if ($theForumId <= 0) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_threads_order_x_requires_forum_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                $fetchOptions['order'] = 'view_count';
-                $fetchOptions['orderDirection'] = 'desc';
-                $pageNavParams['order'] = $order;
-                break;
-            case 'thread_post_count':
-                if ($theForumId <= 0) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_threads_order_x_requires_forum_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                $fetchOptions['order'] = 'reply_count';
-                $fetchOptions['orderDirection'] = 'asc';
-                $pageNavParams['order'] = $order;
-                break;
-            case 'thread_post_count_reverse':
-                if ($theForumId <= 0) {
-                    return $this->responseError(new XenForo_Phrase(
-                        'bdapi_slash_threads_order_x_requires_forum_id',
-                        array('order' => $order)
-                    ), 400);
-                }
-
-                $fetchOptions['order'] = 'reply_count';
-                $fetchOptions['orderDirection'] = 'desc';
-                $pageNavParams['order'] = $order;
-                break;
-            default:
-                if ($theForumId > 0) {
-                    $fetchOptions['order'] = 'last_post_date';
-                    $fetchOptions['orderDirection'] = 'desc';
-                } else {
-                    $this->_assertValidToken();
-
-                    // manually prepare threads total count for paging
-                    $total = $this->_getThreadModel()->bdApi_getLatestThreadId();
-
-                    $threadIdEnd = max(1, $fetchOptions['page']) * $fetchOptions['limit'];
-                    $threadIdStart = $threadIdEnd - $fetchOptions['limit'] + 1;
-                    $this->_getPostModel();
-                    $conditions[bdApi_Extend_Model_Thread::CONDITIONS_THREAD_ID] =
-                        array('>=<', $threadIdStart, $threadIdEnd);
-
-                    // paging was done by conditions (see above), remove it from fetch options
-                    $fetchOptions['page'] = 0;
-                }
-                break;
-        }
-
-        $fetchOptions = $this->_getThreadModel()->getFetchOptionsToPrepareApiData($fetchOptions);
-        $threads = $this->_getThreadModel()->getThreads($conditions, $fetchOptions);
-
-        if ($theForumId > 0
-            && !is_numeric($sticky)
-            && intval($page) <= 1
-        ) {
-            // mixed mode, put sticky threads on top of result if this is the first page
-            // mixed mode is the active mode by default (no `sticky` param)
-            // the two other modes related are: sticky mode (`sticky`=1) and non-sticky mode (`sticky`=0)
-            $stickyThreads = $this->_getThreadModel()->getThreads(
-                array_merge($conditions, array('sticky' => 1)),
-                array_merge($fetchOptions, array(
-                    'limit' => 0,
-                    'page' => 0,
-                ))
-            );
-            if (!empty($stickyThreads)) {
-                $_threads = array();
-                foreach (array_keys($stickyThreads) as $_stickyThreadId) {
-                    $_threads[$_stickyThreadId] = $stickyThreads[$_stickyThreadId];
-                }
-                foreach (array_keys($threads) as $_threadId) {
-                    $_threads[$_threadId] = $threads[$_threadId];
-                }
-                $threads = $_threads;
-                unset($_threads);
-            }
-        }
-
-        $getForumById = false;
-        if ($theForumId > 0
-            && !$this->_isFieldExcluded('forum')
-        ) {
-            $getForumById = true;
-        }
-        if (!empty($pageNavParams['thread_prefix_id'])
-            && !$this->_isFieldExcluded('thread_prefixes')
-        ) {
-            $getForumById = true;
-        }
-        if ($getForumById) {
-            $theForum = $this->_getForumModel()->getForumById(
-                $theForumId,
-                $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $threadsData = $this->_prepareThreads($threads, $theForum);
-
-        $data = array(
-            'threads' => $this->_filterDataMany($threadsData),
-        );
-
-        if (!empty($theForum)
-            && !$this->_isFieldExcluded('forum')
-        ) {
-            $data['forum'] = $this->_filterDataSingle($this->_getForumModel()
-                ->prepareApiDataForForum($theForum), array('forum'));
-        }
-
-        if (!empty($creatorUser)
-            && !$this->_isFieldExcluded('creator_user')
-        ) {
-            $data['creator_user'] = $this->_filterDataSingle($this->_getUserModel()
-                ->prepareApiDataForUser($creatorUser), array('creator_user'));
-        }
-
-        if (!empty($pageNavParams['thread_prefix_id'])
-            && !empty($theForum['prefixes'])
-            && !$this->_isFieldExcluded('thread_prefixes')
-        ) {
-            $data['thread_prefixes'] = $this->_filterDataMany(
-                $this->_getThreadPrefixModel()
-                    ->prepareApiDataForPrefixes($theForum['prefixes'], array($pageNavParams['thread_prefix_id'])),
-                array('thread_prefixes')
-            );
-        }
-
-        if (!empty($threadTag)
-            && !$this->_isFieldExcluded('thread_tags')
-        ) {
-            $data['thread_tag'] = $this->_getTagModel()->prepareApiDataForTag($threadTag);
-        }
-
-        if ($theForumId > 0) {
-            $total = $this->_getThreadModel()->countThreads($conditions);
-        }
-        if ($total > 0) {
-            $data['threads_total'] = $total;
-            bdApi_Data_Helper_Core::addPageLinks(
-                $this->getInput(),
-                $data,
-                $limit,
-                $total,
-                $page,
-                'threads',
-                array(),
-                $pageNavParams
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_Thread_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-
-        list($thread, $forum) = $this->_getForumThreadPostHelper()->assertThreadValidAndViewable(
-            $threadId,
-            $this->_getThreadModel()->getFetchOptionsToPrepareApiData(),
-            $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $threads = array($threadId => $thread);
-        $threadsData = $this->_prepareThreads($threads, $forum);
-
-        $threadData = reset($threadsData);
-        if (empty($threadData)) {
-            return $this->responseNoPermission();
-        }
-
-        $data = array('thread' => $this->_filterDataSingle($threadData));
-
-        return $this->responseData('bdApi_ViewApi_Thread_Single', $data);
-    }
-
-    public function actionMultiple()
-    {
-        $threadIdsInput = $this->_input->filterSingle('thread_ids', XenForo_Input::STRING);
-        $threadIds = array_map('intval', explode(',', $threadIdsInput));
-        if (empty($threadIds)) {
-            return $this->responseNoPermission();
-        }
-
-        $threads = $this->_getThreadModel()->getThreadsByIds(
-            $threadIds,
-            $this->_getThreadModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $threadsOrdered = array();
-        foreach ($threadIds as $threadId) {
-            if (isset($threads[$threadId])) {
-                $threadsOrdered[$threadId] = $threads[$threadId];
-            }
-        }
-
-        $threadsData = $this->_prepareThreads($threadsOrdered);
-
-        $data = array(
-            'threads' => $this->_filterDataMany($threadsData),
-        );
-
-        return $this->responseData('bdApi_ViewApi_Thread_List', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        $input = $this->_input->filter(array(
-            'forum_id' => XenForo_Input::UINT,
-            'thread_title' => XenForo_Input::STRING,
-            'thread_prefix_id' => XenForo_Input::STRING,
-            'thread_tags' => XenForo_Input::STRING,
-        ));
-
-        /* @var $editorHelper XenForo_ControllerHelper_Editor */
-        $editorHelper = $this->getHelper('Editor');
-        $input['post_body'] = $editorHelper->getMessageText('post_body', $this->_input);
-        $input['post_body'] = XenForo_Helper_String::autoLinkBbCode($input['post_body']);
-
-        $forum = $this->_getForumThreadPostHelper()->assertForumValidAndViewable($input['forum_id']);
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (!$this->_getForumModel()->canPostThreadInForum($forum, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        /* @var $writer XenForo_DataWriter_Discussion_Thread */
-        $writer = XenForo_DataWriter::create('XenForo_DataWriter_Discussion_Thread');
-
-        // note: assumes that the message dw will pick up the username issues
-        $writer->bulkSet(array(
-            'user_id' => $visitor['user_id'],
-            'username' => $visitor['username'],
-            'title' => $input['thread_title'],
-            'node_id' => $forum['node_id'],
-        ));
-
-        $prefixId = $input['thread_prefix_id'];
-        if (!is_numeric($prefixId)
-            && !empty($forum['default_prefix_id'])
-        ) {
-            $prefixId = $forum['default_prefix_id'];
-        }
-        $writer->set('prefix_id', $prefixId);
-
-        // discussion state changes instead of first message state
-        $writer->set('discussion_state', $this->_getPostModel()->getPostInsertMessageState(array(), $forum));
-
-        /** @var bdApi_XenForo_DataWriter_DiscussionMessage_Post $postWriter */
-        $postWriter = $writer->getFirstMessageDw();
-        $postWriter->set('message', $input['post_body']);
-        $postWriter->setExtraData(
-            XenForo_DataWriter_DiscussionMessage::DATA_ATTACHMENT_HASH,
-            $this->_getAttachmentHelper()->getAttachmentTempHash($forum)
-        );
-        $postWriter->setExtraData(XenForo_DataWriter_DiscussionMessage_Post::DATA_FORUM, $forum);
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        if (!empty($clientId)) {
-            $postWriter->bdApi_setOrigin($clientId);
-        }
-
-        $writer->setExtraData(XenForo_DataWriter_Discussion_Thread::DATA_FORUM, $forum);
-
-        $tagger = null;
-        if (XenForo_Application::$versionId > 1050000
-            && $this->_getThreadModel()->canEditTags(null, $forum)
-        ) {
-            // thread tagging is available since XenForo 1.5.0
-            $tagModel = $this->_getTagModel();
-            $tagger = $tagModel->getTagger('thread');
-            $tagger->setPermissionsFromContext($forum)
-                ->setTags($tagModel->splitTags($input['thread_tags']));
-            $writer->mergeErrors($tagger->getErrors());
-        }
-
-        if ($writer->get('discussion_state') == 'visible') {
-            switch ($this->_spamCheck(array(
-                'content_type' => 'thread',
-                'content' => $input['thread_title'] . "\n" . $input['post_body'],
-            ))) {
-                case XenForo_Model_SpamPrevention::RESULT_MODERATED:
-                    $writer->set('discussion_state', 'moderated');
-                    break;
-                case XenForo_Model_SpamPrevention::RESULT_DENIED:
-                    return $this->responseError(new XenForo_Phrase('your_content_cannot_be_submitted_try_later'), 400);
-                    break;
-            }
-        }
-
-        $writer->preSave();
-
-        if (!$writer->get('prefix_id')
-            && !empty($forum['require_prefix'])
-        ) {
-            /** @var bdApi_Extend_Model_ThreadPrefix $prefixModel */
-            $prefixModel = $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-            if ($prefixModel->getUsablePrefixesInForums($forum['node_id'])) {
-                $writer->error(new XenForo_Phrase('please_select_a_prefix'), 'prefix_id');
-            }
-        }
-
-        if ($writer->hasErrors()) {
-            return $this->responseErrors($writer->getErrors(), 400);
-        }
-
-        $this->assertNotFlooding('post');
-
-        $writer->save();
-
-        $thread = $writer->getMergedData();
-
-        if (!empty($tagger)) {
-            $tagger->setContent($thread['thread_id'], true)
-                ->save();
-        }
-
-        $this->_getThreadWatchModel()->setVisitorThreadWatchStateFromInput($thread['thread_id'], array(
-            // TODO
-            'watch_thread_state' => 0,
-            'watch_thread' => 0,
-            'watch_thread_email' => 0,
-        ));
-
-        $this->_getThreadModel()->markThreadRead($thread, $forum, XenForo_Application::$time);
-
-        $this->_request->setParam('thread_id', $thread['thread_id']);
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionPutIndex()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        $thread = $this->_getThreadModel()->getThreadById($threadId);
-        $postId = 0;
-        if (!empty($thread['first_post_id'])) {
-            $postId = $thread['first_post_id'];
-        }
-
-        $this->_request->setParam('post_id', $postId);
-        XenForo_Application::set('bdApi_responseReroute', array(__CLASS__, 'single'));
-        return $this->responseReroute('bdApi_ControllerApi_Post', 'put-index');
-    }
-
-    public function actionDeleteIndex()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-
-        /** @var bdApi_ControllerHelper_Delete $deleteHelper */
-        $deleteHelper = $this->getHelper('bdApi_ControllerHelper_Delete');
-        $reason = $deleteHelper->filterReason();
-
-        list($thread, $forum) = $this->_getForumThreadPostHelper()->assertThreadValidAndViewable($threadId);
-
-        $deleteType = 'soft';
-        $options = array('reason' => $reason);
-
-        if (!$this->_getThreadModel()->canDeleteThread($thread, $forum, $deleteType, $errorPhraseKey)) {
-            throw $this->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $this->_getThreadModel()->deleteThread($thread['thread_id'], $deleteType, $options);
-
-        XenForo_Model_Log::logModeratorAction(
-            'thread',
-            $thread,
-            'delete_' . $deleteType,
-            array('reason' => $options['reason'])
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionPostAttachments()
-    {
-        $contentData = $this->_input->filter(array(
-            'forum_id' => XenForo_Input::UINT,
-        ));
-        if (empty($contentData['forum_id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_threads_attachments_requires_forum_id'), 400);
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        $response = $attachmentHelper->doUpload('file', $hash, 'post', $contentData);
-
-        if ($response instanceof XenForo_ControllerResponse_Abstract) {
-            return $response;
-        }
-
-        $contentData['post_id'] = 0;
-        $data = array(
-            'attachment' => $this->_filterDataSingle(
-                $this->_getPostModel()->prepareApiDataForAttachment(
-                    $response,
-                    $contentData,
-                    $contentData,
-                    $contentData,
-                    $hash
-                )
-            )
-        );
-
-        return $this->responseData('bdApi_ViewApi_Thread_Attachments', $data);
-    }
-
-    public function actionDeleteAttachments()
-    {
-        $contentData = $this->_input->filter(array('forum_id' => XenForo_Input::UINT));
-        $attachmentId = $this->_input->filterSingle('attachment_id', XenForo_Input::UINT);
-
-        if (empty($contentData['forum_id'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_threads_attachments_requires_forum_id'), 400);
-        }
-
-        $attachmentHelper = $this->_getAttachmentHelper();
-        $hash = $attachmentHelper->getAttachmentTempHash($contentData);
-        return $attachmentHelper->doDelete($hash, $attachmentId);
-    }
-
-    public function actionGetFollowed()
-    {
-        $this->_assertRegistrationRequired();
-
-        $threadWatchModel = $this->_getThreadWatchModel();
-
-        $total = $threadWatchModel->countThreadsWatchedByUser(XenForo_Visitor::getUserId());
-        if ($this->_input->inRequest('total')) {
-            $data = array('threads_total' => $total);
-            return $this->responseData('bdApi_ViewApi_Thread_Followed_Total', $data);
-        }
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $fetchOptions = array(
-            'limit' => $limit,
-            'page' => $page
-        );
-
-        $threadWatches = $threadWatchModel->getThreadsWatchedByUser(XenForo_Visitor::getUserId(), false, $fetchOptions);
-        $threadsData = array();
-        $threads = array();
-
-        if (!empty($threadWatches)) {
-            $threadIds = array();
-            foreach ($threadWatches as $threadWatch) {
-                $threadIds[] = $threadWatch['thread_id'];
-            }
-
-            $fetchOptions = $this->_getThreadModel()->getFetchOptionsToPrepareApiData();
-            $threads = $this->_getThreadModel()->getThreadsByIds($threadIds, $fetchOptions);
-            $threads = $this->_prepareThreads($threads);
-        }
-
-        foreach ($threadWatches as $threadWatch) {
-            foreach ($threads as &$threadData) {
-                if ($threadWatch['thread_id'] == $threadData['thread_id']) {
-                    $threadData = $threadWatchModel->prepareApiDataForThreadWatches($threadData, $threadWatch);
-                    $threadsData[] = $threadData;
-                }
-            }
-        }
-
-        $data = array(
-            'threads' => $this->_filterDataMany($threadsData),
-            'threads_total' => $total,
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'threads/followed',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_Thread_Followed', $data);
-    }
-
-    public function actionGetFollowers()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        list($thread, $forum) = $this->_getForumThreadPostHelper()->assertThreadValidAndViewable($threadId);
-
-        $users = array();
-
-        if ($this->_getThreadModel()->canWatchThread($thread, $forum)) {
-            $visitor = XenForo_Visitor::getInstance();
-
-            /* @var $threadWatchModel bdApi_Extend_Model_ThreadWatch */
-            $threadWatchModel = $this->getModelFromCache('XenForo_Model_ThreadWatch');
-            $threadWatch = $threadWatchModel->getUserThreadWatchByThreadId($visitor['user_id'], $thread['thread_id']);
-
-            if (!empty($threadWatch)) {
-                $user = array(
-                    'user_id' => $visitor['user_id'],
-                    'username' => $visitor['username'],
-                );
-
-                $user = $threadWatchModel->prepareApiDataForThreadWatches($user, $threadWatch);
-
-                $users[] = $user;
-            }
-        }
-
-        $data = array('users' => $this->_filterDataMany($users));
-
-        return $this->responseData('bdApi_ViewApi_Thread_Followers', $data);
-    }
-
-    public function actionPostFollowers()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-        $email = $this->_input->filterSingle('email', XenForo_Input::UINT);
-
-        list($thread, $forum) = $this->_getForumThreadPostHelper()->assertThreadValidAndViewable($threadId);
-
-        if (!$this->_getThreadModel()->canWatchThread($thread, $forum)) {
-            return $this->responseNoPermission();
-        }
-
-        $state = ($email > 0 ? 'watch_email' : 'watch_no_email');
-        $this->_getThreadWatchModel()->setThreadWatchState(XenForo_Visitor::getUserId(), $thread['thread_id'], $state);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteFollowers()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-
-        $this->_getThreadWatchModel()->setThreadWatchState(XenForo_Visitor::getUserId(), $threadId, '');
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionPostPollVotes()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-
-        /** @var XenForo_ControllerHelper_ForumThreadPost $ftpHelper */
-        $ftpHelper = $this->getHelper('ForumThreadPost');
-        list($thread, $forum) = $ftpHelper->assertThreadValidAndViewable($threadId);
-
-        $pollModel = $this->_getPollModel();
-        $poll = $pollModel->getPollByContent('thread', $threadId);
-        if (empty($poll)
-            || !$this->_getThreadModel()->canVoteOnPoll($poll, $thread, $forum)
-        ) {
-            return $this->responseNoPermission();
-        }
-
-        return $pollModel->bdApi_actionPostVotes($poll, $this);
-    }
-
-    public function actionGetPollResults()
-    {
-        $threadId = $this->_input->filterSingle('thread_id', XenForo_Input::UINT);
-
-        /** @var XenForo_ControllerHelper_ForumThreadPost $ftpHelper */
-        $ftpHelper = $this->getHelper('ForumThreadPost');
-        list($thread, $forum) = $ftpHelper->assertThreadValidAndViewable($threadId);
-
-        $pollModel = $this->_getPollModel();
-        $poll = $pollModel->getPollByContent('thread', $threadId);
-        if (empty($poll)) {
-            return $this->responseError(new XenForo_Phrase('requested_page_not_found'), 404);
-        }
-
-        return $pollModel->bdApi_actionGetResults(
-            $poll,
-            $this->_getThreadModel()->canVoteOnPoll($poll, $thread, $forum),
-            $this
-        );
-    }
-
-    public function actionGetNew()
-    {
-        $forumId = $this->_input->filterSingle('forum_id', XenForo_Input::UINT);
-
-        $this->_assertRegistrationRequired();
-
-        $visitor = XenForo_Visitor::getInstance();
-        $threadModel = $this->_getThreadModel();
-
-        $maxResults = XenForo_Application::getOptions()->get('maximumSearchResults');
-        list($limit,) = $this->filterLimitAndPage();
-        if ($limit > 0) {
-            $maxResults = min($maxResults, $limit);
-        }
-
-        if (empty($forumId)) {
-            $threadIds = $threadModel->getUnreadThreadIds($visitor->get('user_id'), array('limit' => $maxResults));
-        } else {
-            $forum = $this->_getForumThreadPostHelper()->assertForumValidAndViewable($forumId);
-            $childNodeIds = array_keys($this->_getNodeModel()->getChildNodesForNodeIds(array($forum['node_id'])));
-
-            $threadIds = $threadModel->bdApi_getUnreadThreadIdsInForum(
-                $visitor->get('user_id'),
-                array_merge(array($forum['node_id']), $childNodeIds),
-                array('limit' => $maxResults)
-            );
-        }
-
-        return $this->_getNewOrRecentResponse('threads_new', $threadIds);
-    }
-
-    public function actionGetRecent()
-    {
-        $threadModel = $this->_getThreadModel();
-
-        $days = $this->_input->filterSingle('days', XenForo_Input::UINT);
-        if ($days < 1) {
-            $days = max(7, XenForo_Application::get('options')->readMarkingDataLifetime);
-        }
-
-        $maxResults = XenForo_Application::getOptions()->get('maximumSearchResults');
-        list($limit,) = $this->filterLimitAndPage();
-        if ($limit > 0) {
-            $maxResults = min($maxResults, $limit);
-        }
-
-        $conditions = array(
-            'last_post_date' => array(
-                '>',
-                XenForo_Application::$time - 86400 * $days
-            ),
-            'deleted' => false,
-            'moderated' => false,
-            'find_new' => true,
-        );
-
-        $fetchOptions = array(
-            'limit' => $maxResults,
-            'order' => 'last_post_date',
-            'orderDirection' => 'desc',
-            'join' => XenForo_Model_Thread::FETCH_FORUM_OPTIONS,
-        );
-
-        $forumId = $this->_input->filterSingle('forum_id', XenForo_Input::UINT);
-        if (!empty($forumId)) {
-            $forum = $this->_getForumThreadPostHelper()->assertForumValidAndViewable($forumId);
-            $childNodeIds = array_keys($this->_getNodeModel()->getChildNodesForNodeIds(array($forum['node_id'])));
-            $conditions['node_id'] = array_merge(array($forum['node_id']), $childNodeIds);
-        }
-
-        $threadIds = array_keys($threadModel->getThreads($conditions, $fetchOptions));
-
-        return $this->_getNewOrRecentResponse('threads_recent', $threadIds);
-    }
-
-    protected function _prepareThreads(array $threads, array $forum = null)
-    {
-        // check for $forum being null because we only prepare `thread`.`forum` for request
-        // of multiple threads from different forums (likely from actionMultiple)
-        $prepareThreadForum = (!$this->_isFieldExcluded('forum') && $forum === null);
-
-        $forums = array();
-        if (!empty($forum)) {
-            $forums[$forum['node_id']] = $forum;
-        }
-
-        $forumIds = array();
-        foreach ($threads as $threadRef) {
-            if (!isset($forums[$threadRef['node_id']])) {
-                $forumIds[] = $threadRef['node_id'];
-            }
-        }
-        if (!empty($forumIds)) {
-            $forumIds = array_map('intval', $forumIds);
-            $forumIds = array_unique($forumIds);
-            $forums += $this->_getForumModel()->getForumsByIds(
-                $forumIds,
-                $this->_getForumModel()->getFetchOptionsToPrepareApiData()
-            );
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-        $nodePermissions = $this->_getNodeModel()->getNodePermissionsForPermissionCombination();
-        foreach ($nodePermissions as $nodeId => $permissions) {
-            $visitor->setNodePermissions($nodeId, $permissions);
-        }
-
-        $firstPostIds = array();
-        $lastPostIds = array();
-        $latestPostIds = array();
-        $pollThreadIds = array();
-        foreach ($threads as $threadId => $threadRef) {
-            if (!$this->_isFieldExcluded('first_post')) {
-                $firstPostIds[$threadId] = $threadRef['first_post_id'];
-            }
-
-            if ($this->_isFieldIncluded('last_post')
-                && (!isset($firstPostIds[$threadId])
-                    || $threadRef['last_post_id'] != $threadRef['first_post_id'])
-            ) {
-                $lastPostIds[$threadId] = $threadRef['last_post_id'];
-            }
-
-            if (!$this->_isFieldExcluded('poll')
-                && $threadRef['discussion_type'] === 'poll'
-            ) {
-                $pollThreadIds[] = $threadId;
-            }
-        }
-
-        if ($this->_isFieldIncluded('latest_posts')) {
-            $latestPostIds = $this->_getThreadModel()->bdApi_getLatestPostIds(array_keys($threads));
-        }
-
-        $posts = array();
-        if (!empty($firstPostIds)
-            || !empty($lastPostIds)
-            || !empty($latestPostIds)
-        ) {
-            $posts = $this->_getPostModel()->getPostsByIds(
-                array_merge(array_values($firstPostIds), array_values($lastPostIds), $latestPostIds),
-                $this->_getPostModel()->getFetchOptionsToPrepareApiData()
-            );
-
-            if ((!empty($firstPostIds) && !$this->_isFieldExcluded('first_post.attachments'))
-                || (!empty($lastPostIds) && !$this->_isFieldExcluded('last_post.attachments'))
-                || (!empty($latestPostIds) && !$this->_isFieldExcluded('latest_posts.*.attachments'))
-            ) {
-                $posts = $this->_getPostModel()->getAndMergeAttachmentsIntoPosts($posts);
-            }
-        }
-
-        if (!empty($pollThreadIds)) {
-            $polls = $this->_getPollModel()->bdApi_getPollByContentIds('thread', $pollThreadIds);
-            $this->_getThreadModel()->bdApi_setPolls($polls);
-        }
-
-        $threadsData = array();
-        foreach ($threads as &$threadRef) {
-            if (!isset($forums[$threadRef['node_id']])) {
-                continue;
-            }
-            $forumRef =& $forums[$threadRef['node_id']];
-
-            $firstPost = array();
-            if (!empty($firstPostIds)
-                && isset($posts[$threadRef['first_post_id']])
-            ) {
-                $firstPost = $posts[$threadRef['first_post_id']];
-            }
-
-            if (!$this->_getThreadModel()->canViewThreadAndContainer($threadRef, $forumRef)) {
-                continue;
-            }
-
-            $threadData = $this->_getThreadModel()->prepareApiDataForThread($threadRef, $forumRef, $firstPost);
-
-            if ($prepareThreadForum) {
-                $threadData['forum'] = $this->_getForumModel()->prepareApiDataForForum($forumRef);
-            }
-
-            if (!empty($latestPostIds)) {
-                $threadData['latest_posts'] = array();
-                foreach ($posts as $post) {
-                    if ($post['thread_id'] != $threadRef['thread_id']) {
-                        continue;
-                    }
-
-                    if (!empty($firstPost)
-                        && $post['post_id'] == $firstPost['post_id']
-                    ) {
-                        continue;
-                    }
-
-                    $threadData['latest_posts'][] = $this->_getPostModel()
-                        ->prepareApiDataForPost($post, $threadRef, $forumRef);
-                }
-            } elseif (!empty($lastPostIds)
-                && isset($posts[$threadRef['last_post_id']])
-            ) {
-                $threadData['last_post'] = $this->_getPostModel()->prepareApiDataForPost(
-                    $posts[$threadRef['last_post_id']],
-                    $threadRef,
-                    $forumRef
-                );
-            }
-
-            $threadsData[] = $threadData;
-        }
-
-        return $threadsData;
-    }
-
-    protected function _getNewOrRecentResponse($searchType, array $threadIds)
-    {
-        $visitor = XenForo_Visitor::getInstance();
-        $threadModel = $this->_getThreadModel();
-
-        $results = array();
-        $threads = $threadModel->getThreadsByIds($threadIds, array(
-            'join' => XenForo_Model_Thread::FETCH_FORUM | XenForo_Model_Thread::FETCH_USER,
-            'permissionCombinationId' => $visitor['permission_combination_id'],
-        ));
-        foreach ($threadIds AS $threadId) {
-            if (!isset($threads[$threadId])) {
-                continue;
-            }
-            $threadRef = &$threads[$threadId];
-
-            $threadRef['permissions'] = XenForo_Permission::unserializePermissions($threadRef['node_permission_cache']);
-
-            if ($threadModel->canViewThreadAndContainer($threadRef, $threadRef, $null, $threadRef['permissions'])
-                && !$visitor->isIgnoring($threadRef['user_id'])
-            ) {
-                $results[] = array('thread_id' => $threadId);
-            }
-        }
-
-        $data = array('threads' => $results);
-
-        list($dataLimit,) = $this->filterLimitAndPage($tempArray, 'data_limit');
-        if ($dataLimit > 0) {
-            $searchResults = array();
-            foreach ($results as $result) {
-                $searchResults[] = array(
-                    XenForo_Model_Search::CONTENT_TYPE => 'thread',
-                    XenForo_Model_Search::CONTENT_ID => $result['thread_id']
-                );
-            }
-
-            /** @var bdApi_Extend_Model_Search $searchModel */
-            $searchModel = $this->getModelFromCache('XenForo_Model_Search');
-            $search = $searchModel->insertSearch($searchResults, $searchType, '', array(), 'date', false);
-
-            $dataResults = array_slice($searchResults, 0, $dataLimit);
-            $dataResults = $searchModel->prepareApiDataForSearchResults($dataResults);
-            $data['data'] = $searchModel->prepareApiContentDataForSearch($dataResults);
-
-            bdApi_Data_Helper_Core::addPageLinks(
-                $this->getInput(),
-                $data,
-                $dataLimit,
-                $search['result_count'],
-                1,
-                'search/results',
-                $search,
-                array('limit' => $dataLimit)
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_Thread_NewOrRecent', $data);
-    }
-
-    /**
-     * @return XenForo_Model_Node
-     */
-    protected function _getNodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Node');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Forum
-     */
-    protected function _getForumModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Forum');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Thread
-     */
-    protected function _getThreadModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Thread');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Post
-     */
-    protected function _getPostModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Post');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Poll
-     */
-    protected function _getPollModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Poll');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_Tag
-     */
-    protected function _getTagModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Tag');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_ThreadPrefix
-     */
-    protected function _getThreadPrefixModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_ThreadWatch
-     */
-    protected function _getThreadWatchModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_ThreadWatch');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_User
-     */
-    protected function _getUserModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_User');
-    }
-
-    /**
-     * @return XenForo_Model_UserProfile
-     */
-    protected function _getUserProfileModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_UserProfile');
-    }
-
-    /**
-     * @return XenForo_ControllerHelper_ForumThreadPost
-     */
-    protected function _getForumThreadPostHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('ForumThreadPost');
-    }
-
-    /**
-     * @return bdApi_ControllerHelper_Attachment
-     */
-    protected function _getAttachmentHelper()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getHelper('bdApi_ControllerHelper_Attachment');
-    }
-
-    public function _isFieldExcluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        if ($field === 'thread_id') {
-            return false;
-        }
-
-        return parent::_isFieldExcluded($field, $prefixes);
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        switch ($action) {
-            case 'GetIndex':
-                $forumId = $this->_request->getParam('forum_id');
-                if (!empty($forumId)
-                    && is_numeric($forumId)
-                ) {
-                    $params['node_id'] = $forumId;
-                }
-                $controllerName = 'XenForo_ControllerPublic_Forum';
-                break;
-            case 'Single':
-                $controllerName = 'XenForo_ControllerPublic_Thread';
-                break;
-            case 'GetNew':
-            case 'GetRecent':
-                $controllerName = 'XenForo_ControllerPublic_FindNew';
-                break;
-            default:
-                parent::_prepareSessionActivityForApi($controllerName, $action, $params);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/Tool.php b/xenforo/library/bdApi/ControllerApi/Tool.php
deleted file mode 100755
index f6107909..00000000
--- a/xenforo/library/bdApi/ControllerApi/Tool.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_Tool extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetLogin()
-    {
-        $redirectUri = $this->_input->filterSingle('redirect_uri', XenForo_Input::STRING);
-        if (empty($redirectUri)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_tools_login_requires_redirect_uri'), 400);
-        }
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        if (empty($clientId)) {
-            $this->_response->setHeader('X-Api-Login-Error', 'client_id');
-            return $this->responseNoPermission();
-        }
-
-        if (!$session->isValidRedirectUri($redirectUri)) {
-            $this->_response->setHeader('X-Api-Login-Error', 'redirect_uri');
-            return $this->responseNoPermission();
-        }
-
-        $userId = XenForo_Visitor::getUserId();
-        if (empty($userId)) {
-            $this->_response->setHeader('X-Api-Login-Error', 'oauth_token');
-            return $this->responseNoPermission();
-        }
-
-        $loginLinkData = array(
-            'redirect' => $redirectUri,
-            'timestamp' => XenForo_Application::$time + 10,
-        );
-        $loginLinkData['user_id'] = bdApi_Crypt::encryptTypeOne($userId, $loginLinkData['timestamp']);
-
-        $loginLink = XenForo_Link::buildPublicLink('login/api', '', $loginLinkData);
-
-        return $this->responseRedirect(XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT, $loginLink);
-    }
-
-    public function actionPostLoginSocial()
-    {
-        $social = array();
-
-        $options = XenForo_Application::getOptions();
-
-        if ($options->get('facebookAppId')) {
-            $social[] = 'facebook';
-        }
-
-        if ($options->get('twitterAppKey')) {
-            $social[] = 'twitter';
-        }
-
-        if ($options->get('googleClientId')) {
-            $social[] = 'google';
-        }
-
-        return $this->responseData('bdApi_ViewApi_Tool_LoginSocial', array('social' => $social));
-    }
-
-    public function actionGetLogout()
-    {
-        $redirectUri = $this->_input->filterSingle('redirect_uri', XenForo_Input::STRING);
-        if (empty($redirectUri)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_slash_tools_login_requires_redirect_uri'), 400);
-        }
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        if (empty($clientId)) {
-            $this->_response->setHeader('X-Api-Logout-Error', 'client_id');
-            return $this->responseNoPermission();
-        }
-
-        if (!$session->isValidRedirectUri($redirectUri)) {
-            $this->_response->setHeader('X-Api-Logout-Error', 'redirect_uri');
-            return $this->responseNoPermission();
-        }
-
-        $logoutLinkData = array(
-            'redirect' => $redirectUri,
-            '_xfToken' => XenForo_Visitor::getInstance()->get('csrf_token_page'),
-            'timestamp' => XenForo_Application::$time + 10,
-        );
-        $logoutLinkData['md5'] = bdApi_Crypt::encryptTypeOne(
-            md5($logoutLinkData['redirect']),
-            $logoutLinkData['timestamp']
-        );
-
-        $logoutLink = XenForo_Link::buildPublicLink('logout', '', $logoutLinkData);
-
-        return $this->responseRedirect(XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT, $logoutLink);
-    }
-
-    public function actionPostOtt()
-    {
-        if (!XenForo_Application::debugMode()) {
-            return $this->responseNoPermission();
-        }
-
-        $userId = 0;
-
-        $ttl = $this->_input->filterSingle('ttl', XenForo_Input::UINT);
-        if (empty($ttl)) {
-            return $this->responseNoPermission();
-        }
-        $timestamp = XenForo_Application::$time + $ttl;
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        if (!$session) {
-            return $this->responseNoPermission();
-        }
-        $clientId = $session->getOAuthClientId();
-        $clientSecret = $session->getOAuthClientSecret();
-        if (empty($clientId) || empty($clientSecret)) {
-            return $this->responseNoPermission();
-        }
-
-        $once = md5($userId . $timestamp . $clientSecret);
-        $ott = sprintf('%d,%d,%s,%s', $userId, $timestamp, $once, $clientId);
-        $data = array('ott' => $ott);
-
-        return $this->responseData('bdApi_ViewApi_Tool_Ott', $data);
-    }
-
-    public function actionPostPasswordTest()
-    {
-        $input = $this->_input->filter(array(
-            'password' => XenForo_Input::STRING,
-            'password_algo' => XenForo_Input::STRING,
-            'decrypt' => XenForo_Input::UINT,
-        ));
-
-        if (!XenForo_Application::debugMode()) {
-            return $this->responseNoPermission();
-        }
-
-        if (empty($input['decrypt'])) {
-            $result = bdApi_Crypt::encrypt($input['password'], $input['password_algo']);
-        } else {
-            $result = bdApi_Crypt::decrypt($input['password'], $input['password_algo']);
-        }
-
-        $data = array('result' => $result);
-
-        return $this->responseData('bdApi_ViewApi_Tool_PasswordTest', $data);
-    }
-
-    public function actionPostPasswordResetRequest()
-    {
-        $this->_assertRegistrationRequired();
-
-        $user = XenForo_Visitor::getInstance()->toArray();
-
-        /* @var $userConfirmationModel XenForo_Model_UserConfirmation */
-        $userConfirmationModel = $this->getModelFromCache('XenForo_Model_UserConfirmation');
-        $userConfirmationModel->sendPasswordResetRequest($user);
-
-        return $this->responseMessage(new XenForo_Phrase('password_reset_request_has_been_emailed_to_you'));
-    }
-
-    public function actionPostLink()
-    {
-        $type = $this->_input->filterSingle('type', XenForo_Input::STRING, array('default' => 'public'));
-        $route = $this->_input->filterSingle('route', XenForo_Input::STRING, array('default' => 'index'));
-
-        switch ($type) {
-            case 'admin':
-                $link = XenForo_Link::buildAdminLink($route);
-                break;
-            case 'public':
-            default:
-                $link = XenForo_Link::buildPublicLink($route);
-                break;
-        }
-
-        $data = array(
-            'type' => $type,
-            'route' => $route,
-            'link' => $link,
-        );
-
-        return $this->responseData('bdApi_ViewApi_Tool_Link', $data);
-    }
-
-    public function actionPostPing()
-    {
-        $this->_assertAdminPermission('bdApi');
-
-        $visitor = XenForo_Visitor::getInstance();
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        $message = $this->_input->filterSingle('message', XenForo_Input::STRING);
-
-        XenForo_Model_Alert::alert(
-            $userId,
-            $visitor['user_id'],
-            $visitor['username'],
-            'api_ping',
-            0,
-            'message',
-            array(
-                'message' => $message,
-            )
-        );
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetParseLink()
-    {
-        $link = $this->_input->filterSingle('link', XenForo_Input::STRING);
-        $link = XenForo_Link::convertUriToAbsoluteUri($link, true);
-
-        // http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers
-        if (strlen($link) > 2000
-            || !Zend_Uri::check($link)
-        ) {
-            // invalid link, do not continue
-            return $this->_actionGetParseLink_getControllerResponseNop($link, false);
-        }
-
-        $fc = XenForo_Application::get('_bdApi_fc');
-
-        /** @noinspection PhpUndefinedClassInspection */
-        /** @var bdApi_Dependencies $dependencies */
-        $dependencies = $fc->getDependencies();
-
-        $request = new bdApi_Zend_Controller_Request_Http($link);
-        $request->setBaseUrl(parse_url(XenForo_Application::getOptions()->get('boardUrl'), PHP_URL_PATH));
-
-        $routeMatch = $dependencies->routePublic($request);
-        if (!$routeMatch OR !$routeMatch->getControllerName()) {
-            // link cannot be route
-            return $this->_actionGetParseLink_getControllerResponseNop($link, false);
-        }
-
-        $controllerResponse = $this->_actionGetParseLink_getControllerResponse($link, $request, $routeMatch);
-        if (!empty($controllerResponse)) {
-            return $controllerResponse;
-        }
-
-        // controller / action not recognized...
-        return $this->_actionGetParseLink_getControllerResponseNop($link, true);
-    }
-
-    protected function _actionGetParseLink_getControllerResponseNop($link, $routed)
-    {
-        return $this->responseData('bdApi_ViewApi_Tool_ParseLink', array(
-            'link' => $link,
-            'routed' => $routed,
-        ));
-    }
-
-    protected function _actionGetParseLink_getControllerResponse(
-        $link,
-        Zend_Controller_Request_Http $request,
-        XenForo_RouteMatch $routeMatch
-    ) {
-        switch ($routeMatch->getControllerName()) {
-            case 'XenForo_ControllerPublic_Forum':
-                $nodeId = $request->getParam('node_id');
-
-                if (empty($nodeId)) {
-                    $nodeName = $request->getParam('node_name');
-                    if (!empty($nodeName)) {
-                        /* @var $nodeModel XenForo_Model_Node */
-                        $nodeModel = $this->getModelFromCache('XenForo_Model_Node');
-                        $node = $nodeModel->getNodeByName($nodeName, 'Forum');
-                        if (!empty($node)) {
-                            $nodeId = $node['node_id'];
-                        }
-                    }
-                }
-
-                if (!empty($nodeId)) {
-                    $this->_request->setParam('forum_id', $nodeId);
-                }
-
-                return $this->responseReroute('bdApi_ControllerApi_Thread', 'get-index');
-            case 'XenForo_ControllerPublic_Thread':
-                $threadId = $request->getParam('thread_id');
-
-                if (!empty($threadId)) {
-                    $this->_request->setParam('thread_id', $threadId);
-
-                    $linkFragment = parse_url($link, PHP_URL_FRAGMENT);
-                    if (!empty($linkFragment) AND preg_match('#^post-(?<post_id>\d+)$#', $linkFragment, $fragment)) {
-                        $this->_request->setParam('page_of_post_id', $fragment['post_id']);
-                    }
-
-                    return $this->responseReroute('bdApi_ControllerApi_Post', 'get-index');
-                }
-                break;
-            case 'XenForo_ControllerPublic_Post':
-                $postId = $request->getParam('post_id');
-
-                if (!empty($postId)) {
-                    $this->_request->setParam('page_of_post_id', $postId);
-                    return $this->responseReroute('bdApi_ControllerApi_Post', 'get-index');
-                }
-                break;
-        }
-
-        return null;
-    }
-
-    protected function _preDispatchFirst($action)
-    {
-        switch ($action) {
-            case 'GetLogin':
-            case 'GetLogout':
-                $this->_redirectInsteadOfReroute = true;
-                break;
-        }
-
-        parent::_preDispatchFirst($action);
-    }
-
-    protected $_redirectInsteadOfReroute = false;
-
-    public function responseReroute($controllerName, $action, array $containerParams = array())
-    {
-        if ($this->_redirectInsteadOfReroute) {
-            // this "hack" is required because other pre dispatch jobs may throw reroute response around
-            // and we want to redirect them all, not just from our actions
-            $redirectUri = $this->_input->filterSingle('redirect_uri', XenForo_Input::STRING);
-            if (!empty($redirectUri)) {
-                if ($controllerName === 'XenForo_ControllerPublic_Error') {
-                    $this->_response->setHeader('X-Api-Error', $action);
-                }
-
-                return $this->responseRedirect(
-                    XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT,
-                    $redirectUri
-                );
-            }
-        }
-
-        return parent::responseReroute($controllerName, $action, $containerParams);
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        return false;
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-    }
-
-    protected function _assertBoardActive($action)
-    {
-    }
-
-    /**
-     * @return XenForo_Model_Alert
-     */
-    protected function _getAlertModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_Alert');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerApi/User.php b/xenforo/library/bdApi/ControllerApi/User.php
deleted file mode 100755
index f86ffced..00000000
--- a/xenforo/library/bdApi/ControllerApi/User.php
+++ /dev/null
@@ -1,960 +0,0 @@
-<?php
-
-class bdApi_ControllerApi_User extends bdApi_ControllerApi_Abstract
-{
-    public function actionGetIndex()
-    {
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        if (!empty($userId)) {
-            return $this->responseReroute(__CLASS__, 'single');
-        }
-
-        $userIds = $this->_input->filterSingle('user_ids', XenForo_Input::STRING);
-        if (!empty($userIds)) {
-            return $this->responseReroute(__CLASS__, 'multiple');
-        }
-
-        $pageNavParams = array();
-        list($limit, $page) = $this->filterLimitAndPage($pageNavParams);
-
-        $userModel = $this->_getUserModel();
-        if (!$userModel->canViewMemberList()) {
-            if ($limit === 1) {
-                // special case to support subscription discovery of topic user_0
-                return $this->responseData('bdApi_ViewApi_User_List', array('users' => array()));
-            }
-
-            return $this->responseNoPermission();
-        }
-
-        $conditions = array(
-            'user_state' => 'valid',
-            'is_banned' => 0
-        );
-        $fetchOptions = array(
-            'limit' => $limit,
-            'page' => $page,
-            'order' => bdApi_Extend_Model_User::ORDER_USER_ID,
-        );
-
-        // manually prepare users total count for paging
-        $total = $userModel->bdApi_getLatestUserId();
-
-        $userIdEnd = max(1, $fetchOptions['page']) * $fetchOptions['limit'];
-        $userIdStart = $userIdEnd - $fetchOptions['limit'] + 1;
-        $conditions[bdApi_Extend_Model_User::CONDITIONS_USER_ID] =
-            array('>=<', $userIdStart, $userIdEnd);
-
-        // paging was done by conditions (see above), remove it from fetch options
-        $fetchOptions['page'] = 0;
-
-        $users = $userModel->getUsers($conditions, $userModel->getFetchOptionsToPrepareApiData($fetchOptions));
-        $usersData = $this->_prepareUsers($users);
-
-        $data = array(
-            'users' => $this->_filterDataMany($usersData),
-            'users_total' => $total,
-        );
-
-        bdApi_Data_Helper_Core::addPageLinks(
-            $this->getInput(),
-            $data,
-            $limit,
-            $total,
-            $page,
-            'users',
-            array(),
-            $pageNavParams
-        );
-
-        return $this->responseData('bdApi_ViewApi_User_List', $data);
-    }
-
-    public function actionSingle()
-    {
-        $user = $this->_getUserOrError();
-
-        $users = array($user['user_id'] => $user);
-        $usersData = $this->_prepareUsers($users);
-
-        $userData = reset($usersData);
-        if (empty($userData)) {
-            return $this->responseNoPermission();
-        }
-
-        $data = array('user' => $this->_filterDataSingle($userData));
-
-        return $this->responseData('bdApi_ViewApi_User_Single', $data);
-    }
-
-    public function actionMultiple()
-    {
-        $userIdsInput = $this->_input->filterSingle('user_ids', XenForo_Input::STRING);
-        $userIds = array_map('intval', explode(',', $userIdsInput));
-        if (empty($userIds)) {
-            return $this->responseNoPermission();
-        }
-
-        $users = $this->_getUserModel()->getUsersByIds(
-            $userIds,
-            $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-        );
-
-        $usersOrdered = array();
-        foreach ($userIds as $userId) {
-            if (isset($users[$userId])) {
-                $usersOrdered[$userId] = $users[$userId];
-            }
-        }
-
-        $usersData = $this->_prepareUsers($usersOrdered);
-
-        $data = array(
-            'users' => $this->_filterDataMany($usersData),
-        );
-
-        return $this->responseData('bdApi_ViewApi_User_List', $data);
-    }
-
-    public function actionGetFind()
-    {
-        $users = array();
-        $username = $this->_input->filterSingle('username', XenForo_Input::STRING);
-        $email = $this->_input->filterSingle('user_email', XenForo_Input::STRING);
-        if (empty($email)) {
-            // backward compatibility
-            $email = $this->_input->filterSingle('email', XenForo_Input::STRING);
-        }
-
-        if (XenForo_Helper_Email::isEmailValid($email)) {
-            $visitor = XenForo_Visitor::getInstance();
-            $session = bdApi_Data_Helper_Core::safeGetSession();
-            if ($visitor->hasAdminPermission('user')
-                && $session->checkScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM)
-            ) {
-                // perform email search only if visitor is an admin and granted admincp scope
-                $user = $this->_getUserModel()->getUserByEmail(
-                    $email,
-                    $this->_getUserModel()->getFetchOptionsToPrepareApiData()
-                );
-                if (!empty($user)) {
-                    $users[$user['user_id']] = $user;
-                }
-            }
-        }
-
-        if (empty($users) && utf8_strlen($username) >= 2) {
-            // perform username search only if nothing found and username is long enough
-            $users = $this->_getUserModel()->getUsers(
-                array('username' => array($username, 'r')),
-                $this->_getUserModel()->getFetchOptionsToPrepareApiData(
-                    array(
-                        'limit' => 10,
-                    )
-                )
-            );
-        }
-
-        $data = array(
-            'users' => $this->_filterDataMany($this->_getUserModel()->prepareApiDataForUsers($users)),
-        );
-
-        return $this->responseData('bdApi_ViewData_User_Find', $data);
-    }
-
-    public function actionPostIndex()
-    {
-        if (!XenForo_Application::get('options')->get('registrationSetup', 'enabled')) {
-            return $this->responseError(new XenForo_Phrase('new_registrations_currently_not_being_accepted'));
-        }
-
-        $input = $this->_input->filter(array(
-            'user_email' => XenForo_Input::STRING,
-            'username' => XenForo_Input::STRING,
-            'password' => XenForo_Input::STRING,
-            'password_algo' => XenForo_Input::STRING,
-            'user_dob_day' => XenForo_Input::UINT,
-            'user_dob_month' => XenForo_Input::UINT,
-            'user_dob_year' => XenForo_Input::UINT,
-        ));
-
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-        /* @var $userConfirmationModel XenForo_Model_UserConfirmation */
-        $userConfirmationModel = $this->getModelFromCache('XenForo_Model_UserConfirmation');
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-
-        $clientId = $session->getOAuthClientId();
-        $clientSecret = $session->getOAuthClientSecret();
-        if (empty($clientId) OR empty($clientSecret)) {
-            $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-            $client = $oauth2Model->getClientModel()->getClientById($clientId);
-            if (empty($client)) {
-                return $this->responseError(new XenForo_Phrase('bdapi_post_slash_users_requires_client_id'), 400);
-            }
-            $clientSecret = $client['client_secret'];
-        }
-
-        if (empty($input['user_email'])) {
-            // backward compatibility
-            $input['user_email'] = $this->_input->filterSingle('email', XenForo_Input::STRING);
-        }
-
-        $extraInput = $this->_input->filter(array(
-            'extra_data' => XenForo_Input::STRING,
-            'extra_timestamp' => XenForo_Input::UINT,
-        ));
-        if (!empty($extraInput['extra_data'])) {
-            $extraData = bdApi_Crypt::decryptTypeOne($extraInput['extra_data'], $extraInput['extra_timestamp']);
-            if (!empty($extraData)) {
-                $extraData = @unserialize($extraData);
-            }
-            if (empty($extraData)) {
-                $extraData = array();
-            }
-        }
-
-        $userModel = $this->_getUserModel();
-        $options = XenForo_Application::getOptions();
-        $session = XenForo_Application::getSession();
-        $visitor = XenForo_Visitor::getInstance();
-
-        /* @var $writer XenForo_DataWriter_User */
-        $writer = XenForo_DataWriter::create('XenForo_DataWriter_User');
-        $registrationDefaults = $options->get('registrationDefaults');
-        if (!empty($registrationDefaults)) {
-            $writer->bulkSet($registrationDefaults, array('ignoreInvalidFields' => true));
-        }
-        $writer->set('email', $input['user_email']);
-        $writer->set('username', $input['username']);
-
-        $password = bdApi_Crypt::decrypt($input['password'], $input['password_algo'], $clientSecret);
-        if (!empty($password)) {
-            $writer->setPassword($password, $password);
-        } else {
-            // no password or unable to decrypt password
-            // create new user with no password auth scheme
-            $auth = XenForo_Authentication_Abstract::create('XenForo_Authentication_NoPassword');
-            $writer->set('scheme_class', $auth->getClassName());
-            $writer->set('data', $auth->generate(''), 'xf_user_authenticate');
-        }
-
-        if ($options->get('gravatarEnable') && XenForo_Model_Avatar::gravatarExists($input['user_email'])) {
-            $writer->set('gravatar', $input['user_email']);
-        }
-
-        $writer->set('dob_day', $input['user_dob_day']);
-        $writer->set('dob_month', $input['user_dob_month']);
-        $writer->set('dob_year', $input['user_dob_year']);
-
-        $writer->set('user_group_id', XenForo_Model_User::$defaultRegisteredGroupId);
-        $writer->set('language_id', XenForo_Visitor::getInstance()->get('language_id'));
-
-        $allowEmailConfirm = true;
-        if (!empty($extraData['user_email']) && $extraData['user_email'] == $writer->get('email')) {
-            // the email address has been validated by some other mean (external provider?)
-            // do not require email confirmation again to avoid complication
-            $allowEmailConfirm = false;
-        }
-        $writer->advanceRegistrationUserState($allowEmailConfirm);
-
-        if ($visitor->hasAdminPermission('user') AND $session->checkScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM)) {
-            $writer->set('user_state', 'valid');
-        }
-
-        $writer->save();
-
-        $user = $writer->getMergedData();
-
-        // log the ip of the user registering
-        XenForo_Model_Ip::log(
-            XenForo_Visitor::getUserId() ? XenForo_Visitor::getUserId() : $user['user_id'],
-            'user',
-            $user['user_id'],
-            'register'
-        );
-
-        if ($user['user_state'] == 'email_confirm') {
-            $userConfirmationModel->sendEmailConfirmation($user);
-        }
-
-        if (!empty($extraData['external_provider']) && !empty($extraData['external_provider_key'])) {
-            /* @var $userExternalModel XenForo_Model_UserExternal */
-            $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-            $userExternalModel->updateExternalAuthAssociation(
-                $extraData['external_provider'],
-                $extraData['external_provider_key'],
-                $user['user_id']
-            );
-        }
-
-        if (XenForo_Visitor::getUserId() == 0) {
-            XenForo_Visitor::setup($user['user_id']);
-        }
-
-        $scopes = $oauth2Model->getSystemSupportedScopes();
-        $scopes = bdApi_Template_Helper_Core::getInstance()->scopeJoin($scopes);
-        $token = $oauth2Model->getServer()->createAccessToken($clientId, $user['user_id'], $scopes);
-
-        $user = $userModel->getUserById($user['user_id'], $userModel->getFetchOptionsToPrepareApiData());
-        $data = array(
-            'user' => $this->_filterDataSingle($this->_getUserModel()->prepareApiDataForUser($user)),
-            '_user' => $user,
-            'token' => $token,
-        );
-
-        return $this->responseData('bdApi_ViewApi_User_Single', $data);
-    }
-
-    public function actionPutIndex()
-    {
-        $input = $this->_input->filter(array(
-            'password' => XenForo_Input::STRING,
-            'password_old' => XenForo_Input::STRING,
-            'password_algo' => XenForo_Input::STRING,
-            'user_email' => XenForo_Input::STRING,
-
-            'username' => XenForo_Input::STRING,
-            'user_title' => XenForo_Input::STRING,
-            'primary_group_id' => XenForo_Input::UINT,
-            'secondary_group_ids' => array(XenForo_Input::UINT, 'array' => true),
-
-            'user_dob_day' => XenForo_Input::UINT,
-            'user_dob_month' => XenForo_Input::UINT,
-            'user_dob_year' => XenForo_Input::UINT,
-
-            'fields' => XenForo_Input::ARRAY_SIMPLE,
-        ));
-
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        $isAdmin = $session->checkScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM) && $visitor->hasAdminPermission('user');
-
-        $requiredAuth = 0;
-        if (!empty($input['password'])) {
-            $requiredAuth++;
-        }
-        if (!empty($input['user_email'])) {
-            $requiredAuth++;
-        }
-        if ($requiredAuth > 0) {
-            $isAuth = false;
-            if ($isAdmin && $visitor['user_id'] != $user['user_id']) {
-                $isAuth = true;
-            } elseif (!empty($input['password_old'])) {
-                $auth = $this->_getUserModel()->getUserAuthenticationObjectByUserId($user['user_id']);
-                if (!empty($auth)) {
-                    $passwordOld = bdApi_Crypt::decrypt($input['password_old'], $input['password_algo']);
-                    if ($auth->hasPassword() && $auth->authenticate($user['user_id'], $passwordOld)) {
-                        $isAuth = true;
-                    }
-                }
-            }
-
-            if (!$isAuth) {
-                return $this->responseError(new XenForo_Phrase('bdapi_slash_users_requires_password_old'), 403);
-            }
-        }
-
-        /* @var $writer XenForo_DataWriter_User */
-        $writer = XenForo_DataWriter::create('XenForo_DataWriter_User');
-        $writer->setExistingData($user, true);
-        if ($isAdmin) {
-            $writer->setOption(XenForo_DataWriter_User::OPTION_ADMIN_EDIT, true);
-        }
-
-        if (!empty($input['password'])) {
-            $password = bdApi_Crypt::decrypt($input['password'], $input['password_algo']);
-            $writer->setPassword($password, $password);
-        }
-
-        if (!empty($input['user_email'])) {
-            $writer->set('email', $input['user_email']);
-
-            if ($writer->isChanged('email')
-                && XenForo_Application::getOptions()->get('registrationSetup', 'emailConfirmation')
-                && !$isAdmin
-            ) {
-                switch ($writer->get('user_state')) {
-                    case 'moderated':
-                    case 'email_confirm':
-                        $writer->set('user_state', 'email_confirm');
-                        break;
-
-                    default:
-                        $writer->set('user_state', 'email_confirm_edit');
-                }
-            }
-        }
-
-        if (!empty($input['username'])) {
-            $writer->set('username', $input['username']);
-
-            if ($writer->isChanged('username')
-                && !$isAdmin
-            ) {
-                return $this->responseError(new XenForo_Phrase('bdapi_slash_users_denied_username'), 403);
-            }
-        }
-
-        if ($this->_input->inRequest('user_title')) {
-            $tmpUser = $this->_getUserModel()->prepareApiDataForUser($user);
-            if ($input['user_title'] !== $tmpUser['user_title']) {
-                $writer->set('custom_title', $input['user_title']);
-
-                if ($writer->isChanged('custom_title')
-                    && !$isAdmin
-                ) {
-                    return $this->responseError(new XenForo_Phrase('bdapi_slash_users_denied_user_title'), 403);
-                }
-            }
-        }
-
-        if ($input['primary_group_id'] > 0) {
-            $userGroups = $this->_getUserGroupModel()->getAllUserGroups();
-            if (!isset($userGroups[$input['primary_group_id']])) {
-                return $this->responseError(new XenForo_Phrase('requested_user_group_not_found'));
-            }
-
-            if (!empty($input['secondary_group_ids'])) {
-                foreach ($input['secondary_group_ids'] as $secondaryGroupId) {
-                    if (!isset($userGroups[$secondaryGroupId])) {
-                        return $this->responseError(new XenForo_Phrase('requested_user_group_not_found'));
-                    }
-                }
-            }
-
-            $writer->set('user_group_id', $input['primary_group_id']);
-            $writer->setSecondaryGroups($input['secondary_group_ids']);
-        }
-
-        if (!empty($input['user_dob_day']) && !empty($input['user_dob_month']) && !empty($input['user_dob_year'])) {
-            $writer->set('dob_day', $input['user_dob_day']);
-            $writer->set('dob_month', $input['user_dob_month']);
-            $writer->set('dob_year', $input['user_dob_year']);
-
-            $hasExistingDob = false;
-            $hasExistingDob = $hasExistingDob || !!$writer->getExisting('dob_day');
-            $hasExistingDob = $hasExistingDob || !!$writer->getExisting('dob_month');
-            $hasExistingDob = $hasExistingDob || !!$writer->getExisting('dob_year');
-
-            if ($hasExistingDob
-                && (
-                    $writer->isChanged('dob_day')
-                    || $writer->isChanged('dob_month')
-                    || $writer->isChanged('dob_year')
-                )
-                && !$isAdmin
-            ) {
-                // setting new dob is fine but changing dob requires admin permission
-                return $this->responseError(new XenForo_Phrase('bdapi_slash_users_denied_dob'), 403);
-            }
-        }
-
-        if (!empty($input['fields'])) {
-            $profileFieldsInput = new XenForo_Input($input['fields']);
-            $profileFields = $profileFieldsInput->filter(array(
-                'about' => XenForo_Input::STRING,
-                'homepage' => XenForo_Input::STRING,
-                'location' => XenForo_Input::STRING,
-                'occupation' => XenForo_Input::STRING,
-            ));
-            $writer->bulkSet($profileFields);
-            $writer->setCustomFields($input['fields']);
-        }
-
-        $writer->preSave();
-
-        if (!$isAdmin) {
-            if ($writer->isChanged('user_group_id')
-                || $writer->isChanged('secondary_group_ids')
-            ) {
-                // this has to be checked here because `secondary_group_ids` only get set within preSave()
-                return $this->responseError(new XenForo_Phrase('bdapi_slash_users_denied_user_group'), 403);
-            }
-        }
-
-        $writer->save();
-
-        $user = $writer->getMergedData();
-        if ($writer->isChanged('email')
-            && in_array($user['user_state'], array('email_confirm', 'email_confirm_edit'))
-        ) {
-            /* @var $userConfirmationModel XenForo_Model_UserConfirmation */
-            $userConfirmationModel = $this->getModelFromCache('XenForo_Model_UserConfirmation');
-            $userConfirmationModel->sendEmailConfirmation($user);
-        }
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionPostPassword()
-    {
-        $link = bdApi_Data_Helper_Core::safeBuildApiLink(
-            'users',
-            array('user_id' => $this->_input->filterSingle('user_id', XenForo_Input::UINT))
-        );
-        $this->_setDeprecatedHeaders('PUT', $link);
-
-        return $this->responseReroute(__CLASS__, 'put-index');
-    }
-
-    public function actionPostAvatar()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if ($user['user_id'] != $visitor->get('user_id')) {
-            return $this->responseNoPermission();
-        }
-
-        if (!$visitor->canUploadAvatar()) {
-            return $this->responseNoPermission();
-        }
-
-        $avatar = XenForo_Upload::getUploadedFile('avatar');
-        if (empty($avatar)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_requires_upload_x', array('field' => 'avatar')), 400);
-        }
-
-        /* @var $avatarModel XenForo_Model_Avatar */
-        $avatarModel = $this->getModelFromCache('XenForo_Model_Avatar');
-        $avatarModel->uploadAvatar($avatar, $visitor->get('user_id'), $visitor->getPermissions());
-
-        return $this->responseMessage(new XenForo_Phrase('upload_completed_successfully'));
-    }
-
-    public function actionDeleteAvatar()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-        /* @var $avatarModel XenForo_Model_Avatar */
-        $avatarModel = $this->getModelFromCache('XenForo_Model_Avatar');
-
-        if ($user['user_id'] != $visitor->get('user_id')) {
-            return $this->responseNoPermission();
-        }
-
-        if (!$visitor->canUploadAvatar()) {
-            return $this->responseNoPermission();
-        }
-
-        $avatarModel->deleteAvatar($visitor->get('user_id'));
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetFollowers()
-    {
-        $user = $this->_getUserOrError();
-
-        if ($this->_input->inRequest('total')) {
-            $total = $this->_getUserModel()->countUsersFollowingUserId($user['user_id']);
-            $data = array('users_total' => $total);
-            return $this->responseData('bdApi_ViewApi_User_Followers_Total', $data);
-        }
-
-        $followers = $this->_getUserModel()->getUsersFollowingUserId($user['user_id'], 0, 'user.user_id');
-
-        $data = array('users' => array());
-
-        foreach ($followers as $follower) {
-            $data['users'][] = array(
-                'user_id' => $follower['user_id'],
-                'username' => $follower['username'],
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_User_Followers', $data);
-    }
-
-    public function actionPostFollowers()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (($user['user_id'] == $visitor->get('user_id')) OR !$visitor->canFollow()) {
-            return $this->responseNoPermission();
-        }
-
-        $this->_getUserModel()->follow($user);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteFollowers()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (($user['user_id'] == $visitor->get('user_id')) OR !$visitor->canFollow()) {
-            return $this->responseNoPermission();
-        }
-
-        $this->_getUserModel()->unfollow($user['user_id']);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetFollowings()
-    {
-        $user = $this->_getUserOrError();
-
-        if ($this->_input->inRequest('total')) {
-            $total = $this->_getUserModel()->bdApi_countUsersBeingFollowedByUserId($user['user_id']);
-            $data = array('users_total' => $total);
-            return $this->responseData('bdApi_ViewApi_User_Followings_Total', $data);
-        }
-
-        $followings = $this->_getUserModel()->getFollowedUserProfiles($user['user_id'], 0, 'user.user_id');
-
-        $data = array('users' => array());
-
-        foreach ($followings as $following) {
-            $data['users'][] = array(
-                'user_id' => $following['user_id'],
-                'username' => $following['username'],
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_User_Followings', $data);
-    }
-
-    public function actionGetIgnored()
-    {
-        $this->_assertRegistrationRequired();
-
-        if ($this->_input->inRequest('total')) {
-            $total = $this->_getIgnoreModel()->bdApi_countIgnoredUsers(XenForo_Visitor::getUserId());
-            $data = array('users_total' => $total);
-            return $this->responseData('bdApi_ViewApi_User_Ignored_Total', $data);
-        }
-
-        $ignoredUsers = $this->_getIgnoreModel()->getIgnoredUsers(XenForo_Visitor::getUserId());
-
-        $data = array('users' => array());
-
-        foreach ($ignoredUsers as $ignoredUser) {
-            $data['users'][] = array(
-                'user_id' => $ignoredUser['user_id'],
-                'username' => $ignoredUser['username'],
-            );
-        }
-
-        return $this->responseData('bdApi_ViewApi_User_Ignored', $data);
-    }
-
-    public function actionPostIgnore()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (!$this->_getIgnoreModel()->canIgnoreUser($visitor['user_id'], $user, $error)) {
-            return $this->responseError($error);
-        }
-
-        $this->_getIgnoreModel()->ignoreUsers($visitor['user_id'], $user['user_id']);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionDeleteIgnore()
-    {
-        $user = $this->_getUserOrError();
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (!$this->_getIgnoreModel()->canIgnoreUser($visitor['user_id'], $user, $error)) {
-            return $this->responseError($error);
-        }
-
-        $this->_getIgnoreModel()->unignoreUser($visitor['user_id'], $user['user_id']);
-
-        return $this->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function actionGetGroups()
-    {
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-        if (!empty($userId)) {
-            $user = $this->_getUserOrError();
-
-            if ($user['user_id'] != XenForo_Visitor::getUserId()) {
-                // viewing groups of other user requires admin permission
-                $this->_assertAdminPermission('user');
-            }
-
-            $user = $this->_getUserModel()->prepareApiDataForUser($user);
-            $userGroups = $user['user_groups'];
-        } else {
-            $this->_assertAdminPermission('user');
-
-            $userGroupModel = $this->_getUserGroupModel();
-            $userGroups = $userGroupModel->getAllUserGroups();
-            $userGroups = $userGroupModel->prepareApiDataForUserGroups($userGroups);
-        }
-
-        $data = array('user_groups' => $this->_filterDataMany($userGroups));
-
-        if (!empty($user)) {
-            $data['user_id'] = $user['user_id'];
-        }
-
-        return $this->responseData('bdApi_ViewApi_User_Groups', $data);
-    }
-
-    public function actionPostGroups()
-    {
-        $link = bdApi_Data_Helper_Core::safeBuildApiLink(
-            'users',
-            array('user_id' => $this->_input->filterSingle('user_id', XenForo_Input::UINT))
-        );
-        $this->_setDeprecatedHeaders('PUT', $link);
-
-        return $this->responseReroute('bdApi_ControllerApi_User', 'put-index');
-    }
-
-    public function actionGetTimeline()
-    {
-        $user = $this->_getUserOrError();
-
-        /** @var XenForo_Model_UserProfile $userProfileModel */
-        $userProfileModel = $this->getModelFromCache('XenForo_Model_UserProfile');
-        if (!$userProfileModel->canViewProfilePosts($user)) {
-            return $this->responseNoPermission();
-        }
-
-        $this->_request->setParam('user_id', $user['user_id']);
-        return $this->responseReroute('bdApi_ControllerApi_Search', 'user-timeline');
-    }
-
-    public function actionPostTimeline()
-    {
-        return $this->responseReroute('bdApi_ControllerApi_ProfilePost', 'post-index');
-    }
-
-    public function actionGetMe()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'single');
-    }
-
-    public function actionPutMe()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'put-index');
-    }
-
-    public function actionPostMeAvatar()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'post-avatar');
-    }
-
-    public function actionDeleteMeAvatar()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'delete-avatar');
-    }
-
-    public function actionGetMeFollowers()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'get-followers');
-    }
-
-    public function actionGetMeFollowings()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'get-followings');
-    }
-
-    public function actionPostMePassword()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'post-password');
-    }
-
-    public function actionGetMeGroups()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'get-groups');
-    }
-
-    public function actionPostMeGroups()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'post-groups');
-    }
-
-    public function actionGetMeTimeline()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'get-timeline');
-    }
-
-    public function actionPostMeTimeline()
-    {
-        $this->_assertRegistrationRequired();
-
-        $this->_request->setParam('user_id', XenForo_Visitor::getUserId());
-        return $this->responseReroute(__CLASS__, 'post-timeline');
-    }
-
-    protected function _prepareUsers(array $users)
-    {
-        $usersData = array();
-
-        $userModel = $this->_getUserModel();
-
-        /** @var XenForo_Model_UserProfile $userProfileModel */
-        $userProfileModel = $this->getModelFromCache('XenForo_Model_UserProfile');
-
-        $followersTotals = null;
-        if ($this->_isFieldIncluded('user_followers_total')) {
-            $followersTotals = $userModel->bdApi_countUsersFollowingUserIds(array_keys($users));
-        }
-
-        $includeFollowingsTotal = $this->_isFieldIncluded('user_followings_total');
-
-        foreach ($users as &$userRef) {
-            if (!$userProfileModel->canViewFullUserProfile($userRef)) {
-                continue;
-            }
-
-            $userData = $userModel->prepareApiDataForUser($userRef);
-
-            if (is_array($followersTotals)) {
-                if (!empty($followersTotals[$userRef['user_id']])) {
-                    $userData['user_followers_total'] = intval($followersTotals[$userRef['user_id']]);
-                } else {
-                    $userData['user_followers_total'] = 0;
-                }
-            }
-
-            if ($includeFollowingsTotal) {
-                $userFollowingUserIds = explode(',', isset($userRef['following']) ? $userRef['following'] : '');
-                if (empty($userFollowingUserIds)) {
-                    $userFollowingUserIds = array();
-                }
-                $userData['user_followings_total'] = count($userFollowingUserIds);
-            }
-
-            $usersData[] = $userData;
-        }
-
-        return $usersData;
-    }
-
-    /**
-     * @return bdApi_Extend_Model_User
-     */
-    protected function _getUserModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_User');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_UserGroup
-     */
-    protected function _getUserGroupModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_UserGroup');
-    }
-
-    /**
-     * @return bdApi_Extend_Model_UserIgnore
-     */
-    protected function _getIgnoreModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_UserIgnore');
-    }
-
-    protected function _getUserOrError(array $fetchOptions = array())
-    {
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-
-        $userModel = $this->_getUserModel();
-
-        $user = $userModel->getUserById($userId, $userModel->getFetchOptionsToPrepareApiData($fetchOptions));
-
-        if (empty($user)) {
-            throw $this->responseException($this->responseError(new XenForo_Phrase('requested_user_not_found'), 404));
-        }
-
-        return $user;
-    }
-
-    protected function _getScopeForAction($action)
-    {
-        if ($action === 'PostIndex') {
-            $session = bdApi_Data_Helper_Core::safeGetSession();
-            if (!$session || !$session->getOAuthClientId()) {
-                return false;
-            }
-        }
-
-        return parent::_getScopeForAction($action);
-    }
-
-    protected function _assertViewingPermissions($action)
-    {
-        if ($action !== 'PostIndex') {
-            parent::_assertViewingPermissions($action);
-        }
-    }
-
-    protected function _assertBoardActive($action)
-    {
-        if ($action !== 'PostIndex') {
-            parent::_assertBoardActive($action);
-        }
-    }
-
-    protected function _assertTfaRequirement($action)
-    {
-        if ($action !== 'PostIndex') {
-            parent::_assertTfaRequirement($action);
-        }
-    }
-
-    public function _isFieldExcluded($field, array $prefixes = array(), $hasChild = true)
-    {
-        if ($field === 'user_id') {
-            return false;
-        }
-
-        return parent::_isFieldExcluded($field, $prefixes);
-    }
-
-    protected function _prepareSessionActivityForApi(&$controllerName, &$action, array &$params)
-    {
-        $params['user_id'] = $this->_request->getParam('user_id');
-        $controllerName = 'XenForo_ControllerPublic_Member';
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerHelper/Admin.php b/xenforo/library/bdApi/ControllerHelper/Admin.php
deleted file mode 100644
index 90d3e760..00000000
--- a/xenforo/library/bdApi/ControllerHelper/Admin.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-class bdApi_ControllerHelper_Admin extends XenForo_ControllerHelper_Abstract
-{
-    public function prepareConditionsAndFetchOptions(array &$conditions, array &$fetchOptions)
-    {
-        /* @var $userModel XenForo_Model_User */
-        $userModel = $this->_controller->getModelFromCache('XenForo_Model_User');
-        /* @var $clientModel bdApi_Model_Client */
-        $clientModel = $this->_controller->getModelFromCache('bdApi_Model_Client');
-
-        $filterView = false;
-        $conditions['expired'] = false;
-        $fetchOptions['page'] = $this->_controller->getInput()->filterSingle('page', XenForo_Input::UINT);
-        $fetchOptions['limit'] = 50;
-        $pageNavParams = array();
-
-        $clientId = $this->_controller->getInput()->filterSingle('client_id', XenForo_Input::STRING);
-        if (!empty($clientId)) {
-            $client = $clientModel->getClientById($clientId);
-            if (!empty($client)) {
-                $conditions['client_id'] = $client['client_id'];
-                $pageNavParams['client_id'] = $client['client_id'];
-            }
-        }
-
-        $filter = $this->_controller->getInput()->filterSingle('_filter', XenForo_Input::ARRAY_SIMPLE);
-        if ($filter && isset($filter['value'])) {
-            if (!$filterView AND !($this->_controller instanceof bdApi_ControllerAdmin_Subscription)) {
-                $users = $userModel->getUsers(array(
-                    'username' => array(
-                        $filter['value'],
-                        empty($filter['prefix']) ? 'lr' : 'r'
-                    )
-                ));
-                if (!empty($users)) {
-                    $conditions['user_id'] = array_keys($users);
-                    $filterView = true;
-                }
-            }
-
-            if (!$filterView) {
-                $conditions['filter'] = array(
-                    $filter['value'],
-                    empty($filter['prefix']) ? 'lr' : 'r'
-                );
-                $filterView = true;
-            }
-        }
-
-        return array(
-            'client' => !empty($client) ? $client : null,
-            'page' => $fetchOptions['page'],
-            'perPage' => $fetchOptions['limit'],
-            'pageNavParams' => $pageNavParams,
-
-            'filterView' => $filterView,
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerHelper/Attachment.php b/xenforo/library/bdApi/ControllerHelper/Attachment.php
deleted file mode 100755
index 1c6d8b17..00000000
--- a/xenforo/library/bdApi/ControllerHelper/Attachment.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-class bdApi_ControllerHelper_Attachment extends XenForo_ControllerHelper_Abstract
-{
-    /**
-     * @var bdApi_ControllerApi_Abstract
-     */
-    protected $_controller;
-
-    public function doUpload($formField, $hash, $contentType, array $contentData = array())
-    {
-        if (isset($contentData['forum_id']) AND !isset($contentData['node_id'])) {
-            $contentData['node_id'] = $contentData['forum_id'];
-        }
-
-        $this->_assertCanUploadAndManageAttachments($hash, $contentType, $contentData);
-
-        $attachmentModel = $this->_getAttachmentModel();
-        $attachmentHandler = $attachmentModel->getAttachmentHandler($contentType);
-        // known to be valid
-        $contentId = $attachmentHandler->getContentIdFromContentData($contentData);
-
-        $existingAttachments = ($contentId ? $attachmentModel->getAttachmentsByContentId(
-            $contentType,
-            $contentId
-        ) : array());
-        $newAttachments = $attachmentModel->getAttachmentsByTempHash($hash);
-
-        $attachmentConstraints = $attachmentHandler->getAttachmentConstraints();
-
-        if ($attachmentConstraints['count'] > 0) {
-            $remainingUploads = $attachmentConstraints['count'] - (count($existingAttachments) + count($newAttachments));
-            if ($remainingUploads <= 0) {
-                return $this->_controller->responseError(new XenForo_Phrase(
-                    'you_may_not_upload_more_files_with_message_allowed_x',
-                    array('total' => $attachmentConstraints['count'])
-                ), 403);
-            }
-        }
-
-        $file = XenForo_Upload::getUploadedFile($formField);
-        if (!$file) {
-            return $this->_controller->responseError(new XenForo_Phrase(
-                'bdapi_requires_upload_x',
-                array('field' => $formField)
-            ), 400);
-        }
-
-        $file->setConstraints($attachmentConstraints);
-        if (!$file->isValid()) {
-            return $this->_controller->responseError($file->getErrors(), 403);
-        }
-        $dataId = $attachmentModel->insertUploadedAttachmentData($file, XenForo_Visitor::getUserId());
-        $attachmentId = $attachmentModel->insertTemporaryAttachment($dataId, $hash);
-
-        return $attachmentModel->getAttachmentById($attachmentId);
-    }
-
-    public function doDelete($hash, $attachmentId)
-    {
-        $attachment = $this->_getAttachmentOrError($attachmentId);
-        if (!$this->_getAttachmentModel()->canDeleteAttachment($attachment, $hash)) {
-            return $this->_controller->responseNoPermission();
-        }
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_Attachment');
-        $dw->setExistingData($attachment, true);
-        $dw->delete();
-
-        return $this->_controller->responseMessage(new XenForo_Phrase('changes_saved'));
-    }
-
-    public function doData($attachment)
-    {
-        if (!$this->_getAttachmentModel()->canViewAttachment($attachment)) {
-            return $this->_controller->responseNoPermission();
-        }
-
-        $filePath = $this->_getAttachmentModel()->getAttachmentDataFilePath($attachment);
-        if (!file_exists($filePath) || !is_readable($filePath)) {
-            // TODO: add support for alternative attachment storage
-            return $this->_controller->responseError(new XenForo_Phrase('attachment_cannot_be_shown_at_this_time'));
-        }
-
-        $this->_getAttachmentModel()->logAttachmentView($attachment['attachment_id']);
-
-        $resize = array();
-        /** @var bdApi_Session $session */
-        $session = XenForo_Application::getSession();
-        if ($session->getOAuthTokenText() !== false) {
-            // requires a valid token to resize images to avoid being abused
-            $resize = $this->_controller->getInput()->filter(array(
-                'max_width' => XenForo_Input::UINT,
-                'max_height' => XenForo_Input::UINT,
-                'keep_ratio' => XenForo_Input::UINT,
-            ));
-        }
-
-        $this->_controller->getRouteMatch()->setResponseType('raw');
-
-        $viewParams = array(
-            'attachment' => $attachment,
-            'attachmentFile' => $filePath,
-
-            'resize' => $resize,
-            'skipFileOutput' => $this->_controller->getRequest()->getMethod() === 'HEAD',
-        );
-
-        return $this->_controller->responseData('bdApi_ViewApi_Helper_Attachment_Data', $viewParams);
-    }
-
-    public function getAttachmentTempHash(array $contentData = array())
-    {
-        $prefix = '';
-
-        $inputHash = $this->_controller->getInput()->filterSingle('attachment_hash', XenForo_Input::STRING);
-
-        if (!empty($inputHash)) {
-            $prefix = sprintf('hash%s', $inputHash);
-        } elseif (!empty($contentData['post_id'])) {
-            $prefix = sprintf('post%d', $contentData['post_id']);
-        } elseif (!empty($contentData['thread_id'])) {
-            $prefix = sprintf('thread%d', $contentData['thread_id']);
-        } elseif (!empty($contentData['forum_id'])) {
-            $prefix = sprintf('node%d', $contentData['forum_id']);
-        } elseif (!empty($contentData['node_id'])) {
-            $prefix = sprintf('node%d', $contentData['node_id']);
-        } elseif (!empty($contentData['message_id'])) {
-            $prefix = sprintf('message%d', $contentData['message_id']);
-        } elseif (!empty($contentData['conversation_id'])) {
-            $prefix = sprintf('conversation%d', $contentData['conversation_id']);
-        }
-
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientId = $session->getOAuthClientId();
-        $visitorUserId = XenForo_Visitor::getUserId();
-
-        return md5(sprintf(
-            'prefix%s_client%s_visitor%d_salt%s',
-            $prefix,
-            $clientId,
-            $visitorUserId,
-            XenForo_Application::getConfig()->get('globalSalt')
-        ));
-    }
-
-    protected function _assertCanUploadAndManageAttachments($hash, $contentType, array $contentData)
-    {
-        if (!$hash) {
-            throw $this->_controller->getNoPermissionResponseException();
-        }
-
-        $attachmentHandler = $this->_getAttachmentModel()->getAttachmentHandler($contentType);
-        if (!$attachmentHandler || !$attachmentHandler->canUploadAndManageAttachments($contentData)) {
-            throw $this->_controller->getNoPermissionResponseException();
-        }
-    }
-
-    protected function _getAttachmentOrError($attachmentId)
-    {
-        $attachment = $this->_getAttachmentModel()->getAttachmentById($attachmentId);
-        if (!$attachment) {
-            throw $this->_controller->responseException($this->_controller->responseError(
-                new XenForo_Phrase('requested_attachment_not_found'),
-                404
-            ));
-        }
-
-        return $attachment;
-    }
-
-    /**
-     * @return XenForo_Model_Attachment
-     */
-    protected function _getAttachmentModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->_controller->getModelFromCache('XenForo_Model_Attachment');
-    }
-}
diff --git a/xenforo/library/bdApi/ControllerHelper/Delete.php b/xenforo/library/bdApi/ControllerHelper/Delete.php
deleted file mode 100644
index c3823ccf..00000000
--- a/xenforo/library/bdApi/ControllerHelper/Delete.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class bdApi_ControllerHelper_Delete extends XenForo_ControllerHelper_Abstract
-{
-    public function filterReason()
-    {
-        $defaultReason = '';
-
-        /** @var bdApi_Session $session */
-        $session = XenForo_Application::getSession();
-        $client = $session->getOAuthClient();
-        if (!empty($client['name'])) {
-            $defaultReason = $client['name'];
-        }
-
-        return $this->_controller->getInput()->filterSingle(
-            'reason',
-            XenForo_Input::STRING,
-            array('default' => $defaultReason)
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/CronEntry/CleanUp.php b/xenforo/library/bdApi/CronEntry/CleanUp.php
deleted file mode 100755
index 9c8e2c84..00000000
--- a/xenforo/library/bdApi/CronEntry/CleanUp.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class bdApi_CronEntry_CleanUp
-{
-    public static function pruneExpired()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = XenForo_Model::create('bdApi_Model_OAuth2');
-
-        $oauth2Model->getAuthCodeModel()->pruneExpired();
-        $oauth2Model->getRefreshTokenModel()->pruneExpired();
-        $oauth2Model->getTokenModel()->pruneExpired();
-
-        $oauth2Model->getLogModel()->pruneExpired();
-    }
-}
diff --git a/xenforo/library/bdApi/Crypt.php b/xenforo/library/bdApi/Crypt.php
deleted file mode 100755
index 72aff42b..00000000
--- a/xenforo/library/bdApi/Crypt.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-class bdApi_Crypt
-{
-    const AES128 = 'aes128';
-
-    public static function getDefaultAlgo()
-    {
-        return self::AES128;
-    }
-
-    public static function encrypt($data, $algo, $key = false)
-    {
-        if ($key === false) {
-            $key = self::_getKey();
-        }
-
-        switch ($algo) {
-            case self::AES128:
-                $encrypted = base64_encode(bdApi_ShippableHelper_Crypt::encrypt(
-                    $data,
-                    $key,
-                    bdApi_ShippableHelper_Crypt::ALGO_AES_128
-                ));
-                break;
-            default:
-                $encrypted = $data;
-        }
-
-        return $encrypted;
-    }
-
-    public static function decrypt($data, $algo, $key = false)
-    {
-        if ($key === false) {
-            $key = self::_getKey();
-        }
-
-        switch ($algo) {
-            case self::AES128:
-                $decrypted = bdApi_ShippableHelper_Crypt::decrypt(
-                    base64_decode($data),
-                    $key,
-                    bdApi_ShippableHelper_Crypt::ALGO_AES_128
-                );
-                break;
-            default:
-                $decrypted = $data;
-        }
-
-        return $decrypted;
-    }
-
-    public static function encryptTypeOne($data, $timestamp)
-    {
-        $algo = self::getDefaultAlgo();
-        $key = $timestamp . XenForo_Application::getConfig()->get('globalSalt');
-        return self::encrypt($data, $algo, $key);
-    }
-
-    public static function decryptTypeOne($data, $timestamp)
-    {
-        if ($timestamp < XenForo_Application::$time) {
-            throw new XenForo_Exception('$timestamp has expired', false);
-        }
-
-        $algo = self::getDefaultAlgo();
-        $key = $timestamp . XenForo_Application::getConfig()->get('globalSalt');
-        return self::decrypt($data, $algo, $key);
-    }
-
-    protected static function _getKey()
-    {
-        /* @var $session bdApi_Session */
-        $session = XenForo_Application::getSession();
-        $clientSecret = $session->getOAuthClientSecret();
-        if (empty($clientSecret)) {
-            throw new XenForo_Exception(new XenForo_Phrase('bdapi_request_must_authorize_to_encrypt'), true);
-        }
-
-        return $clientSecret;
-    }
-}
diff --git a/xenforo/library/bdApi/Data/ColumnOption.php b/xenforo/library/bdApi/Data/ColumnOption.php
deleted file mode 100644
index 70dfc785..00000000
--- a/xenforo/library/bdApi/Data/ColumnOption.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-class bdApi_Data_ColumnOption
-{
-    public static function renderOnOff(XenForo_View $view, $fieldPrefix, array $preparedOption, $canEdit)
-    {
-        list($table, $column) = self::_getTableAndColumnForOnOffOption($preparedOption['option_id']);
-        $preparedOption['_bdApiTable'] = $table;
-        $preparedOption['_bdApiColumn'] = $column;
-
-        return XenForo_ViewAdmin_Helper_Option::renderOptionTemplateInternal(
-            'bdapi_column_option_onoff',
-            $view,
-            $fieldPrefix,
-            $preparedOption,
-            $canEdit
-        );
-    }
-
-    public static function verifyOnOff($value, XenForo_DataWriter $dw, $fieldName)
-    {
-        if (empty($value)) {
-            return true;
-        }
-
-        list($table, $column) = self::_getTableAndColumnForOnOffOption($fieldName);
-        return self::_verify($table, $column, $dw, $fieldName);
-    }
-
-    public static function verifyXfPost($column, XenForo_DataWriter $dw, $fieldName)
-    {
-        return self::_verify('xf_post', $column, $dw, $fieldName);
-    }
-
-    public static function updateIfExists($optionName, $table, $column)
-    {
-        $db = XenForo_Application::getDb();
-        $existed = $db->fetchOne(sprintf('SHOW COLUMNS FROM `%s` LIKE "%s"', $table, $column));
-        if ($existed) {
-            /** @var XenForo_Model_Option $optionModel */
-            $optionModel = XenForo_Model::create('XenForo_Model_Option');
-            $optionModel->updateOption($optionName, $column);
-        }
-    }
-
-    protected static function _verify($table, $column, XenForo_DataWriter $dw, $fieldName)
-    {
-        if (empty($column)) {
-            return true;
-        }
-
-        $db = XenForo_Application::getDb();
-        $existed = $db->fetchOne(sprintf('SHOW COLUMNS FROM `%s` LIKE "%s"', $table, $column));
-        if (!$existed) {
-            $dw->error(new XenForo_Phrase('bdapi_column_x_table_y_not_found_for_field_z', array(
-                'column' => $column,
-                'table' => $table,
-                'field' => $fieldName,
-            )));
-            return false;
-        }
-
-        return true;
-    }
-
-    protected static function _getTableAndColumnForOnOffOption($fieldName)
-    {
-        $subscriptionTopicType = preg_replace('/^.+subscription/', '', $fieldName);
-        switch ($subscriptionTopicType) {
-            case 'User':
-                $table = 'xf_user_option';
-                break;
-            case 'UserNotification':
-                $table = 'xf_user_option';
-                break;
-            case 'ThreadPost':
-                $table = 'xf_thread';
-                break;
-            default:
-                throw new XenForo_Exception(sprintf('Unsupported option %s', $subscriptionTopicType));
-        }
-
-        $columnConfigKey = 'subscriptionColumn' . $subscriptionTopicType;
-        $column = bdApi_Option::getConfig($columnConfigKey);
-
-        return array($table, $column);
-    }
-}
diff --git a/xenforo/library/bdApi/Data/Helper/Batch.php b/xenforo/library/bdApi/Data/Helper/Batch.php
deleted file mode 100644
index b486c821..00000000
--- a/xenforo/library/bdApi/Data/Helper/Batch.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-class bdApi_Data_Helper_Batch
-{
-    public static function getFc()
-    {
-        static $fcTemp = null;
-
-        if ($fcTemp === null) {
-            if (!XenForo_Application::isRegistered('_bdApi_fc')) {
-                throw new XenForo_Exception('API front controller cannot be found.');
-            }
-
-            /* @var $fc XenForo_FrontController */
-            $fc = XenForo_Application::get('_bdApi_fc');
-
-            $fcTemp = new XenForo_FrontController($fc->getDependencies());
-            $fcTemp->setup();
-        }
-
-        return $fcTemp;
-    }
-
-    public static function doJob($method, $uri, array $params)
-    {
-        if (XenForo_Application::isRegistered('_bdApi_disableBatch')
-            && XenForo_Application::get('_bdApi_disableBatch')
-        ) {
-            return array(
-                '_job_result' => 'error',
-                '_job_error' => 'Batch running has been disabled.',
-            );
-        }
-
-        $fc = self::getFc();
-
-        $request = new bdApi_Zend_Controller_Request_Http(bdApi_Data_Helper_Core::safeConvertApiUriToAbsoluteUri(
-            $uri,
-            true
-        ));
-        $request->setParam('_isApiJob', true);
-        $request->setMethod($method);
-        foreach ($params as $key => $value) {
-            $request->setParam($key, $value);
-        }
-        $fc->setRequest($request);
-
-        // routing
-        $routeMatch = $fc->getDependencies()->route($request);
-        if (!$routeMatch OR !$routeMatch->getControllerName()) {
-            list($controllerName, $action) = $fc->getDependencies()->getNotFoundErrorRoute();
-            $routeMatch->setControllerName($controllerName);
-            $routeMatch->setAction($action);
-        }
-
-        $response = $fc->dispatch($routeMatch);
-
-        if ($response instanceof XenForo_ControllerResponse_Error) {
-            return array(
-                '_job_result' => 'error',
-                '_job_error' => $response->errorText,
-            );
-        } elseif ($response instanceof XenForo_ControllerResponse_Exception) {
-            return array(
-                '_job_result' => 'error',
-                '_job_error' => $response->getMessage(),
-            );
-        } elseif ($response instanceof XenForo_ControllerResponse_Message) {
-            return array(
-                '_job_result' => 'message',
-                '_job_message' => $response->message,
-            );
-        } elseif ($response instanceof XenForo_ControllerResponse_View) {
-            return array(
-                '_job_result' => 'ok',
-                '_job_response' => $response,
-            );
-        }
-
-        throw new XenForo_Exception('Unexpected $response occurred.');
-    }
-
-    public static function prepareViewParams(XenForo_ViewRenderer_Abstract $viewRenderer, XenForo_View $view)
-    {
-        $params = $view->getParams();
-        $jobs = array();
-
-        if (!empty($params['jobs'])) {
-            foreach ($params['jobs'] as $jobId => $job) {
-                $preparedJob = array();
-
-                if (empty($job['_job_result'])) {
-                    continue;
-                }
-                $preparedJob['_job_result'] = $job['_job_result'];
-
-                switch ($job['_job_result']) {
-                    case 'error':
-                        if (empty($job['_job_error'])) {
-                            continue;
-                        }
-
-                        $preparedJob['_job_error'] = $job['_job_error'];
-                        break;
-                    case 'message':
-                        if (empty($job['_job_message'])) {
-                            continue;
-                        }
-
-                        $preparedJob['_job_message'] = $job['_job_message'];
-                        break;
-                    case 'ok':
-                        if (empty($job['_job_response'])) {
-                            continue;
-                        }
-                        /** @var XenForo_ControllerResponse_View $response */
-                        $response = $job['_job_response'];
-
-                        $viewOutput = $viewRenderer->renderViewObject(
-                            $response->viewName,
-                            'Json',
-                            $response->params,
-                            $response->templateName
-                        );
-                        if (!is_array($viewOutput)) {
-                            $viewOutput = @json_decode($viewOutput, true);
-                        }
-
-                        if (is_array($viewOutput)) {
-                            $preparedJob = array_merge($preparedJob, $viewOutput);
-                        } elseif ($viewOutput === null) {
-                            $preparedJob = array_merge($preparedJob, $response->params);
-                        }
-                        break;
-                    default:
-                        continue;
-                }
-
-                $jobs[$jobId] = $preparedJob;
-            }
-        }
-
-        return array(
-            'jobs' => $jobs,
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Data/Helper/Core.php b/xenforo/library/bdApi/Data/Helper/Core.php
deleted file mode 100755
index 935b6cdb..00000000
--- a/xenforo/library/bdApi/Data/Helper/Core.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-class bdApi_Data_Helper_Core
-{
-    /**
-     * Adds system information into response data (both XML and JSON)
-     *
-     * @param array $data
-     */
-    public static function addDefaultResponse(array &$data)
-    {
-        if (XenForo_Application::debugMode()) {
-            $data['debug'] = XenForo_Debug::getDebugTemplateParams();
-            if (!empty($data['debug']['debug_url'])) {
-                $data['debug']['debug_url'] = self::safeConvertApiUriToAbsoluteUri($data['debug']['debug_url'], true);
-            }
-
-            $session = self::safeGetSession();
-            if (!empty($session)) {
-                $clientId = $session->getOAuthClientId();
-                if (!empty($clientId)) {
-                    $data['debug']['client_id'] = $clientId;
-
-                    $oauthToken = $session->getOAuthTokenText();
-                    if (!empty($oauthToken)) {
-                        $data['debug']['oauth_token'] = $oauthToken;
-                    }
-                }
-
-                $languageId = $session->get('languageId');
-                if (!empty($languageId)) {
-                    $data['debug']['language_id'] = $languageId;
-                }
-            }
-        }
-
-        if (XenForo_Visitor::getUserId() > 0) {
-            $data['system_info']['visitor_id'] = XenForo_Visitor::getUserId();
-            $data['system_info']['time'] = XenForo_Application::$time;
-        }
-    }
-
-    /**
-     * Builds and adds the navigation for api data
-     *
-     * @param XenForo_Input $input
-     * @param array $data
-     * @param int $perPage
-     * @param int $totalItems
-     * @param int $page
-     * @param string $linkType
-     * @param mixed $linkData
-     * @param array $linkParams
-     * @param array $options
-     */
-    public static function addPageLinks(
-        XenForo_Input $input,
-        array &$data,
-        $perPage,
-        $totalItems,
-        $page,
-        $linkType,
-        $linkData = null,
-        array $linkParams = array(),
-        array $options = array()
-    ) {
-        if (!isset($data['_pageNavParams'])) {
-            $data['_pageNavParams'] = $linkParams;
-        }
-
-        $perPage = intval($perPage);
-        $totalItems = intval($totalItems);
-        $page = max(1, intval($page));
-        if ($perPage < 1) {
-            return;
-        }
-
-        $pageNav = array();
-
-        $inputData = $input->filter(array(
-            'fields_include' => XenForo_Input::STRING,
-            'fields_exclude' => XenForo_Input::STRING,
-        ));
-        if (isset($inputData['fields_include'])) {
-            $linkParams['fields_include'] = $inputData['fields_include'];
-        } elseif (isset($inputData['fields_exclude'])) {
-            $linkParams['fields_exclude'] = $inputData['fields_exclude'];
-        }
-
-        $pageNav['pages'] = ceil($totalItems / $perPage);
-        $pageMax = bdApi_Option::get('paramPageMax');
-        if ($pageMax > 0) {
-            $pageNav['pages'] = min($pageMax, $pageNav['pages']);
-        }
-        $pageNav['pages'] = intval($pageNav['pages']);
-        if ($pageNav['pages'] < 2) {
-            // do not do anything if there is only 1 page (or no pages)
-            return;
-        }
-
-        $pageNav['page'] = $page;
-
-        if ($page > 1) {
-            // a previous link should only be added if we are not at page 1
-            $prevLinkParams = $linkParams;
-            if ($page > 2) {
-                $prevLinkParams['page'] = $page - 1;
-            }
-            $pageNav['prev'] = bdApi_Data_Helper_Core::safeBuildApiLink($linkType, $linkData, $prevLinkParams);
-        }
-
-        if ($page < $pageNav['pages']) {
-            // a next link should only be added if we are not at the last page
-            $pageNav['next'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                $linkType,
-                $linkData,
-                array_merge($linkParams, array('page' => $page + 1))
-            );
-        }
-
-        // add the page navigation into `links`
-        // the data may have existing links or not
-        // we simply don't care
-        if (empty($data['links'])) {
-            $data['links'] = array();
-        }
-        $data['links'] = array_merge($data['links'], $pageNav);
-    }
-
-    /**
-     * Filters data into another array with value from specified keys only
-     *
-     * @param array $data
-     * @param array $publicKeys
-     * @return array
-     */
-    public static function filter(array $data, array $publicKeys)
-    {
-        $filteredData = array();
-
-        foreach ($publicKeys as $publicKey => $mappedKey) {
-            if (is_int($publicKey)) {
-                // backward compatible with previous versions
-                // where $publicKeys is just an array of keys
-                // (with no key value pair)
-                $publicKey = $mappedKey;
-            }
-
-            if (isset($data[$publicKey])) {
-                $filteredData[$mappedKey] = $data[$publicKey];
-            }
-        }
-
-        return $filteredData;
-    }
-
-    /**
-     * @return bdApi_Session|null
-     */
-    public static function safeGetSession()
-    {
-        if (XenForo_Application::isRegistered('_bdApi_session')) {
-            return XenForo_Application::get('_bdApi_session');
-        }
-
-        if (XenForo_Application::isRegistered('session')) {
-            $session = XenForo_Application::getSession();
-            if ($session instanceof bdApi_Session) {
-                return $session;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    public static function safeBuildApiLink()
-    {
-        $args = func_get_args();
-        $func = array('XenForo_Link', 'buildApiLink');
-
-        if (is_callable($func)) {
-            return call_user_func_array($func, $args);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public static function safeConvertApiUriToAbsoluteUri()
-    {
-        $args = func_get_args();
-        $func = array('XenForo_Link', 'convertApiUriToAbsoluteUri');
-
-        if (is_callable($func)) {
-            return call_user_func_array($func, $args);
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Data/Helper/Cors.php b/xenforo/library/bdApi/Data/Helper/Cors.php
deleted file mode 100644
index 9ad32756..00000000
--- a/xenforo/library/bdApi/Data/Helper/Cors.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class bdApi_Data_Helper_Cors
-{
-    public static function addHeaders(
-        XenForo_ViewRenderer_Abstract $viewRenderer,
-        Zend_Controller_Response_Http $response
-    ) {
-        if (!bdApi_Option::get('cors')) {
-            return;
-        }
-
-        $request = $viewRenderer->getRequest();
-
-        $origin = $request->getHeader('Origin');
-        if (!empty($origin)) {
-            $response->setHeader('Access-Control-Allow-Origin', $origin, true);
-            $response->setHeader('Access-Control-Allow-Credentials', 'true', true);
-        } else {
-            $response->setHeader('Access-Control-Allow-Origin', '*', true);
-        }
-
-        $method = $request->getHeader('Access-Control-Request-Method');
-        if (!empty($method)) {
-            $response->setHeader('Access-Control-Allow-Methods', $method, true);
-        }
-
-        $headers = $request->getHeader('Access-Control-Request-Headers');
-        if (!empty($headers)) {
-            $response->setHeader('Access-Control-Allow-Headers', $headers, true);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Data/Helper/Message.php b/xenforo/library/bdApi/Data/Helper/Message.php
deleted file mode 100755
index 8dc6787f..00000000
--- a/xenforo/library/bdApi/Data/Helper/Message.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class bdApi_Data_Helper_Message
-{
-    public static function getHtml(&$message, array $bbCodeOptions = array())
-    {
-        static $bbCodeParser = false;
-
-        if ($bbCodeParser === false) {
-            $formatter = XenForo_BbCode_Formatter_Base::create('Base', array(
-                'view' => bdApi_Template_Simulation_View::create(),
-            ));
-
-            if (XenForo_Application::$versionId >= 1020000) {
-                $bbCodeParser = XenForo_BbCode_Parser::create($formatter);
-            } else {
-                $bbCodeParser = new XenForo_BbCode_Parser($formatter);
-            }
-        }
-
-        return XenForo_ViewPublic_Helper_Message::getBbCodeWrapper($message, $bbCodeParser, $bbCodeOptions);
-    }
-
-    public static function getPlainText($bbCode)
-    {
-        $config = XenForo_Application::getConfig();
-        $useSnippet = $config->get('bdApi_useSnippet');
-
-        if (!empty($useSnippet)) {
-            return XenForo_Template_Helper_Core::callHelper('snippet', array(
-                $bbCode,
-                0,
-                array(
-                    'stripQuote' => true,
-                    'stripHtml' => false,
-                )
-            ));
-        } else {
-            // from XenForo_Helper_String::bbCodeStrip
-            $string = $bbCode;
-
-            $string = preg_replace('#\[(attach|media|img)[^\]]*\].*\[/\\1\]#siU', '', $string);
-
-            while ($string != ($newString = preg_replace('#\[([a-z0-9]+)(=[^\]]*)?\](.*)\[/\1\]#siU', '\3', $string))) {
-                $string = $newString;
-            }
-
-            $string = str_replace('[*]', '', $string);
-            $string = trim($string);
-            $string = XenForo_Helper_String::censorString($string);
-
-            return htmlspecialchars($string);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Data/TempFileOutput.php b/xenforo/library/bdApi/Data/TempFileOutput.php
deleted file mode 100644
index 11c0cb10..00000000
--- a/xenforo/library/bdApi/Data/TempFileOutput.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Data_TempFileOutput extends XenForo_FileOutput
-{
-    public function __destruct()
-    {
-        @unlink($this->_fileName);
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/AuthCode.php b/xenforo/library/bdApi/DataWriter/AuthCode.php
deleted file mode 100755
index e44d7181..00000000
--- a/xenforo/library/bdApi/DataWriter/AuthCode.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class bdApi_DataWriter_AuthCode extends XenForo_DataWriter
-{
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_auth_code' => array(
-                'auth_code_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'autoIncrement' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'auth_code_text' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'redirect_uri' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true
-                ),
-                'expire_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'issue_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'user_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'scope' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'default' => ''
-                ),
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'auth_code_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_auth_code' => $this->_getAuthCodeModel()->getAuthCodeById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('auth_code_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _preSave()
-    {
-        $issueDate = $this->get('issue_date');
-        if (empty($issueDate)) {
-            $this->set('issue_date', XenForo_Application::$time);
-        }
-
-        parent::_preSave();
-    }
-
-    /**
-     * @return bdApi_Model_AuthCode
-     */
-    protected function _getAuthCodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_AuthCode');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/Client.php b/xenforo/library/bdApi/DataWriter/Client.php
deleted file mode 100755
index 5b546109..00000000
--- a/xenforo/library/bdApi/DataWriter/Client.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-class bdApi_DataWriter_Client extends XenForo_DataWriter
-{
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_client' => array(
-                'name' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'description' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255,
-                    'verification' => array(
-                        '$this',
-                        '_verifyClientId'
-                    ),
-                ),
-                'client_secret' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'redirect_uri' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'verification' => array(
-                        '$this',
-                        '_verifyRedirectUri'
-                    ),
-                ),
-                'user_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'options' => array(
-                    'type' => XenForo_DataWriter::TYPE_SERIALIZED,
-                    'default' => 'a:0:{}',
-                    'verification' => array(
-                        '$this',
-                        '_verifyOptions'
-                    ),
-                )
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'client_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_client' => $this->_getClientModel()->getClientById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('client_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _verifyClientId(&$clientId)
-    {
-        if ($this->isUpdate() && $clientId === $this->getExisting('client_id')) {
-            // unchanged, always pass
-            return true;
-        }
-
-        if (!preg_match('#^[a-z0-9]+$#', $clientId)) {
-            $this->error(new XenForo_Phrase('bdapi_client_id_must_be_az09'), 'client_id');
-            return false;
-        }
-
-        $existingClient = $this->_getClientModel()->getClientById($clientId);
-        if ($existingClient) {
-            $this->error(new XenForo_Phrase('bdapi_client_ids_must_be_unique'), 'client_id');
-            return false;
-        }
-
-        return true;
-    }
-
-    protected function _verifyRedirectUri(&$redirectUri)
-    {
-        if (!Zend_Uri::check($redirectUri)) {
-            $this->error(new XenForo_Phrase('bdapi_redirect_uri_must_be_valid'), 'redirect_uri');
-            return false;
-        }
-
-        return true;
-    }
-
-    protected function _verifyOptions(&$options)
-    {
-        $array = unserialize($options);
-
-        if (!empty($array['public_key'])) {
-            $keyPublic = openssl_pkey_get_public($array['public_key']);
-            if ($keyPublic === false) {
-                $this->error(new XenForo_Phrase('bdapi_public_key_must_be_valid'), 'options');
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    protected function _postDelete()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        // delete associated authentication codes
-        $authCodes = $oauth2Model->getAuthCodeModel()->getAuthCodes(array('client_id' => $this->get('client_id')));
-        foreach ($authCodes as $authCode) {
-            $authCodeDw = XenForo_DataWriter::create('bdApi_DataWriter_AuthCode');
-            $authCodeDw->setExistingData($authCode, true);
-            $authCodeDw->delete();
-        }
-
-        // delete associated tokens
-        $tokens = $oauth2Model->getTokenModel()->getTokens(array('client_id' => $this->get('client_id')));
-        foreach ($tokens as $token) {
-            $tokenDw = XenForo_DataWriter::create('bdApi_DataWriter_Token');
-            $tokenDw->setExistingData($token, true);
-            $tokenDw->delete();
-        }
-
-        // delete associated refresh tokens
-        $refreshTokens = $oauth2Model->getRefreshTokenModel()->getRefreshTokens(array('client_id' => $this->get('client_id')));
-        foreach ($refreshTokens as $refreshToken) {
-            $refreshTokenDw = XenForo_DataWriter::create('bdApi_DataWriter_RefreshToken');
-            $refreshTokenDw->setExistingData($refreshToken, true);
-            $refreshTokenDw->delete();
-        }
-
-        // delete associated subscriptions
-        $subscriptions = $oauth2Model->getSubscriptionModel()->getSubscriptions(array('client_id' => $this->get('client_id')));
-        foreach ($subscriptions as $subscription) {
-            $subscriptionDw = XenForo_DataWriter::create('bdApi_DataWriter_Subscription');
-            $subscriptionDw->setExistingData($subscription, true);
-            $subscriptionDw->delete();
-        }
-
-        parent::_postDelete();
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    protected function _getClientModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Client');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/ClientContent.php b/xenforo/library/bdApi/DataWriter/ClientContent.php
deleted file mode 100644
index c3867574..00000000
--- a/xenforo/library/bdApi/DataWriter/ClientContent.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-class bdApi_DataWriter_ClientContent extends XenForo_DataWriter
-{
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_client_content' => array(
-                'client_content_id' => array('type' => XenForo_DataWriter::TYPE_UINT, 'autoIncrement' => true),
-                'client_id' => array('type' => XenForo_DataWriter::TYPE_STRING, 'required' => true, 'maxLength' => 255),
-                'content_type' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 25
-                ),
-                'content_id' => array('type' => XenForo_DataWriter::TYPE_UINT, 'required' => true),
-                'title' => array('type' => XenForo_DataWriter::TYPE_STRING, 'required' => true, 'maxLength' => 255),
-                'body' => array('type' => XenForo_DataWriter::TYPE_STRING, 'required' => true),
-                'date' => array('type' => XenForo_DataWriter::TYPE_UINT, 'required' => true),
-                'link' => array('type' => XenForo_DataWriter::TYPE_STRING, 'required' => true),
-                'user_id' => array('type' => XenForo_DataWriter::TYPE_UINT, 'required' => true),
-                'extra_data' => array('type' => XenForo_DataWriter::TYPE_SERIALIZED),
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'client_content_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_client_content' => $this->_getClientContentModel()->getClientContentById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('client_content_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _postSave()
-    {
-        parent::_postSave();
-
-        $this->_insertIntoSearchIndex();
-    }
-
-    protected function _postDelete()
-    {
-        parent::_postDelete();
-
-        $this->_deleteFromSearchIndex();
-    }
-
-    protected function _insertIntoSearchIndex()
-    {
-        $indexer = new XenForo_Search_Indexer();
-        $this->_getSearchDataHandler()->insertIntoIndex($indexer, $this->getMergedData());
-    }
-
-    protected function _deleteFromSearchIndex()
-    {
-        $indexer = new XenForo_Search_Indexer();
-        $this->_getSearchDataHandler()->deleteFromIndex($indexer, $this->getMergedData());
-    }
-
-    /**
-     * @return bdApi_Search_DataHandler_ClientContent
-     */
-    protected function _getSearchDataHandler()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return XenForo_Search_DataHandler_Abstract::create('bdApi_Search_DataHandler_ClientContent');
-    }
-
-    /**
-     * @return bdApi_Model_ClientContent
-     */
-    protected function _getClientContentModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_ClientContent');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/Log.php b/xenforo/library/bdApi/DataWriter/Log.php
deleted file mode 100755
index 2aafc04a..00000000
--- a/xenforo/library/bdApi/DataWriter/Log.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-class bdApi_DataWriter_Log extends XenForo_DataWriter
-{
-    protected function _beginDbTransaction()
-    {
-        return false;
-    }
-
-    protected function _commitDbTransaction()
-    {
-        return false;
-    }
-
-    protected function _rollbackDbTransaction()
-    {
-        return false;
-    }
-
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_log' => array(
-                'log_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'autoIncrement' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'maxLength' => 255,
-                    'default' => ''
-                ),
-                'user_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'ip_address' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'maxLength' => 50,
-                    'default' => ''
-                ),
-                'request_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'request_method' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'maxLength' => 10,
-                    'default' => 'get'
-                ),
-                'request_uri' => array('type' => XenForo_DataWriter::TYPE_STRING),
-                'request_data' => array('type' => XenForo_DataWriter::TYPE_SERIALIZED),
-                'response_code' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'response_output' => array('type' => XenForo_DataWriter::TYPE_SERIALIZED)
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'log_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_log' => $this->_getLogModel()->getLogById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('log_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    /**
-     * @return bdApi_Model_Log
-     */
-    protected function _getLogModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Log');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/RefreshToken.php b/xenforo/library/bdApi/DataWriter/RefreshToken.php
deleted file mode 100755
index 98686c98..00000000
--- a/xenforo/library/bdApi/DataWriter/RefreshToken.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-class bdApi_DataWriter_RefreshToken extends XenForo_DataWriter
-{
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_refresh_token' => array(
-                'refresh_token_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'autoIncrement' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'refresh_token_text' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'expire_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'issue_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'user_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'scope' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'default' => ''
-                ),
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'refresh_token_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_refresh_token' => $this->_getRefreshTokenModel()->getRefreshTokenById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('refresh_token_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _preSave()
-    {
-        $issueDate = $this->get('issue_date');
-        if (empty($issueDate)) {
-            $this->set('issue_date', XenForo_Application::$time);
-        }
-
-        parent::_preSave();
-    }
-
-    /**
-     * @return bdApi_Model_RefreshToken
-     */
-    protected function _getRefreshTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_RefreshToken');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/Subscription.php b/xenforo/library/bdApi/DataWriter/Subscription.php
deleted file mode 100644
index 6c05cf42..00000000
--- a/xenforo/library/bdApi/DataWriter/Subscription.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-class bdApi_DataWriter_Subscription extends XenForo_DataWriter
-{
-    const OPTION_UPDATE_CALLBACKS = 'updateCallbacks';
-
-    protected function _getDefaultOptions()
-    {
-        return array(self::OPTION_UPDATE_CALLBACKS => true);
-    }
-
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_subscription' => array(
-                'subscription_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'autoIncrement' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'callback' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true
-                ),
-                'topic' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'default' => '',
-                    'maxLength' => 255
-                ),
-                'subscribe_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'expire_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true,
-                    'default' => 0
-                ),
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'subscription_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_subscription' => $this->_getSubscriptionModel()->getSubscriptionById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('subscription_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _postSave()
-    {
-        if ($this->getOption(self::OPTION_UPDATE_CALLBACKS)) {
-            $this->_getSubscriptionModel()->updateCallbacksForTopic($this->get('topic'));
-        }
-
-        parent::_postSave();
-    }
-
-    protected function _postDelete()
-    {
-        if ($this->getOption(self::OPTION_UPDATE_CALLBACKS)) {
-            $this->_getSubscriptionModel()->updateCallbacksForTopic($this->get('topic'));
-        }
-
-        parent::_postDelete();
-    }
-
-    /**
-     * @return bdApi_Model_Subscription
-     */
-    protected function _getSubscriptionModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Subscription');
-    }
-}
diff --git a/xenforo/library/bdApi/DataWriter/Token.php b/xenforo/library/bdApi/DataWriter/Token.php
deleted file mode 100755
index dc54cdc7..00000000
--- a/xenforo/library/bdApi/DataWriter/Token.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-class bdApi_DataWriter_Token extends XenForo_DataWriter
-{
-    protected function _getFields()
-    {
-        return array(
-            'xf_bdapi_token' => array(
-                'token_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'autoIncrement' => true
-                ),
-                'client_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'token_text' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'required' => true,
-                    'maxLength' => 255
-                ),
-                'expire_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'issue_date' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'user_id' => array(
-                    'type' => XenForo_DataWriter::TYPE_UINT,
-                    'required' => true
-                ),
-                'scope' => array(
-                    'type' => XenForo_DataWriter::TYPE_STRING,
-                    'default' => ''
-                ),
-            )
-        );
-    }
-
-    protected function _getExistingData($data)
-    {
-        if (!$id = $this->_getExistingPrimaryKey($data, 'token_id')) {
-            return false;
-        }
-
-        return array('xf_bdapi_token' => $this->_getTokenModel()->getTokenById($id));
-    }
-
-    protected function _getUpdateCondition($tableName)
-    {
-        $conditions = array();
-
-        foreach (array('token_id') as $field) {
-            $conditions[] = $field . ' = ' . $this->_db->quote($this->getExisting($field));
-        }
-
-        return implode(' AND ', $conditions);
-    }
-
-    protected function _preSave()
-    {
-        $issueDate = $this->get('issue_date');
-        if (empty($issueDate)) {
-            $this->set('issue_date', XenForo_Application::$time);
-        }
-
-        parent::_preSave();
-    }
-
-    protected function _postSave()
-    {
-        /* @var $userScopeModel bdApi_Model_UserScope */
-        $userScopeModel = $this->getModelFromCache('bdApi_Model_UserScope');
-        $userScopeModel->updateUserScopes($this->getMergedData());
-
-        parent::_postSave();
-    }
-
-    /**
-     * @return bdApi_Model_Token
-     */
-    protected function _getTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Token');
-    }
-}
diff --git a/xenforo/library/bdApi/Deferred/PingQueue.php b/xenforo/library/bdApi/Deferred/PingQueue.php
deleted file mode 100755
index e7f46b7b..00000000
--- a/xenforo/library/bdApi/Deferred/PingQueue.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class bdApi_Deferred_PingQueue extends XenForo_Deferred_Abstract
-{
-    public function execute(array $deferred, array $data, $targetRunTime, &$status)
-    {
-        /* @var $queueModel bdApi_Model_PingQueue */
-        $queueModel = XenForo_Model::create('bdApi_Model_PingQueue');
-
-        $hasMore = $queueModel->runQueue($targetRunTime);
-        if ($hasMore) {
-            return $data;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Deferred/Upgrade1060001.php b/xenforo/library/bdApi/Deferred/Upgrade1060001.php
deleted file mode 100755
index b9c06cb6..00000000
--- a/xenforo/library/bdApi/Deferred/Upgrade1060001.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_Deferred_Upgrade1060001 extends XenForo_Deferred_Abstract
-{
-    public function execute(array $deferred, array $data, $targetRunTime, &$status)
-    {
-        bdApi_Data_ColumnOption::updateIfExists(
-            'bdApi_trackPostOrigin',
-            'xf_post',
-            'bdapi_origin'
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Dependencies.php b/xenforo/library/bdApi/Dependencies.php
deleted file mode 100755
index ffe6059a..00000000
--- a/xenforo/library/bdApi/Dependencies.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-class bdApi_Dependencies_Base extends XenForo_Dependencies_Public
-{
-    private $_javascriptUrlCallback = null;
-
-    public function helperJavascriptUrl()
-    {
-        $args = func_get_args();
-        $result = call_user_func_array($this->_javascriptUrlCallback, $args);
-        return XenForo_Link::convertUriToAbsoluteUri($result, true);
-    }
-
-    public function preLoadData()
-    {
-        // trigger auto loading of our classes
-        class_exists('bdApi_Link');
-
-        $javascriptUrl = XenForo_Application::$javaScriptUrl;
-        XenForo_Application::$javaScriptUrl = bdApi_Link::convertUriToAbsoluteUri($javascriptUrl, true);
-
-        $this->_javascriptUrlCallback = XenForo_Template_Helper_Core::$helperCallbacks['javascripturl'];
-        if ($this->_javascriptUrlCallback[0] === 'self') {
-            $this->_javascriptUrlCallback[0] = 'XenForo_Template_Helper_Core';
-        }
-        XenForo_Template_Helper_Core::$helperCallbacks['javascripturl'] = array($this, 'helperJavascriptUrl');
-
-        if (isset($_SERVER['REQUEST_METHOD'])
-            && $_SERVER['REQUEST_METHOD'] === 'OPTIONS'
-        ) {
-            class_exists('bdApi_Input');
-            class_exists('bdApi_Upload');
-        }
-
-        $this->_dataPreLoadFromRegistry += array(// TODO
-        );
-
-        XenForo_CodeEvent::addListener('load_class_bb_code', array('bdApi_Listener', 'extend'));
-        XenForo_CodeEvent::addListener('load_class_model', array('bdApi_Listener', 'extend'));
-
-        // XenForo 1.2.0+ only
-        XenForo_CodeEvent::addListener('load_class', array('bdApi_Listener', 'extend'), 'XenForo_Visitor');
-
-        parent::preLoadData();
-    }
-
-    protected function _handleCustomPreloadedData(array &$data)
-    {
-        // setup our routes
-        $routes = array();
-        bdApi_Route_PrefixApi::setupRoutes($routes);
-        XenForo_Link::setHandlerInfoForGroup('api', $routes);
-
-        parent::_handleCustomPreloadedData($data);
-    }
-
-    public function getNotFoundErrorRoute()
-    {
-        return array(
-            'bdApi_ControllerApi_Error',
-            'ErrorNotFound'
-        );
-    }
-
-    public function getServerErrorRoute()
-    {
-        return array(
-            'bdApi_ControllerApi_Error',
-            'ErrorServer'
-        );
-    }
-
-    public function getViewRenderer(
-        Zend_Controller_Response_Http $response,
-        $responseType,
-        Zend_Controller_Request_Http $request
-    ) {
-        switch ($responseType) {
-            case 'jsonp':
-                return new bdApi_ViewRenderer_Jsonp($this, $response, $request);
-            case 'raw':
-                return new XenForo_ViewRenderer_Raw($this, $response, $request);
-            default:
-                // because the oauth2-php library only supports JSON
-                // it makes little sense for us to support anything else
-                // so for now, we will only use the JSON renderer...
-                // TODO: support XML?
-                return new bdApi_ViewRenderer_Json($this, $response, $request);
-        }
-    }
-
-    public function getBaseViewClassName()
-    {
-        return 'bdApi_ViewApi_Base';
-    }
-
-    protected function _bdApi_reRoute(Zend_Controller_Request_Http $request, XenForo_RouteMatch $routeMatch)
-    {
-        if (!empty($routeMatch)) {
-            $controllerName = $routeMatch->getControllerName();
-
-            switch ($controllerName) {
-                case 'bdApi_ControllerApi_Error':
-                    // ignore
-                    break;
-                default:
-                    $action = $routeMatch->getAction();
-                    if (empty($action)) {
-                        $action = 'index';
-                    }
-
-                    $method = strtolower($request->getMethod());
-                    if ($method === 'head') {
-                        $method = 'get';
-                    }
-
-                    if ($method === 'options') {
-                        $routeMatch->setAction('options');
-                        $request->setParam('action', $action);
-                    } else {
-                        $routeMatch->setAction($method . '-' . $action);
-                    }
-            }
-        }
-
-        return $routeMatch;
-    }
-}
-
-if (XenForo_Application::$versionId >= 1020000) {
-    class bdApi_Dependencies extends bdApi_Dependencies_Base
-    {
-        public function route(Zend_Controller_Request_Http $request, $routePath = null)
-        {
-            $routeMatch = parent::route($request, $routePath);
-
-            $routeMatch = $this->_bdApi_reRoute($request, $routeMatch);
-
-            return $routeMatch;
-        }
-
-        public function getRouter()
-        {
-            $router = new XenForo_Router();
-            $router->addRule(new XenForo_Route_ResponseSuffix(), 'ResponseSuffix');
-            $router->addRule(new bdApi_Route_PrefixApi('api'), 'Prefix');
-
-            return $router;
-        }
-
-        public function routePublic(Zend_Controller_Request_Http $request, $routePath = null)
-        {
-            return parent::getRouter()->match($request, $routePath);
-        }
-    }
-
-} else {
-    class bdApi_Dependencies extends bdApi_Dependencies_Base
-    {
-
-        /** @noinspection PhpSignatureMismatchDuringInheritanceInspection
-         * @param Zend_Controller_Request_Http $request
-         * @return bool|XenForo_RouteMatch
-         */
-        public function route(Zend_Controller_Request_Http $request)
-        {
-            $router = new XenForo_Router();
-            $router->addRule(new XenForo_Route_ResponseSuffix(), 'ResponseSuffix');
-            $router->addRule(new bdApi_Route_PrefixApi('api'), 'Prefix');
-
-            $routeMatch = $router->match($request);
-
-            $routeMatch = $this->_bdApi_reRoute($request, $routeMatch);
-
-            return $routeMatch;
-        }
-
-        public function routePublic(Zend_Controller_Request_Http $request)
-        {
-            return parent::route($request);
-        }
-    }
-
-}
diff --git a/xenforo/library/bdApi/DevHelper/Config.php b/xenforo/library/bdApi/DevHelper/Config.php
deleted file mode 100644
index 81157262..00000000
--- a/xenforo/library/bdApi/DevHelper/Config.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-class bdApi_DevHelper_Config extends DevHelper_Config_Base
-{
-    protected $_dataClasses = array(
-        'client' => array(
-            'name' => 'client',
-            'camelCase' => 'Client',
-            'camelCasePlural' => 'Clients',
-            'camelCaseWSpace' => 'Client',
-            'fields' => array(
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'client_secret' => array(
-                    'name' => 'client_secret',
-                    'type' => 'string',
-                    'length' => 255,
-                    'required' => true
-                ),
-                'redirect_uri' => array('name' => 'redirect_uri', 'type' => 'string', 'required' => true),
-                'name' => array('name' => 'name', 'type' => 'string', 'length' => 255, 'required' => true),
-                'description' => array('name' => 'description', 'type' => 'string', 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'options' => array('name' => 'options', 'type' => 'serialized'),
-            ),
-            'id_field' => 'client_id',
-            'title_field' => 'name',
-            'primaryKey' => array('client_id'),
-            'indeces' => array(),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_Client',
-                    'hash' => 'd06385441f73014290ba478a80e3ae9c'
-                ),
-                'model' => array('className' => 'bdApi_Model_Client', 'hash' => 'face27cf7250b4997af61fe20ef5c32c'),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_Client',
-                    'hash' => 'e52763754f4d2ff5c1514c84e933a39f'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_Client',
-                    'hash' => 'a4668e14b09a405983ee301966a41fff'
-                ),
-            ),
-        ),
-        'token' => array(
-            'name' => 'token',
-            'camelCase' => 'Token',
-            'camelCasePlural' => 'Tokens',
-            'camelCaseWSpace' => 'Token',
-            'fields' => array(
-                'token_id' => array('name' => 'token_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'token_text' => array('name' => 'token_text', 'type' => 'string', 'length' => 255, 'required' => true),
-                'expire_date' => array('name' => 'expire_date', 'type' => 'uint', 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'scope' => array('name' => 'scope', 'type' => 'string', 'required' => true),
-            ),
-            'id_field' => 'token_id',
-            'title_field' => 'token_text',
-            'primaryKey' => array('token_id'),
-            'indeces' => array(
-                'token_text' => array('name' => 'token_text', 'fields' => array('token_text'), 'type' => 'UNIQUE'),
-            ),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_Token',
-                    'hash' => 'a75baf311ad2a75a3c233f829d2de7fc'
-                ),
-                'model' => array('className' => 'bdApi_Model_Token', 'hash' => '35c5160ad8faec1951e2290595c601f9'),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_Token',
-                    'hash' => '3c72b187ee2214d004c93ae1b3bb5943'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_Token',
-                    'hash' => '8b47e2671e883fe9339a9808932338df'
-                ),
-            ),
-        ),
-        'auth_code' => array(
-            'name' => 'auth_code',
-            'camelCase' => 'AuthCode',
-            'camelCasePlural' => 'AuthCodes',
-            'camelCaseWSpace' => 'Auth Code',
-            'fields' => array(
-                'auth_code_id' => array('name' => 'auth_code_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'auth_code_text' => array(
-                    'name' => 'auth_code_text',
-                    'type' => 'string',
-                    'length' => 255,
-                    'required' => true
-                ),
-                'redirect_uri' => array('name' => 'redirect_uri', 'type' => 'string', 'required' => true),
-                'expire_date' => array('name' => 'expire_date', 'type' => 'uint', 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'scope' => array('name' => 'scope', 'type' => 'string', 'required' => true),
-            ),
-            'id_field' => 'auth_code_id',
-            'title_field' => 'auth_code_text',
-            'primaryKey' => array('auth_code_id'),
-            'indeces' => array(
-                'auth_code_text' => array(
-                    'name' => 'auth_code_text',
-                    'fields' => array('auth_code_text'),
-                    'type' => 'UNIQUE'
-                ),
-            ),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_AuthCode',
-                    'hash' => '166891f59a3603dc9969b591629f29bc'
-                ),
-                'model' => array('className' => 'bdApi_Model_AuthCode', 'hash' => '45e95ebc1bbee53f3972a059f4327a15'),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_AuthCode',
-                    'hash' => '6ae4cf1aafaf43f7ae7cd5d9d0a0df9b'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_AuthCode',
-                    'hash' => '42e51ecb001ff9a0faea674641568d41'
-                ),
-            ),
-        ),
-        'refresh_token' => array(
-            'name' => 'refresh_token',
-            'camelCase' => 'RefreshToken',
-            'camelCasePlural' => 'RefreshTokens',
-            'camelCaseWSpace' => 'Refresh Token',
-            'fields' => array(
-                'refresh_token_id' => array('name' => 'refresh_token_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'refresh_token_text' => array(
-                    'name' => 'refresh_token_text',
-                    'type' => 'string',
-                    'length' => 255,
-                    'required' => true
-                ),
-                'expire_date' => array('name' => 'expire_date', 'type' => 'uint', 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'scope' => array('name' => 'scope', 'type' => 'string', 'required' => true),
-            ),
-            'id_field' => 'refresh_token_id',
-            'title_field' => 'refresh_token_text',
-            'primaryKey' => array('refresh_token_id'),
-            'indeces' => array(
-                'refresh_token_text' => array(
-                    'name' => 'refresh_token_text',
-                    'fields' => array('refresh_token_text'),
-                    'type' => 'UNIQUE'
-                ),
-            ),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_RefreshToken',
-                    'hash' => 'c6db6bb1109926ca4eba261031cfc65c'
-                ),
-                'model' => array(
-                    'className' => 'bdApi_Model_RefreshToken',
-                    'hash' => '63c1f959d0711741936bfe1bd8226484'
-                ),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_RefreshToken',
-                    'hash' => '785792de37c97cca302374430d5c5063'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_RefreshToken',
-                    'hash' => '395fece4ddeab05829611c375694ebec'
-                ),
-            ),
-        ),
-        'log' => array(
-            'name' => 'log',
-            'camelCase' => 'Log',
-            'camelCasePlural' => 'Logs',
-            'camelCaseWSpace' => 'Log',
-            'fields' => array(
-                'log_id' => array('name' => 'log_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'ip_address' => array('name' => 'ip_address', 'type' => 'string', 'length' => 50, 'required' => true),
-                'request_date' => array('name' => 'request_date', 'type' => 'uint', 'required' => true),
-                'request_method' => array(
-                    'name' => 'request_method',
-                    'type' => 'string',
-                    'length' => 10,
-                    'required' => true
-                ),
-                'request_uri' => array('name' => 'request_uri', 'type' => 'string'),
-                'request_data' => array('name' => 'request_data', 'type' => 'serialized'),
-                'response_code' => array('name' => 'response_code', 'type' => 'uint', 'required' => true),
-                'response_output' => array('name' => 'response_output', 'type' => 'serialized'),
-            ),
-            'phrases' => array(),
-            'id_field' => 'log_id',
-            'title_field' => 'client_id',
-            'primaryKey' => array('log_id'),
-            'indeces' => array(),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_Log',
-                    'hash' => 'c52e845427612ba05a46c935ad80c7db'
-                ),
-                'model' => array('className' => 'bdApi_Model_Log', 'hash' => 'cb3417127ecae72d04c607a18bf77853'),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_Log',
-                    'hash' => 'cdc2b71157553793ce20112afcb1aa98'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_Log',
-                    'hash' => 'd2546249050e790a816e85a98c2f45b8'
-                ),
-            ),
-        ),
-        'subscription' => array(
-            'name' => 'subscription',
-            'camelCase' => 'Subscription',
-            'camelCasePlural' => 'Subscriptions',
-            'camelCaseWSpace' => 'Subscription',
-            'camelCasePluralWSpace' => 'Subscriptions',
-            'fields' => array(
-                'subscription_id' => array('name' => 'subscription_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'callback' => array('name' => 'callback', 'type' => 'string'),
-                'topic' => array('name' => 'topic', 'type' => 'string', 'length' => 255, 'required' => true),
-                'subscribe_date' => array('name' => 'subscribe_date', 'type' => 'uint', 'required' => true),
-                'expire_date' => array('name' => 'expire_date', 'type' => 'uint', 'required' => true, 'default' => 0),
-            ),
-            'phrases' => array(),
-            'id_field' => 'subscription_id',
-            'title_field' => 'client_id',
-            'primaryKey' => array('subscription_id'),
-            'indeces' => array(
-                'client_id' => array('name' => 'client_id', 'fields' => array('client_id'), 'type' => 'NORMAL'),
-                'topic' => array('name' => 'topic', 'fields' => array('topic'), 'type' => 'NORMAL'),
-            ),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_Subscription',
-                    'hash' => 'd22acd9b533d5303f8609f45c18989b3'
-                ),
-                'model' => array(
-                    'className' => 'bdApi_Model_Subscription',
-                    'hash' => '6da4fa7e7fd37d2037fef3e04a758e7b'
-                ),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_Subscription',
-                    'hash' => 'a4b9bf9d0e002a1fd377800f05f604bf'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_Subscription',
-                    'hash' => '27d424a7d03a8ca84f5b2ec1b84a0bf0'
-                ),
-            ),
-        ),
-        'user_scope' => array(
-            'name' => 'user_scope',
-            'camelCase' => 'UserScope',
-            'camelCasePlural' => 'UserScopes',
-            'camelCaseWSpace' => 'User Scope',
-            'camelCasePluralWSpace' => 'User Scopes',
-            'fields' => array(
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'scope' => array('name' => 'scope', 'type' => 'string', 'length' => 255, 'required' => true),
-                'accept_date' => array('name' => 'accept_date', 'type' => 'uint', 'required' => true),
-            ),
-            'phrases' => array(),
-            'id_field' => 'user_id',
-            'title_field' => 'client_id',
-            'primaryKey' => false,
-            'indeces' => array(
-                'user_id' => array('name' => 'user_id', 'fields' => array('user_id'), 'type' => 'NORMAL'),
-            ),
-            'files' => array(
-                'data_writer' => false,
-                'model' => false,
-                'route_prefix_admin' => false,
-                'controller_admin' => false
-            ),
-        ),
-        'client_content' => array(
-            'name' => 'client_content',
-            'camelCase' => 'ClientContent',
-            'camelCasePlural' => 'ClientContents',
-            'camelCaseWSpace' => 'Client Content',
-            'camelCasePluralWSpace' => 'Client Contents',
-            'fields' => array(
-                'client_content_id' => array('name' => 'client_content_id', 'type' => 'uint', 'autoIncrement' => true),
-                'client_id' => array('name' => 'client_id', 'type' => 'string', 'length' => 255, 'required' => true),
-                'content_type' => array(
-                    'name' => 'content_type',
-                    'type' => 'string',
-                    'length' => 25,
-                    'required' => true
-                ),
-                'content_id' => array('name' => 'content_id', 'type' => 'uint', 'required' => true),
-                'title' => array('name' => 'title', 'type' => 'string', 'length' => 255, 'required' => true),
-                'body' => array('name' => 'body', 'type' => 'string', 'required' => true),
-                'date' => array('name' => 'date', 'type' => 'uint', 'required' => true),
-                'link' => array('name' => 'link', 'type' => 'string', 'required' => true),
-                'user_id' => array('name' => 'user_id', 'type' => 'uint', 'required' => true),
-                'extra_data' => array('name' => 'extra_data', 'type' => 'serialized'),
-            ),
-            'phrases' => array(),
-            'title_field' => 'client_id',
-            'primaryKey' => array('client_content_id'),
-            'indeces' => array(
-                'content_type_content_id' => array(
-                    'name' => 'content_type_content_id',
-                    'fields' => array('content_type', 'content_id'),
-                    'type' => 'NORMAL',
-                ),
-            ),
-            'files' => array(
-                'data_writer' => array(
-                    'className' => 'bdApi_DataWriter_ClientContent',
-                    'hash' => '768e9d0f0daf1b06d922c0a7fb85e948'
-                ),
-                'model' => array(
-                    'className' => 'bdApi_Model_ClientContent',
-                    'hash' => 'f5d7ecc874121a8b1f796dd619d69aaa'
-                ),
-                'route_prefix_admin' => array(
-                    'className' => 'bdApi_Route_PrefixAdmin_ClientContent',
-                    'hash' => 'c349ce827df98df310a98d4505f86356'
-                ),
-                'controller_admin' => array(
-                    'className' => 'bdApi_ControllerAdmin_ClientContent',
-                    'hash' => 'b5b8ae7006c06b41736cb7da82eb5d1d'
-                ),
-            ),
-        ),
-    );
-    protected $_dataPatches = array(
-        'xf_bdapi_token' => array(
-            'issue_date' => array('name' => 'issue_date', 'type' => 'uint', 'required' => true, 'default' => 0),
-        ),
-        'xf_bdapi_auth_code' => array(
-            'issue_date' => array('name' => 'issue_date', 'type' => 'uint', 'required' => true, 'default' => 0),
-        ),
-        'xf_bdapi_refresh_token' => array(
-            'issue_date' => array('name' => 'issue_date', 'type' => 'uint', 'required' => true, 'default' => 0),
-        ),
-    );
-    protected $_exportPath = '/Users/sondh/XenForo/bdApi';
-    protected $_exportIncludes = array('api');
-    protected $_exportExcludes = array('library/bdApi/Lib/oauth2-server-php/test');
-    protected $_exportAddOns = array();
-    protected $_exportStyles = array();
-    protected $_options = array();
-
-    /**
-     * Return false to trigger the upgrade!
-     **/
-    protected function _upgrade()
-    {
-        return true; // remove this line to trigger update
-
-        /*
-        $this->addDataClass(
-            'name_here',
-            array( // fields
-                'field_here' => array(
-                    'type' => 'type_here',
-                    // 'length' => 'length_here',
-                    // 'required' => true,
-                    // 'allowedValues' => array('value_1', 'value_2'),
-                    // 'default' => 0,
-                    // 'autoIncrement' => true,
-                ),
-                // other fields go here
-            ),
-            array('primary_key_1', 'primary_key_2'), // or 'primary_key', both are okie
-            array( // indeces
-                array(
-                    'fields' => array('field_1', 'field_2'),
-                    'type' => 'NORMAL', // UNIQUE or FULLTEXT
-                ),
-            ),
-        );
-        */
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/BbCode/Formatter/Base.php b/xenforo/library/bdApi/Extend/BbCode/Formatter/Base.php
deleted file mode 100644
index 1dcde7f2..00000000
--- a/xenforo/library/bdApi/Extend/BbCode/Formatter/Base.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class bdApi_Extend_BbCode_Formatter_Base extends XFCP_bdApi_Extend_BbCode_Formatter_Base
-{
-    public function renderTree(array $tree, array $extraStates = array())
-    {
-        /** @var bdApi_Template_Simulation_View $view */
-        $view = $this->_view;
-        /** @var bdApi_Template_Simulation_Template $noNameTemplate */
-        $noNameTemplate = null;
-        if (!empty($view)) {
-            $noNameTemplate = $view->createTemplateObject('');
-            $noNameTemplate->clearRequiredExternalsForApi();
-        }
-
-        $rendered = parent::renderTree($tree, $extraStates);
-
-        if (!empty($noNameTemplate)) {
-            $requiredExternalsHtml = $noNameTemplate->getRequiredExternalsAsHtmlForApi();
-            if (strlen($requiredExternalsHtml) > 0) {
-                $rendered = sprintf('<!--%s-->%s', preg_replace('/(\n|\t)/', '', $requiredExternalsHtml), $rendered);
-            }
-        }
-
-        return $rendered;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Attachment.php b/xenforo/library/bdApi/Extend/Model/Attachment.php
deleted file mode 100755
index a8b27b48..00000000
--- a/xenforo/library/bdApi/Extend/Model/Attachment.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Attachment extends XFCP_bdApi_Extend_Model_Attachment
-{
-    public function prepareApiDataForAttachment(array $attachment)
-    {
-        $attachment = $this->prepareAttachment($attachment);
-
-        $publicKeys = array(
-            // xf_attachment
-            'attachment_id' => 'attachment_id',
-            'view_count' => 'attachment_download_count',
-            // xf_attachment_data
-            'filename' => 'filename',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($attachment, $publicKeys);
-
-        $paths = XenForo_Application::get('requestPaths');
-        $paths['fullBasePath'] = XenForo_Application::getOptions()->get('boardUrl') . '/';
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('attachments', $attachment),
-            'data' => bdApi_Data_Helper_Core::safeBuildApiLink('attachments/data', $attachment),
-        );
-
-        if (!empty($attachment['thumbnailUrl'])) {
-            $data['links']['thumbnail'] = XenForo_Link::convertUriToAbsoluteUri($attachment['thumbnailUrl']);
-        }
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Category.php b/xenforo/library/bdApi/Extend/Model/Category.php
deleted file mode 100755
index face4914..00000000
--- a/xenforo/library/bdApi/Extend/Model/Category.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Category extends XFCP_bdApi_Extend_Model_Category
-{
-    public function prepareApiDataForCategories(array $categories)
-    {
-        $data = array();
-
-        foreach ($categories as $key => $category) {
-            $data[] = $this->prepareApiDataForCategory($category);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForCategory(array $category)
-    {
-        $publicKeys = array(
-            // xf_node
-            'node_id' => 'category_id',
-            'title' => 'category_title',
-            'description' => 'category_description',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($category, $publicKeys);
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('categories', $category),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('categories', $category),
-            'sub-categories' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'categories',
-                array(),
-                array('parent_category_id' => $category['node_id'])
-            ),
-            'sub-forums' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'forums',
-                array(),
-                array('parent_category_id' => $category['node_id'])
-            ),
-        );
-
-        $data['permissions'] = array(
-            'view' => $this->canViewCategory($category),
-            'edit' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-            'delete' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-        );
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Conversation.php b/xenforo/library/bdApi/Extend/Model/Conversation.php
deleted file mode 100755
index ba8c525e..00000000
--- a/xenforo/library/bdApi/Extend/Model/Conversation.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Conversation extends XFCP_bdApi_Extend_Model_Conversation
-{
-    const FETCH_OPTIONS_JOIN = 'bdApi_join';
-    const FETCH_OPTIONS_JOIN_FETCH_FIRST_MESSAGE_AVATAR = 0x01;
-    const FETCH_OPTIONS_MESSAGES_ORDER_REVERSE = 'bdApi_messages_orderReverse';
-
-    protected $_bdApi_messages_orderReverse = false;
-
-    public function getConversationMessages($conversationId, array $fetchOptions = array())
-    {
-        if (!empty($fetchOptions[self::FETCH_OPTIONS_MESSAGES_ORDER_REVERSE])) {
-            $this->_bdApi_messages_orderReverse = true;
-        }
-
-        return parent::getConversationMessages($conversationId, $fetchOptions);
-    }
-
-    public function fetchAllKeyed($sql, $key, $bind = array(), $nullPrefix = '')
-    {
-        if ($this->_bdApi_messages_orderReverse) {
-            $sql = str_replace('ORDER BY message.message_date', 'ORDER BY message.message_date DESC', $sql, $count);
-
-            if ($count !== 1) {
-                throw new XenForo_Exception('Fatal Conflict: Could not change ORDER BY statement');
-            }
-
-            // reset the flag
-            $this->_bdApi_messages_orderReverse = false;
-        }
-
-        return parent::fetchAllKeyed($sql, $key, $bind, $nullPrefix);
-    }
-
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & XenForo_Model_Conversation::FETCH_FIRST_MESSAGE) {
-                if (empty($fetchOptions[self::FETCH_OPTIONS_JOIN])) {
-                    $fetchOptions[self::FETCH_OPTIONS_JOIN] = 0;
-                }
-
-                $fetchOptions[self::FETCH_OPTIONS_JOIN] |= self::FETCH_OPTIONS_JOIN_FETCH_FIRST_MESSAGE_AVATAR;
-            }
-        }
-
-        return $fetchOptions;
-    }
-
-    public function getFetchOptionsToPrepareApiDataForMessages(array $fetchOptions = array())
-    {
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForConversations(array $conversations, $getRecipients = false)
-    {
-        $data = array();
-
-        foreach ($conversations as $key => $conversation) {
-            $data[] = $this->prepareApiDataForConversation($conversation, $getRecipients);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForConversation(array $conversation, $getRecipients = false)
-    {
-        $conversation = $this->prepareConversation($conversation);
-
-        $publicKeys = array(
-            // xf_conversation_master
-            'conversation_id' => 'conversation_id',
-            'title' => 'conversation_title',
-            'user_id' => 'creator_user_id',
-            'username' => 'creator_username',
-            'start_date' => 'conversation_create_date',
-            'last_message_date' => 'conversation_update_date',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($conversation, $publicKeys);
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($conversation['user_id']);
-
-        if (isset($conversation['reply_count'])) {
-            $data['conversation_message_count'] = $conversation['reply_count'] + 1;
-        }
-
-        $data['conversation_has_new_message'] = !empty($conversation['is_unread']);
-
-        if (isset($conversation['conversation_open']) and isset($conversation['recipient_state'])) {
-            switch ($conversation['recipient_state']) {
-                case 'active':
-                    $data['conversation_is_open'] = empty($conversation['conversation_open']) ? false : true;
-                    $data['conversation_is_deleted'] = false;
-                    break;
-                case 'deleted':
-                case 'deleted_ignored':
-                    $data['conversation_is_open'] = false;
-                    $data['conversation_is_deleted'] = true;
-                    break;
-            }
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('conversations', $conversation),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('conversations', $conversation),
-            'messages' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'conversation-messages',
-                array(),
-                array('conversation_id' => $conversation['conversation_id'])
-            )
-        );
-
-        $data['permissions'] = array(
-            'reply' => $this->canReplyToConversation($conversation),
-            'delete' => true,
-            'upload_attachment' => $this->canUploadAndManageAttachment($conversation),
-        );
-
-        if (isset($conversation['message'])) {
-            $firstMessage = $conversation;
-            $firstMessage['message_id'] = $conversation['first_message_id'];
-            $firstMessage['message_date'] = $conversation['start_date'];
-
-            if (isset($conversation['first_message_avatar_date'])) {
-                $firstMessage['avatar_date'] = $conversation['first_message_avatar_date'];
-                $firstMessage['gender'] = $conversation['first_message_gender'];
-                $firstMessage['gravatar'] = $conversation['first_message_gravatar'];
-            }
-
-            $data['first_message'] = $this->prepareApiDataForMessage($firstMessage, $conversation);
-        }
-
-        if (!empty($getRecipients)) {
-            $recipients = $this->getConversationRecipients($conversation['conversation_id']);
-            $data['recipients'] = array();
-            foreach ($recipients as $recipient) {
-                $data['recipients'][] = array(
-                    'user_id' => $recipient['user_id'],
-                    'username' => $recipient['username']
-                );
-            }
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForMessages(array $messages, array $conversation)
-    {
-        $data = array();
-
-        foreach ($messages as $key => $message) {
-            $data[] = $this->prepareApiDataForMessage($message, $conversation);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForMessage(array $message, array $conversation)
-    {
-        $message = $this->prepareMessage($message, $conversation);
-
-        $attachments = array();
-        if (!empty($message['attachments'])) {
-            $attachments = $message['attachments'];
-        }
-
-        if (!isset($message['messageHtml'])) {
-            $bbCodeOptions = array(
-                'states' => array(
-                    'viewAttachments' => $this->canViewAttachmentOnConversation($conversation),
-                ),
-            );
-            $message['messageHtml'] = bdApi_Data_Helper_Message::getHtml($message, $bbCodeOptions);
-        }
-        if (isset($message['message'])) {
-            $message['messagePlainText'] = bdApi_Data_Helper_Message::getPlainText($message['message']);
-        }
-
-        if (isset($message['signature'])) {
-            $message['signaturePlainText'] = bdApi_Data_Helper_Message::getPlainText($message['signature']);
-        }
-
-        $publicKeys = array(
-            // xf_conversation_message
-            'message_id' => 'message_id',
-            'conversation_id' => 'conversation_id',
-            'user_id' => 'creator_user_id',
-            'username' => 'creator_username',
-            'message_date' => 'message_create_date',
-            'message' => 'message_body',
-            'messageHtml' => 'message_body_html',
-            'messagePlainText' => 'message_body_plain_text',
-            'signature' => 'signature',
-            'signatureHtml' => 'signature_html',
-            'signaturePlainText' => 'signature_plain_text',
-            'attach_count' => 'message_attachment_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($message, $publicKeys);
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($message['user_id']);
-
-        if (!empty($attachments)) {
-            $data['attachments'] = $this->prepareApiDataForAttachments($attachments, $message, $conversation);
-        }
-
-        $data['links'] = array(
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('conversation-messages', $message),
-            'conversation' => bdApi_Data_Helper_Core::safeBuildApiLink('conversations', $conversation),
-            'creator' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $message),
-            'creator_avatar' => XenForo_Template_Helper_Core::callHelper('avatar', array(
-                $message,
-                'm',
-                false,
-                true
-            )),
-            'report' => bdApi_Data_Helper_Core::safeBuildApiLink('conversation-messages/report', $message),
-        );
-
-        $data['permissions'] = array(
-            'view' => true,
-            'edit' => $this->canEditMessage($message, $conversation),
-            'delete' => false,
-            'reply' => $this->canReplyToConversation($conversation),
-            'upload_attachment' => $this->canUploadAndManageAttachment($conversation) AND $this->canEditMessage(
-                $message,
-                $conversation
-            ),
-            'report' => $this->canReportMessage($message, $conversation),
-        );
-
-        return $data;
-    }
-
-    public function prepareApiDataForAttachments(
-        array $attachments,
-        array $message,
-        array $conversation,
-        $tempHash = ''
-    ) {
-        $data = array();
-
-        foreach ($attachments as $key => $attachment) {
-            $data[] = $this->prepareApiDataForAttachment($attachment, $message, $conversation, $tempHash);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForAttachment(array $attachment, array $message, array $conversation, $tempHash = '')
-    {
-        /** @var bdApi_Extend_Model_Attachment $attachmentModel */
-        $attachmentModel = $this->getModelFromCache('XenForo_Model_Attachment');
-        $data = $attachmentModel->prepareApiDataForAttachment($attachment);
-
-        if (!empty($message['message_id'])) {
-            $data['message_id'] = $message['message_id'];
-            $data['links'] += array(
-                'message' => bdApi_Data_Helper_Core::safeBuildApiLink('conversation-messages', $message),
-            );
-        }
-
-        $data['permissions'] = array(
-            'view' => $attachmentModel->canViewAttachment($attachment, $tempHash),
-            'delete' => $attachmentModel->canDeleteAttachment($attachment, $tempHash),
-        );
-
-        $data['permissions'] = array(
-            'view' => !empty($tempHash)
-                ? $attachmentModel->canViewAttachment($attachment, $tempHash)
-                : $this->canViewAttachmentOnConversationMessage($message, $conversation),
-            'delete' => !empty($tempHash)
-                ? $attachmentModel->canDeleteAttachment($attachment, $tempHash)
-                : $this->canEditMessage($message, $conversation),
-        );
-
-        if (isset($message['messageHtml'])) {
-            $data['attachment_is_inserted'] = empty($message['attachments'][$attachment['attachment_id']]);
-        }
-
-        return $data;
-    }
-
-    public function prepareConversationFetchOptions(array $fetchOptions)
-    {
-        $prepared = parent::prepareConversationFetchOptions($fetchOptions);
-
-        if (!empty($fetchOptions[self::FETCH_OPTIONS_JOIN])) {
-            if ($fetchOptions[self::FETCH_OPTIONS_JOIN] & self::FETCH_OPTIONS_JOIN_FETCH_FIRST_MESSAGE_AVATAR) {
-                $prepared['selectFields'] .= ',
-						first_message_user.avatar_date AS first_message_avatar_date,
-						first_message_user.gender AS first_message_gender,
-						first_message_user.gravatar AS first_message_gravatar';
-                $prepared['joinTables'] .= '
-						LEFT JOIN xf_user AS first_message_user ON
-						(first_message_user.user_id = conversation_master.user_id)';
-            }
-        }
-
-        return $prepared;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Forum.php b/xenforo/library/bdApi/Extend/Model/Forum.php
deleted file mode 100755
index bd4d4c18..00000000
--- a/xenforo/library/bdApi/Extend/Model/Forum.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Forum extends XFCP_bdApi_Extend_Model_Forum
-{
-    const CONDITION_NODE_ID = 'bdApi_nodeId';
-    const GET_THREAD_PREFIXES = 'bdApi_getThreadPrefixes';
-
-    public function getForumById($id, array $fetchOptions = array())
-    {
-        $forums = $this->getForums(array(self::CONDITION_NODE_ID => $id), $fetchOptions);
-
-        return reset($forums);
-    }
-
-    public function getForumsByIds(array $forumIds, array $fetchOptions = array())
-    {
-        return $this->getForums(array(self::CONDITION_NODE_ID => $forumIds), $fetchOptions);
-    }
-
-    public function getForums(array $conditions = array(), array $fetchOptions = array())
-    {
-        $forums = parent::getForums($conditions, $fetchOptions);
-
-        if (!empty($forums)
-            && !empty($fetchOptions[self::GET_THREAD_PREFIXES])
-        ) {
-            /** @var bdApi_Extend_Model_ThreadPrefix $prefixModel */
-            $prefixModel = $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-            $prefixes = $prefixModel->bdApi_getUsablePrefixesByForums(array_keys($forums));
-
-            foreach ($forums as &$forumRef) {
-                $forumRef['prefixes'] = array();
-
-                if (isset($prefixes[$forumRef['node_id']])) {
-                    $forumRef['prefixes'] = $prefixes[$forumRef['node_id']];
-                }
-            }
-        }
-
-        return $forums;
-    }
-
-    public function prepareForumConditions(array $conditions, array &$fetchOptions)
-    {
-        $db = $this->_getDb();
-        $sqlConditions = array(parent::prepareForumConditions($conditions, $fetchOptions));
-
-        if (isset($conditions[self::CONDITION_NODE_ID])) {
-            if (is_array($conditions[self::CONDITION_NODE_ID])) {
-                if (count($conditions[self::CONDITION_NODE_ID]) > 0) {
-                    $sqlConditions[] = 'forum.node_id IN (' . $db->quote($conditions[self::CONDITION_NODE_ID]) . ')';
-                } else {
-                    $sqlConditions[] = '1=2';
-                }
-            } else {
-                $sqlConditions[] = 'forum.node_id = ' . $db->quote($conditions[self::CONDITION_NODE_ID]);
-            }
-        }
-
-        if (count($sqlConditions)) {
-            return $this->getConditionsForClause($sqlConditions);
-        } else {
-            return reset($sqlConditions);
-        }
-    }
-
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        $fetchOptions['watchUserId'] = XenForo_Visitor::getUserId();
-
-        if (!isset($fetchOptions[self::GET_THREAD_PREFIXES])) {
-            $fetchOptions[self::GET_THREAD_PREFIXES] = true;
-        }
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForForums(array $forums)
-    {
-        $data = array();
-
-        foreach ($forums as $key => $forum) {
-            $data[] = $this->prepareApiDataForForum($forum);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForForum(array $forum)
-    {
-        $publicKeys = array(
-            // xf_node
-            'node_id' => 'forum_id',
-            'title' => 'forum_title',
-            'description' => 'forum_description',
-
-            // xf_forum
-            'discussion_count' => 'forum_thread_count',
-            'message_count' => 'forum_post_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($forum, $publicKeys);
-
-        if (isset($forum['prefixes'])) {
-            /** @var bdApi_Extend_Model_ThreadPrefix $prefixModel */
-            $prefixModel = $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-            $data['forum_prefixes'] = $prefixModel->prepareApiDataForPrefixes($forum['prefixes']);
-            $data['thread_default_prefix_id'] = $forum['default_prefix_id'];
-            $data['thread_prefix_is_required'] = !empty($forum['require_prefix']);
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('forums', $forum),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('forums', $forum),
-            'sub-categories' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'categories',
-                array(),
-                array('parent_forum_id' => $forum['node_id'])
-            ),
-            'sub-forums' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'forums',
-                array(),
-                array('parent_forum_id' => $forum['node_id'])
-            ),
-            'threads' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'threads',
-                array(),
-                array('forum_id' => $forum['node_id'])
-            ),
-        );
-
-        $data['permissions'] = array(
-            'view' => $this->canViewForum($forum),
-            'edit' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-            'delete' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-            'create_thread' => $this->canPostThreadInForum($forum),
-            'upload_attachment' => $this->canUploadAndManageAttachment($forum),
-        );
-
-        if (XenForo_Application::$versionId > 1050000) {
-            /** @var XenForo_Model_Thread $threadModel */
-            $threadModel = $this->getModelFromCache('XenForo_Model_Thread');
-            $data['permissions']['tag_thread'] = $threadModel->canEditTags(null, $forum);
-        }
-
-        if (XenForo_Application::$versionId >= 1020000) {
-            $data['forum_is_followed'] = !empty($forum['forum_is_watched']);
-            $data['links']['followers'] = bdApi_Data_Helper_Core::safeBuildApiLink('forums/followers', $forum);
-            $data['permissions']['follow'] = $this->canWatchForum($forum);
-        }
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/ForumWatch.php b/xenforo/library/bdApi/Extend/Model/ForumWatch.php
deleted file mode 100644
index 871819ae..00000000
--- a/xenforo/library/bdApi/Extend/Model/ForumWatch.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_ForumWatch extends XFCP_bdApi_Extend_Model_ForumWatch
-{
-    public function bdApi_countUserForumWatchByUser($userId)
-    {
-        return $this->_getDb()->fetchOne('
-			SELECT COUNT(*)
-			FROM xf_forum_watch
-			WHERE user_id = ?
-		', $userId);
-    }
-
-    public function prepareApiDataForForumWatches(array $data, array $forumWatch)
-    {
-        $data['follow']['post'] = $forumWatch['notify_on'] == 'message';
-        $data['follow']['alert'] = !empty($forumWatch['send_alert']);
-        $data['follow']['email'] = !empty($forumWatch['send_email']);
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/LinkForum.php b/xenforo/library/bdApi/Extend/Model/LinkForum.php
deleted file mode 100644
index 84bf11fd..00000000
--- a/xenforo/library/bdApi/Extend/Model/LinkForum.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_LinkForum extends XFCP_bdApi_Extend_Model_LinkForum
-{
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForLinkForums(array $linkForums)
-    {
-        $data = array();
-
-        foreach ($linkForums as $key => $linkForum) {
-            $data[] = $this->prepareApiDataForLinkForum($linkForum);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForLinkForum(array $linkForum)
-    {
-        $publicKeys = array(
-            // xf_node
-            'node_id' => 'link_id',
-            'title' => 'link_title',
-            'description' => 'link_description',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($linkForum, $publicKeys);
-
-        if (!empty($linkForum['link_url'])) {
-            $linkUrl = $linkForum['link_url'];
-        } else {
-            $linkUrl = XenForo_Link::buildPublicLink('link-forums', $linkForum);
-        }
-
-        $data['links']['target'] = $linkUrl;
-
-        $data['permissions'] = array(
-            'view' => $this->canViewLinkForum($linkForum),
-            'edit' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-            'delete' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-        );
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Page.php b/xenforo/library/bdApi/Extend/Model/Page.php
deleted file mode 100755
index f232010a..00000000
--- a/xenforo/library/bdApi/Extend/Model/Page.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Page extends XFCP_bdApi_Extend_Model_Page
-{
-    public function prepareApiDataForPages(array $pages)
-    {
-        $data = array();
-
-        foreach ($pages as $key => $page) {
-            $data[] = $this->prepareApiDataForPage($page);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForPage(array $page)
-    {
-        $publicKeys = array(
-            // xf_node
-            'node_id' => 'page_id',
-            'title' => 'page_title',
-            'description' => 'page_description',
-
-            // xf_page
-            'view_count' => 'page_view_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($page, $publicKeys);
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('pages', $page),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('pages', $page),
-            'sub-pages' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'pages',
-                array(),
-                array('parent_page_id' => $page['node_id'])
-            ),
-        );
-
-        $data['permissions'] = array(
-            'view' => $this->canViewPage($page),
-            'edit' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-            'delete' => XenForo_Visitor::getInstance()->hasAdminPermission('node'),
-        );
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Poll.php b/xenforo/library/bdApi/Extend/Model/Poll.php
deleted file mode 100644
index 469421ab..00000000
--- a/xenforo/library/bdApi/Extend/Model/Poll.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Poll extends XFCP_bdApi_Extend_Model_Poll
-{
-    public function prepareApiDataForPoll(array $poll, $canVote)
-    {
-        $poll = $this->preparePoll($poll, $canVote);
-
-        $publicKeys = array(
-            // xf_poll
-            'poll_id' => 'poll_id',
-            'question' => 'poll_question',
-            'voter_count' => 'poll_vote_count',
-            'max_votes' => 'poll_max_votes',
-
-            // XenForo_Model_Poll::preparePoll
-            'open' => 'poll_is_open',
-            'hasVoted' => 'poll_is_voted',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($poll, $publicKeys);
-
-        $data['responses'] = array();
-        foreach ($poll['responses'] as $responseId => $response) {
-            $responseData = array(
-                'response_id' => $responseId,
-                'response_answer' => $response['response'],
-            );
-
-            if (!empty($data['poll_is_voted'])) {
-                $responseData['response_is_voted'] = $response['hasVoted'];
-            }
-
-            $data['responses'][] = $responseData;
-        }
-
-        $data['permissions'] = array(
-            'vote' => $poll['canVote'],
-            'result' => $poll['canViewResults'],
-        );
-
-        return $data;
-    }
-
-    public function bdApi_actionPostVotes(array $poll, bdApi_ControllerApi_Abstract $controller)
-    {
-        if (!$this->canVoteOnPoll($poll, $errorPhraseKey)) {
-            throw $controller->getErrorOrNoPermissionResponseException($errorPhraseKey);
-        }
-
-        $responseIds = $controller->getInput()->filterSingle(
-            'response_ids',
-            XenForo_Input::UINT,
-            array('array' => true)
-        );
-        $responseId = $controller->getInput()->filterSingle('response_id', XenForo_Input::UINT);
-        if ($responseId > 0) {
-            $responseIds[] = $responseId;
-            $responseIds = array_unique($responseIds);
-        }
-
-        if (empty($responseIds)) {
-            if (!$responseIds) {
-                return $controller->responseError(new XenForo_Phrase('bdapi_slash_poll_vote_requires_response_id'));
-            }
-        }
-
-        if ($poll['max_votes'] > 0
-            && count($responseIds) > $poll['max_votes']
-        ) {
-            return $controller->responseError(new XenForo_Phrase(
-                'you_may_select_up_to_x_choices',
-                array('max' => $poll['max_votes'])
-            ));
-        }
-
-        if ($this->voteOnPoll($poll['poll_id'], $responseIds)) {
-            return $controller->responseMessage(new XenForo_Phrase('changes_saved'));
-        } else {
-            return $controller->responseError(new XenForo_Phrase('unexpected_error_occurred'));
-        }
-    }
-
-    public function bdApi_actionGetResults(array $poll, $canVote, bdApi_ControllerApi_Abstract $controller)
-    {
-        $poll = $this->preparePoll($poll, $canVote);
-        $pollData = $this->prepareApiDataForPoll($poll, $canVote);
-
-        $results = array();
-        foreach ($pollData['responses'] as $responseData) {
-            $response = $poll['responses'][$responseData['response_id']];
-
-            $resultData = $responseData;
-            $resultData['response_vote_count'] = $response['response_vote_count'];
-
-            if (!empty($poll['public_votes'])) {
-                $resultData['voters'] = array();
-                if (!empty($response['voters'])) {
-                    $resultData['voters'] = array_values($response['voters']);
-                }
-            }
-
-            $results[] = $resultData;
-        }
-
-        $data = array(
-            'results' => $controller->_filterDataMany($results),
-        );
-
-        if (!$controller->_isFieldExcluded('poll')) {
-            $data['poll'] = $controller->_filterDataSingle($pollData, array('poll'));
-        }
-
-        return $controller->responseData('bdApi_ViewApi_Helper_Poll_Results', $data);
-    }
-
-    public function bdApi_getPollByContentIds($contentType, array $contentIds)
-    {
-        return $this->fetchAllKeyed('
-			SELECT *
-			FROM xf_poll
-			WHERE content_type = ?
-				AND content_id IN (' . $this->_getDb()->quote($contentIds) . ')
-		', 'content_id', $contentType);
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Post.php b/xenforo/library/bdApi/Extend/Model/Post.php
deleted file mode 100755
index 2c9663a2..00000000
--- a/xenforo/library/bdApi/Extend/Model/Post.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Post extends XFCP_bdApi_Extend_Model_Post
-{
-    const CONDITIONS_POST_ID = 'bdApi_postId';
-    const FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE = 'bdApi_postsInThread_orderReverse';
-    const FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT = 'bdApi_postsInThread_replyCount';
-    const FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE_DEFAULT = -1;
-
-    protected $_bdApi_postsInThread_orderReverse = self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE_DEFAULT;
-
-    public function bdApi_getLatestPostId()
-    {
-        return $this->_getDb()->fetchOne('
-            SELECT post_id
-            FROM xf_post
-            ORDER BY post_id DESC
-            LIMIT 1
-        ');
-    }
-
-    public function bdApi_getPosts(array $conditions = array(), array $fetchOptions = array())
-    {
-        $stateLimit = $this->prepareStateLimitFromConditions($fetchOptions, 'post');
-        $postIdCondition = '';
-        if (isset($conditions[self::CONDITIONS_POST_ID])) {
-            $postIdCondition = 'AND ' .
-                $this->getCutOffCondition('post.post_id', $conditions[self::CONDITIONS_POST_ID]);
-        }
-
-        $orderClause = $this->bdApi_preparePostOrderOptions($fetchOptions);
-        $joinOptions = $this->preparePostJoinOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        return $this->fetchAllKeyed($this->limitQueryResults("
-			SELECT post.*
-				$joinOptions[selectFields]
-			FROM xf_post AS post
-			    $joinOptions[joinTables]
-			WHERE ($stateLimit $postIdCondition)
-                $orderClause
-		", $limitOptions['limit'], $limitOptions['offset']), 'post_id');
-    }
-
-    public function bdApi_preparePostOrderOptions(array $fetchOptions, $defaultOrderSql = '')
-    {
-        $choices = array('post_date' => 'post.post_date');
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-
-    public function getPostsInThread($threadId, array $fetchOptions = array())
-    {
-        if (!empty($fetchOptions[self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE])
-            && isset($fetchOptions[self::FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT])
-        ) {
-            $this->_bdApi_postsInThread_orderReverse = $fetchOptions[self::FETCH_OPTIONS_POSTS_IN_THREAD_REPLY_COUNT];
-        }
-
-        $posts = parent::getPostsInThread($threadId, $fetchOptions);
-
-        if (!empty($fetchOptions[self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE])) {
-            $this->_bdApi_postsInThread_orderReverse = self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE_DEFAULT;
-        }
-
-        return $posts;
-    }
-
-    public function addPositionLimit($table, $limit, $offset = 0, $column = 'position')
-    {
-        if ($this->_bdApi_postsInThread_orderReverse > self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE_DEFAULT) {
-            if ($limit > 0) {
-                $columnRef = ($table ? "$table.$column" : $column);
-                $rangeUpper = $this->_bdApi_postsInThread_orderReverse - $offset;
-                $rangeLower = $rangeUpper - $limit;
-
-                return " AND ($columnRef > " . $rangeLower . " AND $columnRef <= " . $rangeUpper . ') ';
-            }
-        }
-
-        return parent::addPositionLimit($table, $limit, $offset, $column);
-    }
-
-    public function fetchAllKeyed($sql, $key, $bind = array(), $nullPrefix = '')
-    {
-        if ($this->_bdApi_postsInThread_orderReverse > self::FETCH_OPTIONS_POSTS_IN_THREAD_ORDER_REVERSE_DEFAULT) {
-            $sql = str_replace(
-                'ORDER BY post.position ASC, post.post_date ASC',
-                'ORDER BY post.position DESC, post.post_date DESC',
-                $sql,
-                $count
-            );
-
-            if ($count !== 1) {
-                throw new XenForo_Exception('Fatal Conflict: Could not change ORDER BY statement');
-            }
-        }
-
-        return parent::fetchAllKeyed($sql, $key, $bind, $nullPrefix);
-    }
-
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        $visitor = XenForo_Visitor::getInstance();
-
-        if (empty($fetchOptions['join'])) {
-            $fetchOptions['join'] = XenForo_Model_Post::FETCH_USER | XenForo_Model_Post::FETCH_USER_PROFILE;
-        } else {
-            $fetchOptions['join'] |= XenForo_Model_Post::FETCH_USER;
-            $fetchOptions['join'] |= XenForo_Model_Post::FETCH_USER_PROFILE;
-        }
-
-        $fetchOptions['likeUserId'] = $visitor->get('user_id');
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForPosts(array $posts, array $thread, array $forum)
-    {
-        $data = array();
-
-        foreach ($posts as $key => $post) {
-            $data[] = $this->prepareApiDataForPost($post, $thread, $forum);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForPost(array $post, array $thread, array $forum)
-    {
-        $visitor = XenForo_Visitor::getInstance();
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        /* @var $forumModel XenForo_Model_Forum */
-        $forumModel = $this->getModelFromCache('XenForo_Model_Forum');
-
-        $hasAdminScope = (!empty($session) && $session->checkScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM));
-        $isAdminRequest = ($hasAdminScope && $visitor->hasAdminPermission('thread'));
-
-        $post = $this->preparePost($post, $thread, $forum);
-
-        $attachments = array();
-        if (!empty($post['attachments'])) {
-            $attachments = $post['attachments'];
-        }
-
-        if (!isset($post['messageHtml'])) {
-            $bbCodeOptions = array(
-                'states' => array(
-                    'viewAttachments' => $this->canViewAttachmentOnPost($post, $thread, $forum),
-                ),
-            );
-            $post['messageHtml'] = bdApi_Data_Helper_Message::getHtml($post, $bbCodeOptions);
-        }
-        if (isset($post['message'])) {
-            $post['messagePlainText'] = bdApi_Data_Helper_Message::getPlainText($post['message']);
-        }
-
-        if (isset($post['signature'])) {
-            $post['signaturePlainText'] = bdApi_Data_Helper_Message::getPlainText($post['signature']);
-        }
-
-        $publicKeys = array(
-            // xf_post
-            'post_id' => 'post_id',
-            'thread_id' => 'thread_id',
-            'user_id' => 'poster_user_id',
-            'username' => 'poster_username',
-            'post_date' => 'post_create_date',
-            'message' => 'post_body',
-            'messageHtml' => 'post_body_html',
-            'messagePlainText' => 'post_body_plain_text',
-            'signature' => 'signature',
-            'signatureHtml' => 'signature_html',
-            'signaturePlainText' => 'signature_plain_text',
-            'likes' => 'post_like_count',
-            'attach_count' => 'post_attachment_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($post, $publicKeys);
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($post['user_id']);
-
-        if (isset($post['message_state'])) {
-            switch ($post['message_state']) {
-                case 'visible':
-                    $data['post_is_published'] = true;
-                    $data['post_is_deleted'] = false;
-                    break;
-                case 'moderated':
-                    $data['post_is_published'] = false;
-                    $data['post_is_deleted'] = false;
-                    break;
-                case 'deleted':
-                    $data['post_is_published'] = false;
-                    $data['post_is_deleted'] = true;
-                    break;
-            }
-        }
-
-        if (isset($post['last_edit_date'])) {
-            // since XenForo 1.2.0
-            if ($post['last_edit_date'] > 0) {
-                $data['post_update_date'] = $post['last_edit_date'];
-            } else {
-                // by default, last_edit_date = 0
-                $data['post_update_date'] = $post['post_date'];
-            }
-        }
-
-        if (isset($thread['first_post_id'])) {
-            $data['post_is_first_post'] = $post['post_id'] === $thread['first_post_id'];
-        }
-
-        if (isset($post['like_date'])) {
-            $data['post_is_liked'] = !empty($post['like_date']);
-        }
-
-        $trackPostOrigin = bdApi_Option::get('trackPostOrigin');
-        if (!empty($trackPostOrigin)
-            && isset($post[$trackPostOrigin])
-            && (
-                (
-                    $session->getOAuthClientId() === $post[$trackPostOrigin]
-                    && $post['user_id'] == $visitor->get('user_id')
-                )
-                || $isAdminRequest
-            )
-        ) {
-            $data['post_origin'] = $post[$trackPostOrigin];
-        }
-
-        if (!empty($attachments)) {
-            $data['attachments'] = $this->prepareApiDataForAttachments($attachments, $post, $thread, $forum);
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('posts', $post),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('posts', $post),
-            'thread' => bdApi_Data_Helper_Core::safeBuildApiLink('threads', $post),
-            'poster' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $post),
-            'likes' => bdApi_Data_Helper_Core::safeBuildApiLink('posts/likes', $post),
-            'report' => bdApi_Data_Helper_Core::safeBuildApiLink('posts/report', $post),
-            'attachments' => bdApi_Data_Helper_Core::safeBuildApiLink('posts/attachments', $post),
-            'poster_avatar' => XenForo_Template_Helper_Core::callHelper('avatar', array(
-                $post,
-                'm',
-                false,
-                true
-            )),
-        );
-
-        if (!empty($post['attach_count'])) {
-            $data['links']['attachments'] = bdApi_Data_Helper_Core::safeBuildApiLink('posts/attachments', $post);
-        }
-
-        $data['permissions'] = array(
-            'view' => $this->canViewPost($post, $thread, $forum),
-            'edit' => $this->canEditPost($post, $thread, $forum),
-            'delete' => $this->canDeletePost($post, $thread, $forum),
-            'reply' => $this->_getThreadModel()->canReplyToThread($thread, $forum),
-            'like' => $this->canLikePost($post, $thread, $forum),
-            'report' => $this->canReportPost($post, $thread, $forum),
-            'upload_attachment' => $this->canEditPost($post, $thread, $forum)
-                && $forumModel->canUploadAndManageAttachment($forum),
-        );
-
-        return $data;
-    }
-
-    public function prepareApiDataForAttachments(
-        array $attachments,
-        array $post,
-        array $thread,
-        array $forum,
-        $tempHash = ''
-    ) {
-        $data = array();
-
-        foreach ($attachments as $key => $attachment) {
-            $data[] = $this->prepareApiDataForAttachment($attachment, $post, $thread, $forum, $tempHash);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForAttachment(
-        array $attachment,
-        array $post,
-        array $thread,
-        array $forum,
-        $tempHash = ''
-    ) {
-        /** @var bdApi_Extend_Model_Attachment $attachmentModel */
-        $attachmentModel = $this->getModelFromCache('XenForo_Model_Attachment');
-        $data = $attachmentModel->prepareApiDataForAttachment($attachment);
-
-        if (!empty($post['post_id'])) {
-            $data['post_id'] = $post['post_id'];
-            $data['links'] += array(
-                'post' => bdApi_Data_Helper_Core::safeBuildApiLink('posts', $post),
-            );
-        }
-
-        $data['permissions'] = array(
-            'view' => !empty($tempHash)
-                ? $attachmentModel->canViewAttachment($attachment, $tempHash)
-                : $this->canViewAttachmentOnPost($post, $thread, $forum),
-            'delete' => !empty($tempHash)
-                ? $attachmentModel->canDeleteAttachment($attachment, $tempHash)
-                : $this->canEditPost($post, $thread, $forum),
-        );
-
-        if (isset($post['messageHtml'])) {
-            $data['attachment_is_inserted'] = empty($post['attachments'][$attachment['attachment_id']]);
-        }
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/ProfilePost.php b/xenforo/library/bdApi/Extend/Model/ProfilePost.php
deleted file mode 100644
index b981c49d..00000000
--- a/xenforo/library/bdApi/Extend/Model/ProfilePost.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_ProfilePost extends XFCP_bdApi_Extend_Model_ProfilePost
-{
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        if (empty($fetchOptions['join'])) {
-            $fetchOptions['join'] = 0;
-        }
-
-        $fetchOptions['join'] |= XenForo_Model_ProfilePost::FETCH_USER_POSTER;
-
-        $fetchOptions['likeUserId'] = XenForo_Visitor::getUserId();
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForProfilePosts(array $profilePosts, array $user)
-    {
-        $data = array();
-
-        foreach ($profilePosts as $key => $profilePost) {
-            $data[] = $this->prepareApiDataForProfilePost($profilePost, $user);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForProfilePost(array $profilePost, array $user)
-    {
-        $profilePost = $this->prepareProfilePost($profilePost, $user);
-
-        $publicKeys = array(
-            // xf_profile_post
-            'profile_post_id' => 'profile_post_id',
-            'profile_user_id' => 'timeline_user_id',
-            'user_id' => 'poster_user_id',
-            'username' => 'poster_username',
-            'post_date' => 'post_create_date',
-            'message' => 'post_body',
-            'likes' => 'post_like_count',
-            'comment_count' => 'post_comment_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($profilePost, $publicKeys);
-        $data['timeline_username'] = $user['username'];
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($profilePost['user_id']);
-
-        if (isset($profilePost['message_state'])) {
-            switch ($profilePost['message_state']) {
-                case 'visible':
-                    $data['post_is_published'] = true;
-                    $data['post_is_deleted'] = false;
-                    break;
-                case 'moderated':
-                    $data['post_is_published'] = false;
-                    $data['post_is_deleted'] = false;
-                    break;
-                case 'deleted':
-                    $data['post_is_published'] = false;
-                    $data['post_is_deleted'] = true;
-                    break;
-            }
-        }
-
-        if (isset($profilePost['like_date'])) {
-            $data['post_is_liked'] = !empty($profilePost['like_date']);
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('profile-posts', $profilePost),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('profile-posts', $profilePost),
-            'timeline' => bdApi_Data_Helper_Core::safeBuildApiLink('users/timeline', $user),
-            'timeline_user' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $user),
-            'poster' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $profilePost),
-            'likes' => bdApi_Data_Helper_Core::safeBuildApiLink('profile-posts/likes', $profilePost),
-            'comments' => bdApi_Data_Helper_Core::safeBuildApiLink('profile-posts/comments', $profilePost),
-            'report' => bdApi_Data_Helper_Core::safeBuildApiLink('profile-posts/report', $profilePost),
-            'poster_avatar' => XenForo_Template_Helper_Core::callHelper('avatar', array(
-                $profilePost,
-                'm',
-                false,
-                true
-            )),
-        );
-
-        $data['permissions'] = array(
-            'view' => $this->canViewProfilePost($profilePost, $user),
-            'edit' => $this->canEditProfilePost($profilePost, $user),
-            'delete' => $this->canDeleteProfilePost($profilePost, $user),
-            'like' => $this->canLikeProfilePost($profilePost, $user),
-            'comment' => $this->canCommentOnProfilePost($profilePost, $user),
-            'report' => $this->canReportProfilePost($profilePost, $user),
-        );
-
-        return $data;
-    }
-
-    public function getCommentFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        if (empty($fetchOptions['join'])) {
-            $fetchOptions['join'] = 0;
-        }
-
-        $fetchOptions['join'] |= XenForo_Model_ProfilePost::FETCH_COMMENT_USER;
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForComments(array $comments, array $profilePost, array $user)
-    {
-        $data = array();
-
-        foreach ($comments as $key => $comment) {
-            $data[] = $this->prepareApiDataForComment($comment, $profilePost, $user);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForComment(array $comment, array $profilePost, array $user)
-    {
-        $comment = $this->prepareProfilePostComment($comment, $profilePost, $user);
-
-        $publicKeys = array(
-            // xf_profile_post_comment
-            'profile_post_comment_id' => 'comment_id',
-            'profile_post_id' => 'profile_post_id',
-            'user_id' => 'comment_user_id',
-            'username' => 'comment_username',
-            'comment_date' => 'comment_create_date',
-            'message' => 'comment_body',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($comment, $publicKeys);
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($comment['user_id']);
-        $data['timeline_user_id'] = $profilePost['profile_user_id'];
-
-        $data['links'] = array(
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'profile-posts/comments',
-                $profilePost,
-                array('comment_id' => $comment['profile_post_comment_id'])
-            ),
-            'profile_post' => bdApi_Data_Helper_Core::safeBuildApiLink('profile-posts', $profilePost),
-            'timeline' => bdApi_Data_Helper_Core::safeBuildApiLink('users/timeline', $user),
-            'timeline_user' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $user),
-            'poster' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $comment),
-            'poster_avatar' => XenForo_Template_Helper_Core::callHelper('avatar', array(
-                $comment,
-                'm',
-                false,
-                true
-            )),
-        );
-
-        $data['permissions'] = array(
-            'view' => $this->canViewProfilePost($profilePost, $user),
-            'delete' => $this->canDeleteProfilePostComment($comment, $profilePost, $user),
-        );
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Search.php b/xenforo/library/bdApi/Extend/Model/Search.php
deleted file mode 100644
index 78524af8..00000000
--- a/xenforo/library/bdApi/Extend/Model/Search.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Search extends XFCP_bdApi_Extend_Model_Search
-{
-    public function prepareApiDataForSearchResults(array $results)
-    {
-        $data = array();
-
-        foreach ($results as $key => $result) {
-            if ($this->checkApiSupportsContentType($result[XenForo_Model_Search::CONTENT_TYPE])) {
-                $data[$key] = array(
-                    'content_type' => $result[XenForo_Model_Search::CONTENT_TYPE],
-                    'content_id' => $result[XenForo_Model_Search::CONTENT_ID],
-                );
-
-                if (count($result) > 2) {
-                    foreach ($result as $_key => $_value) {
-                        if ($_key === XenForo_Model_Search::CONTENT_TYPE) {
-                            continue;
-                        }
-                        if ($_key === XenForo_Model_Search::CONTENT_ID) {
-                            continue;
-                        }
-
-                        $data[$key][$_key] = $_value;
-                    }
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    public function checkApiSupportsContentType($contentType)
-    {
-        switch ($contentType) {
-            case 'api_client_content':
-            case 'thread':
-            case 'post':
-            case 'profile_post':
-            case 'user':
-                return true;
-        }
-
-        return false;
-    }
-
-    public function prepareApiContentDataForSearch(array $preparedResults)
-    {
-        $contentIdsByType = array();
-        $data = array();
-
-        foreach ($preparedResults as $key => $preparedResult) {
-            $contentIdsByType[$preparedResult['content_type']][$preparedResult['content_id']] = $key;
-        }
-
-        /* @var $logModel bdApi_Model_Log */
-        $logModel = $this->getModelFromCache('bdApi_Model_Log');
-        $logModel->pauseLogging();
-
-        foreach ($contentIdsByType as $contentType => $contentIds) {
-            switch ($contentType) {
-                case 'api_client_content':
-                    $this->_prepareApiContentDataForSearch_doApiClientContents($contentIds, $preparedResults, $data);
-                    break;
-                case 'thread':
-                    $this->_prepareApiContentDataForSearch_doThreads($contentIds, $preparedResults, $data);
-                    break;
-                case 'post':
-                    $this->_prepareApiContentDataForSearch_doPosts($contentIds, $preparedResults, $data);
-                    break;
-                case 'profile_post':
-                    $this->_prepareApiContentDataForSearch_doProfilePosts($contentIds, $preparedResults, $data);
-                    break;
-                case 'user':
-                    $this->_prepareApiContentDataForSearch_doUsers($contentIds, $preparedResults, $data);
-                    break;
-                default:
-                    $this->_prepareApiContentDataForSearch_doCustomContents(
-                        $contentType,
-                        $contentIds,
-                        $preparedResults,
-                        $data
-                    );
-            }
-        }
-
-        $logModel->resumeLogging();
-
-        ksort($data);
-
-        return $data;
-    }
-
-    protected function _prepareApiContentDataForSearch_doApiClientContents(
-        array $clientContentIds,
-        array $preparedResults,
-        array &$data
-    ) {
-        if (empty($clientContentIds)) {
-            return;
-        }
-
-        /** @var bdApi_Model_ClientContent $clientContentModel */
-        $clientContentModel = $this->getModelFromCache('bdApi_Model_ClientContent');
-        $clientContents = $clientContentModel->getClientContents(array(
-            'client_content_id' => array_keys($clientContentIds),
-        ));
-
-        foreach ($clientContents as $clientContentId => $clientContent) {
-            if (!isset($clientContentIds[$clientContentId])) {
-                // key not found?!
-                continue;
-            }
-
-            $key = $clientContentIds[$clientContentId];
-            $data[$key] = array_merge(
-                $preparedResults[$key],
-                array_intersect_key(
-                    $clientContent,
-                    array_flip(array(
-                        'title',
-                        'body',
-                        'date',
-                        'link',
-                        'user_id',
-                    ))
-                )
-            );
-        }
-    }
-
-    protected function _prepareApiContentDataForSearch_doThreads(array $threadIds, array $preparedResults, array &$data)
-    {
-        if (empty($threadIds)) {
-            return;
-        }
-
-        $dataJobParams = array();
-        $dataJobParams['thread_ids'] = implode(',', array_keys($threadIds));
-        $dataJobParams['fields_filter_prefix'] = 'content.';
-        $dataJob = bdApi_Data_Helper_Batch::doJob('GET', 'threads', $dataJobParams);
-
-        if (isset($dataJob['_job_response'])
-            && !empty($dataJob['_job_response']->params['threads'])
-        ) {
-            foreach ($dataJob['_job_response']->params['threads'] as $thread) {
-                if (empty($thread['thread_id'])
-                    || !isset($threadIds[$thread['thread_id']])
-                ) {
-                    // key not found?!
-                    continue;
-                }
-
-                $key = $threadIds[$thread['thread_id']];
-                $data[$key] = array_merge($preparedResults[$key], $thread);
-            }
-        }
-    }
-
-    protected function _prepareApiContentDataForSearch_doPosts(array $postIds, array $preparedResults, array &$data)
-    {
-        if (empty($postIds)) {
-            return;
-        }
-
-        $dataJobParams = array();
-        $dataJobParams['post_ids'] = implode(',', array_keys($postIds));
-        $dataJobParams['fields_filter_prefix'] = 'content.';
-        $dataJob = bdApi_Data_Helper_Batch::doJob('GET', 'posts', $dataJobParams);
-
-        if (isset($dataJob['_job_response'])
-            && !empty($dataJob['_job_response']->params['posts'])
-        ) {
-            foreach ($dataJob['_job_response']->params['posts'] as $post) {
-                if (empty($post['post_id'])
-                    || !isset($postIds[$post['post_id']])
-                ) {
-                    // key not found?!
-                    continue;
-                }
-
-                $key = $postIds[$post['post_id']];
-                if (empty($post['post_is_first_post'])
-                    || empty($post['thread'])
-                    || empty($post['thread']['thread_id'])
-                ) {
-                    // the found post is a reply
-                    $data[$key] = array_merge($preparedResults[$key], $post);
-                } else {
-                    // the found post is a first post, return as thread instead
-                    $thread = $post['thread'];
-                    unset($post['thread']);
-                    $thread['first_post'] = $post;
-
-                    $data[$key] = array_merge(
-                        $preparedResults[$key],
-                        array(
-                            'content_type' => 'thread',
-                            'content_id' => $thread['thread_id'],
-                            'search_result_content_type' => 'post',
-                            'search_result_content_id' => $post['post_id'],
-                        ),
-                        $thread
-                    );
-                }
-            }
-        }
-    }
-
-    protected function _prepareApiContentDataForSearch_doProfilePosts(
-        array $profilePostIds,
-        array $preparedResults,
-        array &$data
-    ) {
-        if (empty($profilePostIds)) {
-            return;
-        }
-
-        $dataJobParams = array();
-        $dataJobParams['profile_post_ids'] = implode(',', array_keys($profilePostIds));
-        $dataJobParams['fields_filter_prefix'] = 'content.';
-        $dataJob = bdApi_Data_Helper_Batch::doJob('GET', 'profile-posts', $dataJobParams);
-
-        if (isset($dataJob['_job_response'])
-            && !empty($dataJob['_job_response']->params['profile_posts'])
-        ) {
-            foreach ($dataJob['_job_response']->params['profile_posts'] as $profilePost) {
-                if (empty($profilePost['profile_post_id'])
-                    || !isset($profilePostIds[$profilePost['profile_post_id']])
-                ) {
-                    // key not found?!
-                    continue;
-                }
-
-                $key = $profilePostIds[$profilePost['profile_post_id']];
-                $data[$key] = array_merge($preparedResults[$key], $profilePost);
-            }
-        }
-    }
-
-    protected function _prepareApiContentDataForSearch_doUsers(array $userIds, array $preparedResults, array &$data)
-    {
-        if (empty($userIds)) {
-            return;
-        }
-
-        $dataJobParams = array();
-        $dataJobParams['user_ids'] = implode(',', array_keys($userIds));
-        $dataJobParams['fields_filter_prefix'] = 'content.';
-        $dataJob = bdApi_Data_Helper_Batch::doJob('GET', 'users', $dataJobParams);
-
-        if (isset($dataJob['_job_response'])
-            && !empty($dataJob['_job_response']->params['users'])
-        ) {
-            foreach ($dataJob['_job_response']->params['users'] as $user) {
-                if (empty($user['user_id'])
-                    || !isset($userIds[$user['user_id']])
-                ) {
-                    // key not found?!
-                    continue;
-                }
-
-                $key = $userIds[$user['user_id']];
-                $data[$key] = array_merge($preparedResults[$key], $user);
-            }
-        }
-    }
-
-    protected function _prepareApiContentDataForSearch_doCustomContents(
-        $contentType,
-        array $contentIds,
-        array $preparedResults,
-        array &$data
-    ) {
-        return;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Tag.php b/xenforo/library/bdApi/Extend/Model/Tag.php
deleted file mode 100644
index 1bfe33df..00000000
--- a/xenforo/library/bdApi/Extend/Model/Tag.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Tag extends XFCP_bdApi_Extend_Model_Tag
-{
-    public function bdApi_getLatestTagId()
-    {
-        return $this->_getDb()->fetchOne('
-            SELECT tag_id
-            FROM xf_tag
-            ORDER BY tag_id DESC
-            LIMIT 1
-        ');
-    }
-
-    public function bdApi_getTagsByIds(array $ids)
-    {
-        if (count($ids) === 1) {
-            $tag = $this->getTagById(reset($ids));
-
-            if (!empty($tag)) {
-                return array($tag['tag_id'] => $tag);
-            }
-        } else {
-            return $this->fetchAllKeyed('
-                SELECT *
-                FROM xf_tag
-                WHERE tag_id IN (' . $this->_getDb()->quote($ids) . ')
-            ', 'tag_id');
-        }
-
-        return array();
-    }
-
-    public function bdApi_getTagsByIdRange($start, $end)
-    {
-        return $this->fetchAllKeyed('
-            SELECT *
-            FROM xf_tag
-            WHERE tag_id BETWEEN ? AND ?
-        ', 'tag_id', array($start, $end));
-    }
-
-    public function prepareApiDataForTags(array $tags)
-    {
-        $data = array();
-
-        foreach ($tags as $tagId => $tag) {
-            $data[strval($tagId)] = $tag['tag'];
-        }
-
-        // TODO: include tag data like content count / view count / etc.?
-
-        return $data;
-    }
-
-    public function prepareApiDataForTag(array $tag)
-    {
-        $publicKeys = array(
-            // xf_tag
-            'tag_id' => 'tag_id',
-            'tag' => 'tag_text',
-            'use_count' => 'tag_use_count',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($tag, $publicKeys);
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('tags', $tag),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('tags', $tag),
-        );
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/Thread.php b/xenforo/library/bdApi/Extend/Model/Thread.php
deleted file mode 100755
index af66d725..00000000
--- a/xenforo/library/bdApi/Extend/Model/Thread.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_Thread extends XFCP_bdApi_Extend_Model_Thread
-{
-    const CONDITIONS_THREAD_ID = 'bdApi_threadId';
-    const CONDITIONS_TAG_ID = 'bdApi_tagId';
-    const FETCH_OPTION_JOIN_TAG_CONTENT = 'bdApi_joinTagContent';
-
-    protected $_bdApi_polls = array();
-    protected $_bdApi_limitQueryResults_nodeId = false;
-
-    public function bdApi_getLatestThreadId()
-    {
-        return $this->_getDb()->fetchOne('
-            SELECT thread_id
-            FROM xf_thread
-            ORDER BY thread_id DESC
-            LIMIT 1
-        ');
-    }
-
-    public function bdApi_getLatestPostIds(array $threadIds, $limit = null)
-    {
-        if (count($threadIds) == 0) {
-            return array();
-        }
-
-        if ($limit === null) {
-            $limit = 3;
-        }
-        $limit = intval($limit);
-        if ($limit === 0) {
-            return array();
-        }
-
-        $postIds = $this->_getDb()->fetchCol('
-            SELECT post_id
-            FROM `xf_post` AS post
-            INNER JOIN `xf_thread` AS thread
-            ON (thread.thread_id = post.thread_id)
-            WHERE post.thread_id IN (' . $this->_getDb()->quote($threadIds) . ')
-                AND position > IF(thread.reply_count >= ' . $limit . ',
-                    thread.reply_count - ' . $limit . ', 0)
-        ');
-
-        return $postIds;
-    }
-
-    public function prepareThreadConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array(parent::prepareThreadConditions($conditions, $fetchOptions));
-
-        if (isset($conditions[self::CONDITIONS_THREAD_ID])) {
-            $sqlConditions[] = $this->getCutOffCondition('thread.thread_id', $conditions[self::CONDITIONS_THREAD_ID]);
-        }
-
-        if (XenForo_Application::$versionId > 1050000
-            && isset($conditions[self::CONDITIONS_TAG_ID])
-        ) {
-            $sqlConditions[] = 'tag_content.tag_id = ' . intval($conditions[self::CONDITIONS_TAG_ID]);
-            $fetchOptions[self::FETCH_OPTION_JOIN_TAG_CONTENT] = true;
-        }
-
-        if (count($sqlConditions) > 1) {
-            return $this->getConditionsForClause($sqlConditions);
-        } else {
-            return $sqlConditions[0];
-        }
-    }
-
-    public function prepareThreadFetchOptions(array $fetchOptions)
-    {
-        $prepared = parent::prepareThreadFetchOptions($fetchOptions);
-
-        if (XenForo_Application::$versionId > 1050000
-            && !empty($fetchOptions[self::FETCH_OPTION_JOIN_TAG_CONTENT])
-        ) {
-            $prepared['joinTables'] .= '
-					LEFT JOIN xf_tag_content AS tag_content
-						ON (tag_content.content_type = "thread"
-						AND tag_content.content_id = thread.thread_id)';
-        }
-
-        return $prepared;
-    }
-
-
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        if (empty($fetchOptions['join'])) {
-            $fetchOptions['join'] = XenForo_Model_Thread::FETCH_USER;
-        } else {
-            $fetchOptions['join'] |= XenForo_Model_Thread::FETCH_USER;
-        }
-
-        $fetchOptions['watchUserId'] = XenForo_Visitor::getUserId();
-        $fetchOptions['replyBanUserId'] = XenForo_Visitor::getUserId();
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForThreads(array $threads, array $forum, array $firstPosts)
-    {
-        $data = array();
-
-        foreach ($threads as $key => $thread) {
-            $firstPost = array();
-            if (isset($firstPosts[$thread['first_post_id']])) {
-                $firstPost = $firstPosts[$thread['first_post_id']];
-            }
-
-            $data[] = $this->prepareApiDataForThread($thread, $forum, $firstPost);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForThread(array $thread, array $forum, array $firstPost)
-    {
-        $thread = $this->prepareThread($thread, $forum);
-
-        $publicKeys = array(
-            // xf_thread
-            'thread_id' => 'thread_id',
-            'node_id' => 'forum_id',
-            'title' => 'thread_title',
-            'view_count' => 'thread_view_count',
-            'user_id' => 'creator_user_id',
-            'username' => 'creator_username',
-            'post_date' => 'thread_create_date',
-            'last_post_date' => 'thread_update_date',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($thread, $publicKeys);
-
-        $data['user_is_ignored'] = XenForo_Visitor::getInstance()->isIgnoring($thread['user_id']);
-
-        if (isset($thread['reply_count'])) {
-            $data['thread_post_count'] = $thread['reply_count'] + 1;
-        }
-
-        if (isset($thread['sticky']) AND isset($thread['discussion_state'])) {
-            switch ($thread['discussion_state']) {
-                case 'visible':
-                    $data['thread_is_published'] = true;
-                    $data['thread_is_deleted'] = false;
-                    $data['thread_is_sticky'] = empty($thread['sticky']) ? false : true;
-                    break;
-                case 'moderated':
-                    $data['thread_is_published'] = false;
-                    $data['thread_is_deleted'] = false;
-                    $data['thread_is_sticky'] = false;
-                    break;
-                case 'deleted':
-                    $data['thread_is_published'] = false;
-                    $data['thread_is_deleted'] = true;
-                    $data['thread_is_sticky'] = false;
-                    break;
-            }
-        }
-
-        $data['thread_is_followed'] = !empty($thread['thread_is_watched']);
-
-        if (!empty($firstPost)) {
-            /* @var $postModel bdApi_Extend_Model_Post */
-            $postModel = $this->_getPostModel();
-            $data['first_post'] = $postModel->prepareApiDataForPost($firstPost, $thread, $forum);
-        }
-
-        $data['thread_prefixes'] = array();
-        if (!empty($thread['prefix_id'])) {
-            /** @var bdApi_Extend_Model_ThreadPrefix $prefixModel */
-            $prefixModel = $this->getModelFromCache('XenForo_Model_ThreadPrefix');
-            $data['thread_prefixes'][] = $prefixModel->prepareApiDataForPrefix($thread);
-        }
-
-        if ($thread['discussion_type'] === 'poll'
-            && isset($this->_bdApi_polls[$thread['thread_id']])
-        ) {
-            $poll = $this->_bdApi_polls[$thread['thread_id']];
-            /** @var bdApi_Extend_Model_Poll $pollModel */
-            $pollModel = $this->getModelFromCache('XenForo_Model_Poll');
-            $data['poll'] = $pollModel->prepareApiDataForPoll($poll, $this->canVoteOnPoll($poll, $thread, $forum));
-            $data['poll']['links']['vote'] = bdApi_Data_Helper_Core::safeBuildApiLink('threads/poll/votes', $thread);
-            $data['poll']['links']['results'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'threads/poll/results',
-                $thread
-            );
-        }
-
-        if (XenForo_Application::$versionId > 1050000
-            && isset($thread['tags'])
-        ) {
-            $tags = @unserialize($thread['tags']);
-
-            if (is_array($tags)) {
-                /** @var bdApi_Extend_Model_Tag $tagModel */
-                $tagModel = $this->getModelFromCache('XenForo_Model_Tag');
-                $data['thread_tags'] = $tagModel->prepareApiDataForTags($tags);
-            }
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('threads', $thread),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('threads', $thread),
-            'followers' => bdApi_Data_Helper_Core::safeBuildApiLink('threads/followers', $thread),
-            'forum' => bdApi_Data_Helper_Core::safeBuildApiLink('forums', $thread),
-            'posts' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'posts',
-                array(),
-                array('thread_id' => $thread['thread_id'])
-            ),
-            'first_poster' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $thread),
-            'first_poster_avatar' => XenForo_Template_Helper_Core::callHelper(
-                'avatar',
-                array($thread, 'm', false, true)
-            ),
-            'first_post' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'posts',
-                array('post_id' => $thread['first_post_id'])
-            ),
-        );
-
-        if ($thread['last_post_user_id'] != $thread['user_id']) {
-            $data['links']['last_poster'] = bdApi_Data_Helper_Core::safeBuildApiLink('users', array(
-                'user_id' => $thread['last_post_user_id'],
-                'username' => $thread['last_post_username']
-            ));
-        }
-
-        if ($thread['last_post_id'] != $thread['first_post_id']) {
-            $data['links']['last_post'] = bdApi_Data_Helper_Core::safeBuildApiLink(
-                'posts',
-                array('post_id' => $thread['last_post_id'])
-            );
-        }
-
-        $data['permissions'] = array(
-            'view' => $this->canViewThread($thread, $forum),
-            'delete' => $this->canDeleteThread($thread, $forum),
-            'follow' => $this->canWatchThread($thread, $forum),
-            'post' => $this->canReplyToThread($thread, $forum),
-            'upload_attachment' => $this->_getForumModel()->canUploadAndManageAttachment($forum),
-        );
-
-        if (!empty($firstPost)) {
-            $data['permissions']['edit'] = $this->_getPostModel()->canEditPost($firstPost, $thread, $forum);
-
-            if (!empty($data['permissions']['edit'])) {
-                $data['permissions']['edit_title'] = $this->canEditThread($thread, $forum);
-
-                if (XenForo_Application::$versionId > 1050000) {
-                    $data['permissions']['edit_tags'] = $this->canEditTags($thread, $forum);
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    public function bdApi_getUnreadThreadIdsInForum($userId, $forumId, array $fetchOptions = array())
-    {
-        $this->_bdApi_limitQueryResults_nodeId = $forumId;
-        $threadIds = $this->getUnreadThreadIds($userId, $fetchOptions);
-        $this->_bdApi_limitQueryResults_nodeId = false;
-
-        return $threadIds;
-    }
-
-    public function bdApi_setPolls(array $polls = null)
-    {
-        if (is_array($polls)) {
-            $this->_bdApi_polls += $polls;
-        }
-
-        return $this->_bdApi_polls;
-    }
-
-    public function limitQueryResults($query, $limit, $offset = 0)
-    {
-        if ($this->_bdApi_limitQueryResults_nodeId !== false) {
-            // TODO: improve this, it may break some query if the WHERE conditions contain a
-            // mix of AND and OR operators
-            $replacement = false;
-
-            if (!is_array($this->_bdApi_limitQueryResults_nodeId)) {
-                if ($this->_bdApi_limitQueryResults_nodeId > 0) {
-                    $replacement = "\nthread.node_id = " . $this->_getDb()->quote($this->_bdApi_limitQueryResults_nodeId) . " AND\n";
-                }
-            } else {
-                if (!empty($this->_bdApi_limitQueryResults_nodeId)) {
-                    $replacement = "\nthread.node_id IN (" . $this->_getDb()->quote($this->_bdApi_limitQueryResults_nodeId) . ") AND\n";
-                }
-            }
-
-            if ($replacement !== false AND preg_match('/\s(WHERE)\s/i', $query, $matches, PREG_OFFSET_CAPTURE) === 1) {
-                $query = substr_replace($query, $replacement, $matches[1][1] + strlen($matches[1][0]), 0);
-            }
-        }
-
-        return parent::limitQueryResults($query, $limit, $offset);
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/ThreadPrefix.php b/xenforo/library/bdApi/Extend/Model/ThreadPrefix.php
deleted file mode 100755
index 1d875fee..00000000
--- a/xenforo/library/bdApi/Extend/Model/ThreadPrefix.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_ThreadPrefix extends XFCP_bdApi_Extend_Model_ThreadPrefix
-{
-    public function bdApi_getUsablePrefixesByForums($nodeIds, array $viewingUser = null)
-    {
-        $this->standardizeViewingUserReference($viewingUser);
-
-        $prefixes = $this->getPrefixesInForums($nodeIds);
-
-        $prefixesByForum = array();
-        foreach ($prefixes AS $prefix) {
-            if (!$this->_verifyPrefixIsUsableInternal($prefix, $viewingUser)) {
-                continue;
-            }
-
-            $prefixId = $prefix['prefix_id'];
-            $forumId = $prefix['node_id'];
-            $prefixGroupId = $prefix['prefix_group_id'];
-
-            if (!isset($prefixesByForum[$forumId])) {
-                $prefixesByForum[$forumId] = array();
-            }
-
-            if (!isset($prefixesByForum[$forumId][$prefixGroupId])) {
-                $prefixesByForum[$forumId][$prefixGroupId] = array();
-            }
-
-            $prefixesByForum[$forumId][$prefixGroupId]['prefixes'][$prefixId] = $prefix;
-        }
-
-        return $prefixesByForum;
-    }
-
-    public function prepareApiDataForPrefixes(array $prefixes, array $prefixIds = null)
-    {
-        $data = array();
-
-        foreach ($prefixes as $prefixId => $prefix) {
-            if (isset($prefix['prefix_id'])) {
-                // this is a prefix
-                if (is_array($prefixIds)
-                    && !in_array($prefixId, $prefixIds)
-                ) {
-                    continue;
-                }
-
-                $data[] = $this->prepareApiDataForPrefix($prefix);
-            } elseif (isset($prefix['prefixes'])) {
-                // this is a group
-                $groupPrefixes = $this->prepareApiDataForPrefixes($prefix['prefixes'], $prefixIds);
-                if (count($groupPrefixes) === 0) {
-                    continue;
-                }
-
-                $data[] = array(
-                    'group_title' => $prefixId > 0
-                        ? new XenForo_Phrase($this->getPrefixGroupTitlePhraseName($prefixId))
-                        : new XenForo_Phrase('ungrouped'),
-                    'group_prefixes' => $groupPrefixes,
-                );
-            }
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForPrefix(array $prefix)
-    {
-        $publicKeys = array(
-            // xf_thread_prefix
-            'prefix_id' => 'prefix_id',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($prefix, $publicKeys);
-
-        $data['prefix_title'] = new XenForo_Phrase($this->getPrefixTitlePhraseName($prefix['prefix_id']));
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/ThreadWatch.php b/xenforo/library/bdApi/Extend/Model/ThreadWatch.php
deleted file mode 100644
index a90ae4e9..00000000
--- a/xenforo/library/bdApi/Extend/Model/ThreadWatch.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_ThreadWatch extends XFCP_bdApi_Extend_Model_ThreadWatch
-{
-    public function prepareApiDataForThreadWatches(array $data, array $threadWatch)
-    {
-        $data['follow']['alert'] = true;
-        $data['follow']['email'] = !empty($threadWatch['email_subscribe']);
-
-        return $data;
-    }
-
-    public function getThreadsWatchedByUser($userId, $newOnly, array $fetchOptions = array())
-    {
-        if (isset($fetchOptions['watchUserId'])) {
-            unset($fetchOptions['watchUserId']);
-        }
-
-        return parent::getThreadsWatchedByUser($userId, $newOnly, $fetchOptions);
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/User.php b/xenforo/library/bdApi/Extend/Model/User.php
deleted file mode 100755
index 22bc5a8f..00000000
--- a/xenforo/library/bdApi/Extend/Model/User.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_User extends XFCP_bdApi_Extend_Model_User
-{
-    const CONDITIONS_USER_ID = 'bdApi_userId';
-    const FETCH_IS_FOLLOWED = 'bdApi_followedUserId';
-    const ORDER_USER_ID = 'bdApi_userId';
-
-    public function bdApi_getLatestUserId()
-    {
-        return $this->_getDb()->fetchOne('
-            SELECT user_id
-            FROM xf_user
-            ORDER BY user_id DESC
-            LIMIT 1
-        ');
-    }
-
-    public function bdApi_countUsersBeingFollowedByUserId($userId)
-    {
-        return $this->_getDb()->fetchOne('
-			SELECT COUNT(*)
-			FROM xf_user_follow
-			WHERE user_id = ?
-		', $userId);
-    }
-
-    public function bdApi_countUsersFollowingUserIds(array $userIds)
-    {
-        if (count($userIds) === 0) {
-            return array();
-        }
-
-        return $this->_getDb()->fetchPairs('
-            SELECT follow_user_id, COUNT(*)
-            FROM xf_user_follow
-            WHERE follow_user_id IN (' . $this->_getDb()->quote($userIds) . ')
-            GROUP BY follow_user_id
-        ');
-    }
-
-    public function prepareUserConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array(parent::prepareUserConditions($conditions, $fetchOptions));
-
-        if (isset($conditions[self::CONDITIONS_USER_ID])) {
-            $sqlConditions[] = $this->getCutOffCondition('user.user_id', $conditions[self::CONDITIONS_USER_ID]);
-        }
-
-        if (count($sqlConditions) > 1) {
-            return $this->getConditionsForClause($sqlConditions);
-        } else {
-            return $sqlConditions[0];
-        }
-    }
-
-    public function getFetchOptionsToPrepareApiData(array $fetchOptions = array())
-    {
-        $fetchOptions['join'] = XenForo_Model_User::FETCH_USER_FULL;
-
-        $fetchOptions[self::FETCH_IS_FOLLOWED] = XenForo_Visitor::getUserId();
-
-        return $fetchOptions;
-    }
-
-    public function prepareApiDataForUsers(array $users)
-    {
-        $data = array();
-
-        foreach ($users as $key => $user) {
-            $data[] = $this->prepareApiDataForUser($user);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForUser(array $user)
-    {
-        $visitor = XenForo_Visitor::getInstance();
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-        /* @var $userGroupModel bdApi_Extend_Model_UserGroup */
-        $userGroupModel = $this->getModelFromCache('XenForo_Model_UserGroup');
-        /* @var $conversationModel XenForo_Model_Conversation */
-        $conversationModel = $this->getModelFromCache('XenForo_Model_Conversation');
-
-        $hasAdminScope = (!empty($session) && $session->checkScope(bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM));
-        $isAdminRequest = ($hasAdminScope && $visitor->hasAdminPermission('user'));
-        $prepareProtectedData = (($user['user_id'] == $visitor->get('user_id')) || $isAdminRequest);
-
-        $publicKeys = array(
-            // xf_user
-            'user_id' => 'user_id',
-            'username' => 'username',
-            'message_count' => 'user_message_count',
-            'register_date' => 'user_register_date',
-            'like_count' => 'user_like_count',
-        );
-
-        if ($prepareProtectedData) {
-            $publicKeys = array_merge($publicKeys, array(
-                // xf_user
-                'email' => 'user_email',
-                'alerts_unread' => 'user_unread_notification_count',
-                // xf_user_profile
-                'dob_day' => 'user_dob_day',
-                'dob_month' => 'user_dob_month',
-                'dob_year' => 'user_dob_year',
-            ));
-
-            if (!empty($session) AND $session->checkScope(bdApi_Model_OAuth2::SCOPE_PARTICIPATE_IN_CONVERSATIONS)) {
-                // xf_user
-                $publicKeys['conversations_unread'] = 'user_unread_conversation_count';
-            }
-        }
-
-        $data = bdApi_Data_Helper_Core::filter($user, $publicKeys);
-
-        $data['user_title'] = XenForo_Template_Helper_Core::helperUserTitle($user);
-
-        if (isset($user['user_state']) AND isset($user['is_banned'])) {
-            if (!empty($user['is_banned'])) {
-                $data['user_is_valid'] = false;
-                $data['user_is_verified'] = true;
-            } else {
-                switch ($user['user_state']) {
-                    case 'valid':
-                        $data['user_is_valid'] = true;
-                        $data['user_is_verified'] = true;
-                        break;
-                    case 'email_confirm':
-                    case 'email_confirm_edit':
-                        $data['user_is_valid'] = true;
-                        $data['user_is_verified'] = false;
-                        break;
-                    case 'moderated':
-                        $data['user_is_valid'] = false;
-                        $data['user_is_verified'] = false;
-                        break;
-                }
-            }
-        }
-
-        $data['user_is_followed'] = !empty($user['bdapi_user_is_followed']);
-
-        if ($this->canViewUserCurrentActivity($user)) {
-            $data['user_last_seen_date'] = $user['last_activity'];
-        } else {
-            // user hides his/her activity, use the register date value instead
-            // (IMHO using 0 will make it too obvious that activity is hidden)
-            $data['user_last_seen_date'] = $user['register_date'];
-        }
-
-        $data['links'] = array(
-            'permalink' => XenForo_Link::buildPublicLink('members', $user),
-            'detail' => bdApi_Data_Helper_Core::safeBuildApiLink('users', $user),
-            'avatar' => XenForo_Template_Helper_Core::callHelper('avatar', array($user, 'm', false, true)),
-            'avatar_big' => XenForo_Template_Helper_Core::callHelper('avatar', array($user, 'l', false, true)),
-            'avatar_small' => XenForo_Template_Helper_Core::callHelper('avatar', array($user, 's', false, true)),
-            'followers' => bdApi_Data_Helper_Core::safeBuildApiLink('users/followers', $user),
-            'followings' => bdApi_Data_Helper_Core::safeBuildApiLink('users/followings', $user),
-            'ignore' => bdApi_Data_Helper_Core::safeBuildApiLink('users/ignore', $user),
-        );
-
-        $data['permissions'] = array(
-            'edit' => $prepareProtectedData,
-            'follow' => ($user['user_id'] != $visitor->get('user_id')) && $visitor->canFollow(),
-        );
-
-        /** @var XenForo_Model_UserIgnore $ignoreModel */
-        $ignoreModel = $this->getModelFromCache('XenForo_Model_UserIgnore');
-        $data['permissions']['ignore'] = $ignoreModel->canIgnoreUser($visitor->get('user_id'), $user);
-        $data['user_is_ignored'] = $visitor->isIgnoring($user['user_id']);
-
-        $data['user_is_visitor'] = ($user['user_id'] == $visitor->get('user_id'));
-
-        if ($prepareProtectedData) {
-            if (isset($user['timezone'])) {
-                $dtz = new DateTimeZone($user['timezone']);
-                $dt = new DateTime('now', $dtz);
-                $data['user_timezone_offset'] = $dtz->getOffset($dt);
-            }
-
-            $auth = $this->getUserAuthenticationObjectByUserId($user['user_id']);
-            $data['user_has_password'] = $auth->hasPassword();
-
-            $data['fields'] = $this->prepareApiDataForUserFields($user);
-
-            $thisUserGroups = array();
-            $userGroups = $userGroupModel->bdApi_getAllUserGroupsCached();
-            foreach ($userGroups as $userGroup) {
-                if ($this->isMemberOfUserGroup($user, $userGroup['user_group_id'])) {
-                    $thisUserGroups[] = $userGroup;
-                }
-            }
-            $data['user_groups'] = $userGroupModel->prepareApiDataForUserGroups($thisUserGroups);
-
-            foreach ($data['user_groups'] as &$userGroupRef) {
-                if ($userGroupRef['user_group_id'] == $user['user_group_id']) {
-                    $userGroupRef['is_primary_group'] = true;
-                } else {
-                    $userGroupRef['is_primary_group'] = false;
-                }
-            }
-
-            if (isset($user['external_auth'])) {
-                $externalAuths = @unserialize($user['external_auth']);
-                if (is_array($externalAuths)) {
-                    $data['user_external_authentications'] = array();
-                    foreach ($externalAuths as $provider => $providerKey) {
-                        $data['user_external_authentications'][] = array(
-                            'provider' => $provider,
-                            'provider_key' => $providerKey,
-                        );
-                    }
-                }
-            }
-
-            $data['self_permissions'] = array(
-                'create_conversation' => $conversationModel->canStartConversations(),
-                'upload_attachment_conversation' => $conversationModel->canUploadAndManageAttachment(),
-            );
-
-            $data['edit_permissions'] = array(
-                'password' => true,
-                'user_email' => true,
-
-                'username' => false,
-                'user_title' => false,
-                'primary_group_id' => false,
-                'secondary_group_ids' => false,
-
-                'user_dob_day' => false,
-                'user_dob_month' => false,
-                'user_dob_year' => false,
-
-                'fields' => true,
-            );
-
-            if ($isAdminRequest) {
-                $data['edit_permissions'] = array_merge($data['edit_permissions'], array(
-                    'username' => true,
-                    'user_title' => true,
-                    'primary_group_id' => true,
-                    'secondary_group_ids' => true,
-                ));
-            }
-
-            if ((empty($data['user_dob_day'])
-                    && empty($data['user_dob_month'])
-                    && empty($data['user_dob_year']))
-                || $isAdminRequest
-            ) {
-                $data['edit_permissions'] = array_merge($data['edit_permissions'], array(
-                    'user_dob_day' => true,
-                    'user_dob_month' => true,
-                    'user_dob_year' => true,
-                ));
-            }
-        }
-
-        /** @var XenForo_Model_UserProfile $userProfileModel */
-        $userProfileModel = $this->getModelFromCache('XenForo_Model_UserProfile');
-        if ($userProfileModel->canViewProfilePosts($user)) {
-            $data['links']['timeline'] = bdApi_Data_Helper_Core::safeBuildApiLink('users/timeline', $user);
-
-            if ($user['user_id'] == $visitor->get('user_id')) {
-                $data['permissions']['profile_post'] = $visitor->canUpdateStatus();
-            } else {
-                $data['permissions']['profile_post'] = $userProfileModel->canPostOnProfile($user);
-            }
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForUserFields(array $user)
-    {
-        $data = array();
-
-        foreach (array(
-                     'about' => 'about',
-                     'homepage' => 'home_page',
-                     'location' => 'location',
-                     'occupation' => 'occupation',
-                 ) as $systemFieldId => $titlePhraseTitle) {
-            if (!isset($user[$systemFieldId])) {
-                continue;
-            }
-
-            $data[] = array(
-                'id' => $systemFieldId,
-                'title' => new XenForo_Phrase($titlePhraseTitle),
-                'description' => '',
-                'position' => 'personal',
-                'is_required' => false,
-                'value' => $user[$systemFieldId],
-            );
-        }
-
-        if (!empty($user['custom_fields'])) {
-            /** @var bdApi_Extend_Model_UserField $fieldModel */
-            $fieldModel = $this->_getFieldModel();
-            $fields = $fieldModel->bdApi_getUserFields();
-            $values = unserialize($user['custom_fields']);
-
-            foreach ($fields as $fieldId => $field) {
-                $fieldValue = isset($values[$fieldId]) ? $values[$fieldId] : null;
-                $fieldData = $fieldModel->prepareApiDataForField($field, $fieldValue);
-                $data[] = $fieldData;
-            }
-        }
-
-        return $data;
-    }
-
-    public function prepareUserFetchOptions(array $fetchOptions)
-    {
-        $prepared = parent::prepareUserFetchOptions($fetchOptions);
-
-        if (isset($fetchOptions[self::FETCH_IS_FOLLOWED])) {
-            $fetchOptions[self::FETCH_IS_FOLLOWED] = intval($fetchOptions[self::FETCH_IS_FOLLOWED]);
-            if ($fetchOptions[self::FETCH_IS_FOLLOWED]) {
-                // note: quoting is skipped; intval'd above
-                $prepared['selectFields'] .= ',
-					IF(bdapi_user_follow.user_id IS NOT NULL, 1, 0) AS bdapi_user_is_followed';
-                $prepared['joinTables'] .= '
-					LEFT JOIN xf_user_follow AS bdapi_user_follow ON
-						(bdapi_user_follow.user_id = ' . $fetchOptions[self::FETCH_IS_FOLLOWED] . '
-						AND bdapi_user_follow.follow_user_id = user.user_id)';
-            } else {
-                $prepared['selectFields'] .= ',
-					0 AS bdapi_user_is_followed';
-            }
-        }
-
-        return $prepared;
-    }
-
-    public function getOrderByClause(array $choices, array $fetchOptions, $defaultOrderSql = '')
-    {
-        $choices[self::ORDER_USER_ID] = 'user.user_id';
-
-        return parent::getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/UserField.php b/xenforo/library/bdApi/Extend/Model/UserField.php
deleted file mode 100755
index 90078afe..00000000
--- a/xenforo/library/bdApi/Extend/Model/UserField.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_UserField extends XFCP_bdApi_Extend_Model_UserField
-{
-    public function bdApi_getUserFields()
-    {
-        static $fields = null;
-
-        if ($fields === null) {
-            $fields = $this->getUserFields();
-        }
-
-        return $fields;
-    }
-
-    public function prepareApiDataForField(array $field, $fieldValue = null)
-    {
-        $field = $this->prepareUserField($field, true, $fieldValue);
-        $data = array();
-
-        $publicKeys = array(
-            'field_id' => 'id',
-            'title' => 'title',
-            'description' => 'description',
-            'display_group' => 'position',
-        );
-
-        $data += bdApi_Data_Helper_Core::filter($field, $publicKeys);
-
-        $hasChoices = false;
-        if (!empty($field['isChoice'])) {
-            $hasChoices = !empty($field['fieldChoices']);
-            $data['is_multi_choice'] = !empty($field['isMultiChoice']);
-        }
-
-        if (true) {
-            // always prepare choices
-            $data['is_required'] = !empty($field['required']);
-            if ($hasChoices) {
-                $data['choices'] = array();
-                foreach ($field['fieldChoices'] as $key => $value) {
-                    $data['choices'][] = array(
-                        'key' => strval($key),
-                        'value' => strval($value),
-                    );
-                }
-            }
-        }
-
-        if ($fieldValue !== null) {
-            if ($hasChoices) {
-                if (is_array($field['field_value'])) {
-                    // multi choices
-                    $fieldValueIds = array_keys($field['field_value']);
-                } else {
-                    // single choice
-                    $fieldValueIds = array($field['field_value']);
-                }
-
-                $data['values'] = array();
-                foreach ($fieldValueIds as $fieldValueId) {
-                    if (!isset($field['fieldChoices'][$fieldValueId])) {
-                        continue;
-                    }
-
-                    $data['values'][] = array(
-                        'key' => strval($fieldValueId),
-                        'value' => $field['fieldChoices'][$fieldValueId],
-                    );
-                }
-            } else {
-                // text
-                $data['value'] = $field['field_value'];
-            }
-        }
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/UserGroup.php b/xenforo/library/bdApi/Extend/Model/UserGroup.php
deleted file mode 100755
index f11df86b..00000000
--- a/xenforo/library/bdApi/Extend/Model/UserGroup.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_UserGroup extends XFCP_bdApi_Extend_Model_UserGroup
-{
-    public function bdApi_getAllUserGroupsCached()
-    {
-        static $userGroups = null;
-
-        if ($userGroups === null) {
-            $userGroups = $this->getAllUserGroups();
-        }
-
-        return $userGroups;
-    }
-
-    public function prepareApiDataForUserGroups(array $userGroups)
-    {
-        $data = array();
-
-        foreach ($userGroups as $key => $userGroup) {
-            $data[] = $this->prepareApiDataForUserGroup($userGroup);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForUserGroup(array $userGroup)
-    {
-        $publicKeys = array(
-            // xf_user_group
-            'user_group_id' => 'user_group_id',
-            'title' => 'user_group_title',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($userGroup, $publicKeys);
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Model/UserIgnore.php b/xenforo/library/bdApi/Extend/Model/UserIgnore.php
deleted file mode 100755
index f04e3318..00000000
--- a/xenforo/library/bdApi/Extend/Model/UserIgnore.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_Extend_Model_UserIgnore extends XFCP_bdApi_Extend_Model_UserIgnore
-{
-    public function bdApi_countIgnoredUsers($userId)
-    {
-        return $this->_getDb()->fetchOne('
-			SELECT COUNT(*)
-			FROM xf_user_ignored
-			WHERE user_id = ?
-		', $userId);
-    }
-}
diff --git a/xenforo/library/bdApi/Extend/Visitor.php b/xenforo/library/bdApi/Extend/Visitor.php
deleted file mode 100644
index ca02854b..00000000
--- a/xenforo/library/bdApi/Extend/Visitor.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class bdApi_Extend_Visitor extends XFCP_bdApi_Extend_Visitor
-{
-    public function setVisitorLanguage($languageId)
-    {
-        if ($this->get('user_id') > 0) {
-            // because XenForo ignore session language id if user is logged in
-            // we have to override its value here
-            // NOTE: the load_class for XenForo_Visitor requires 1.2.0+
-            $session = bdApi_Data_Helper_Core::safeGetSession();
-            $requestLanguageId = $session->get('languageId');
-            if ($requestLanguageId > 0) {
-                $languageId = $requestLanguageId;
-            }
-        }
-
-        return parent::setVisitorLanguage($languageId);
-    }
-}
diff --git a/xenforo/library/bdApi/Input.php b/xenforo/library/bdApi/Input.php
deleted file mode 100644
index a8e00826..00000000
--- a/xenforo/library/bdApi/Input.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-// this is loaded only when $_SERVER['REQUEST_METHOD'] === 'OPTIONS'
-
-/* @var $app XenForo_Application */
-$app = XenForo_Application::getInstance();
-$xenforoInputPath = $app->getRootDir() . '/library/XenForo/Input.php';
-$xenforoInputContents = file_get_contents($xenforoInputPath);
-
-// remove <?php
-$xenforoInputContents = substr($xenforoInputContents, 5);
-
-// rename class
-$xenforoInputContents = str_replace('class XenForo_Input', 'class _XenForo_Input', $xenforoInputContents);
-
-eval($xenforoInputContents);
-
-class bdApi_Input extends _XenForo_Input
-{
-    protected static $_bdApi_filters = null;
-
-    public static function bdApi_resetFilters()
-    {
-        self::$_bdApi_filters = array();
-    }
-
-    public static function bdApi_addFile($variableName)
-    {
-        self::$_bdApi_filters[$variableName] = array(
-            'name' => $variableName,
-            'type' => 'file',
-        );
-    }
-
-    public static function bdApi_getFilters()
-    {
-        $filters = self::$_bdApi_filters;
-        self::$_bdApi_filters = null;
-
-        return $filters;
-    }
-
-    public function inRequest($key)
-    {
-        if (self::$_bdApi_filters === null) {
-            return parent::inRequest($key);
-        }
-
-        return true;
-    }
-
-    public function filterSingle($variableName, $filterData, array $options = array())
-    {
-        $type = '';
-        $default = null;
-
-        if (is_string($filterData)) {
-            $type = $filterData;
-        } elseif (is_array($filterData)
-            && isset($filterData[0])
-        ) {
-            if (is_string($filterData[0])) {
-                $type = $filterData[0];
-            } elseif (is_array($filterData[0])) {
-                $type = reset($filterData[0]);
-            }
-
-            if (!empty($filterData['array'])) {
-                $type = sprintf('array_of_%s', $type);
-            }
-
-            if (!empty($filterData['default'])) {
-                $default = $filterData['default'];
-            }
-        }
-
-        if (!empty($type)) {
-            self::$_bdApi_filters[$variableName] = array(
-                'name' => $variableName,
-                'type' => $type,
-            );
-
-            if (!empty($default)) {
-                self::$_bdApi_filters[$variableName]['required'] = false;
-            }
-        }
-
-        return parent::filterSingle($variableName, $filterData, $options);
-    }
-}
-
-eval('class XenForo_Input extends bdApi_Input {}');
-
-if (false) {
-    class _XenForo_Input extends XenForo_Input
-    {
-    }
-}
diff --git a/xenforo/library/bdApi/Installer.php b/xenforo/library/bdApi/Installer.php
deleted file mode 100644
index 016b880a..00000000
--- a/xenforo/library/bdApi/Installer.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-class bdApi_Installer
-{
-    /* Start auto-generated lines of code. Change made will be overwriten... */
-
-    protected static $_tables = array(
-        'client' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_client` (
-                `client_id` VARCHAR(255) NOT NULL
-                ,`client_secret` VARCHAR(255) NOT NULL
-                ,`redirect_uri` TEXT NOT NULL
-                ,`name` VARCHAR(255) NOT NULL
-                ,`description` TEXT NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`options` MEDIUMBLOB
-                , PRIMARY KEY (`client_id`)
-                
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_client`',
-        ),
-        'token' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_token` (
-                `token_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`token_text` VARCHAR(255) NOT NULL
-                ,`expire_date` INT(10) UNSIGNED NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`scope` TEXT NOT NULL
-                , PRIMARY KEY (`token_id`)
-                ,UNIQUE INDEX `token_text` (`token_text`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_token`',
-        ),
-        'auth_code' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_auth_code` (
-                `auth_code_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`auth_code_text` VARCHAR(255) NOT NULL
-                ,`redirect_uri` TEXT NOT NULL
-                ,`expire_date` INT(10) UNSIGNED NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`scope` TEXT NOT NULL
-                , PRIMARY KEY (`auth_code_id`)
-                ,UNIQUE INDEX `auth_code_text` (`auth_code_text`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_auth_code`',
-        ),
-        'refresh_token' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_refresh_token` (
-                `refresh_token_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`refresh_token_text` VARCHAR(255) NOT NULL
-                ,`expire_date` INT(10) UNSIGNED NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`scope` TEXT NOT NULL
-                , PRIMARY KEY (`refresh_token_id`)
-                ,UNIQUE INDEX `refresh_token_text` (`refresh_token_text`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_refresh_token`',
-        ),
-        'log' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_log` (
-                `log_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`ip_address` VARCHAR(50) NOT NULL
-                ,`request_date` INT(10) UNSIGNED NOT NULL
-                ,`request_method` VARCHAR(10) NOT NULL
-                ,`request_uri` TEXT
-                ,`request_data` MEDIUMBLOB
-                ,`response_code` INT(10) UNSIGNED NOT NULL
-                ,`response_output` MEDIUMBLOB
-                , PRIMARY KEY (`log_id`)
-                
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_log`',
-        ),
-        'subscription' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_subscription` (
-                `subscription_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`callback` TEXT
-                ,`topic` VARCHAR(255) NOT NULL
-                ,`subscribe_date` INT(10) UNSIGNED NOT NULL
-                ,`expire_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'
-                , PRIMARY KEY (`subscription_id`)
-                ,INDEX `client_id` (`client_id`)
-                ,INDEX `topic` (`topic`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_subscription`',
-        ),
-        'user_scope' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_user_scope` (
-                `client_id` VARCHAR(255) NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`scope` VARCHAR(255) NOT NULL
-                ,`accept_date` INT(10) UNSIGNED NOT NULL
-                
-                ,INDEX `user_id` (`user_id`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_user_scope`',
-        ),
-        'client_content' => array(
-            'createQuery' => 'CREATE TABLE IF NOT EXISTS `xf_bdapi_client_content` (
-                `client_content_id` INT(10) UNSIGNED AUTO_INCREMENT
-                ,`client_id` VARCHAR(255) NOT NULL
-                ,`content_type` VARCHAR(25) NOT NULL
-                ,`content_id` INT(10) UNSIGNED NOT NULL
-                ,`title` VARCHAR(255) NOT NULL
-                ,`body` TEXT NOT NULL
-                ,`date` INT(10) UNSIGNED NOT NULL
-                ,`link` TEXT NOT NULL
-                ,`user_id` INT(10) UNSIGNED NOT NULL
-                ,`extra_data` MEDIUMBLOB
-                , PRIMARY KEY (`client_content_id`)
-                ,INDEX `content_type_content_id` (`content_type`,`content_id`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;',
-            'dropQuery' => 'DROP TABLE IF EXISTS `xf_bdapi_client_content`',
-        ),
-    );
-    protected static $_patches = array(
-        array(
-            'table' => 'xf_bdapi_token',
-            'tableCheckQuery' => 'SHOW TABLES LIKE \'xf_bdapi_token\'',
-            'field' => 'issue_date',
-            'checkQuery' => 'SHOW COLUMNS FROM `xf_bdapi_token` LIKE \'issue_date\'',
-            'addQuery' => 'ALTER TABLE `xf_bdapi_token` ADD COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'modifyQuery' => 'ALTER TABLE `xf_bdapi_token` MODIFY COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'dropQuery' => 'ALTER TABLE `xf_bdapi_token` DROP COLUMN `issue_date`',
-        ),
-        array(
-            'table' => 'xf_bdapi_auth_code',
-            'tableCheckQuery' => 'SHOW TABLES LIKE \'xf_bdapi_auth_code\'',
-            'field' => 'issue_date',
-            'checkQuery' => 'SHOW COLUMNS FROM `xf_bdapi_auth_code` LIKE \'issue_date\'',
-            'addQuery' => 'ALTER TABLE `xf_bdapi_auth_code` ADD COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'modifyQuery' => 'ALTER TABLE `xf_bdapi_auth_code` MODIFY COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'dropQuery' => 'ALTER TABLE `xf_bdapi_auth_code` DROP COLUMN `issue_date`',
-        ),
-        array(
-            'table' => 'xf_bdapi_refresh_token',
-            'tableCheckQuery' => 'SHOW TABLES LIKE \'xf_bdapi_refresh_token\'',
-            'field' => 'issue_date',
-            'checkQuery' => 'SHOW COLUMNS FROM `xf_bdapi_refresh_token` LIKE \'issue_date\'',
-            'addQuery' => 'ALTER TABLE `xf_bdapi_refresh_token` ADD COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'modifyQuery' => 'ALTER TABLE `xf_bdapi_refresh_token` MODIFY COLUMN `issue_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\'',
-            'dropQuery' => 'ALTER TABLE `xf_bdapi_refresh_token` DROP COLUMN `issue_date`',
-        ),
-    );
-
-    public static function install($existingAddOn, $addOnData)
-    {
-        $db = XenForo_Application::get('db');
-
-        foreach (self::$_tables as $table) {
-            $db->query($table['createQuery']);
-        }
-
-        foreach (self::$_patches as $patch) {
-            $tableExisted = $db->fetchOne($patch['tableCheckQuery']);
-            if (empty($tableExisted)) {
-                continue;
-            }
-
-            $existed = $db->fetchOne($patch['checkQuery']);
-            if (empty($existed)) {
-                $db->query($patch['addQuery']);
-            } else {
-                $db->query($patch['modifyQuery']);
-            }
-        }
-
-        self::installCustomized($existingAddOn, $addOnData);
-    }
-
-    public static function uninstall()
-    {
-        $db = XenForo_Application::get('db');
-
-        foreach (self::$_patches as $patch) {
-            $tableExisted = $db->fetchOne($patch['tableCheckQuery']);
-            if (empty($tableExisted)) {
-                continue;
-            }
-
-            $existed = $db->fetchOne($patch['checkQuery']);
-            if (!empty($existed)) {
-                $db->query($patch['dropQuery']);
-            }
-        }
-
-        foreach (self::$_tables as $table) {
-            $db->query($table['dropQuery']);
-        }
-
-        self::uninstallCustomized();
-    }
-
-    /* End auto-generated lines of code. Feel free to make changes below */
-
-    public static function installCustomized($existingAddOn, $addOnData)
-    {
-        if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50309) {
-            throw new XenForo_Exception('PHP 5.3.9+ is required.');
-        }
-
-        if (!function_exists('openssl_encrypt')) {
-            throw new XenForo_Exception('PHP OpenSSL support is required but could not be found.');
-        }
-
-        $db = XenForo_Application::getDb();
-
-        $db->query('
-            CREATE TABLE IF NOT EXISTS `xf_bdapi_ping_queue` (
-                `ping_queue_id` INT(10) UNSIGNED AUTO_INCREMENT,
-                `callback_md5` VARCHAR(32),
-                `callback` TEXT,
-                `object_type` VARBINARY(25) NOT NULL,
-                `data` MEDIUMBLOB,
-                `queue_date` INT(10) UNSIGNED NOT NULL,
-                `expire_date` INT(10) UNSIGNED NOT NULL DEFAULT \'0\',
-                PRIMARY KEY (`ping_queue_id`),
-                INDEX `callback_md5` (`callback_md5`)
-            ) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-        ');
-
-        $db->query(
-            'REPLACE INTO `xf_content_type` (content_type, addon_id, fields) VALUES (?,?,?)',
-            array('api_ping', 'bdApi', '')
-        );
-        $db->query(
-            'REPLACE INTO `xf_content_type_field` (content_type, field_name, field_value) VALUES (?,?,?)',
-            array('api_ping', 'alert_handler_class', 'bdApi_AlertHandler_Ping')
-        );
-        $db->query(
-            'REPLACE INTO `xf_content_type` (content_type, addon_id, fields) VALUES (?,?,?)',
-            array('api_client_content', 'bdApi', '')
-        );
-        $db->query(
-            'REPLACE INTO `xf_content_type_field` (content_type, field_name, field_value) VALUES (?,?,?)',
-            array('api_client_content', 'search_handler_class', 'bdApi_Search_DataHandler_ClientContent')
-        );
-        /** @var XenForo_Model_ContentType $contentTypeModel */
-        $contentTypeModel = XenForo_Model::create('XenForo_Model_ContentType');
-        $contentTypeModel->rebuildContentTypeCache();
-
-        $existingVersionId = 0;
-        if (!empty($existingAddOn)) {
-            $existingVersionId = $existingAddOn['version_id'];
-        }
-
-        if ($existingVersionId < 1) {
-            $db->query("
-                INSERT IGNORE INTO xf_permission_entry
-                (user_group_id, user_id, permission_group_id, permission_id, permission_value, permission_value_int)
-                SELECT user_group_id, user_id, 'general', 'bdApi_clientNew', permission_value, 0
-                FROM xf_permission_entry
-                WHERE permission_group_id = 'general' AND permission_id = 'bypassFloodCheck'
-            ");
-
-            self::_installPhpDemoClient();
-        }
-
-        if ($existingVersionId < 1060001) {
-            if (XenForo_Application::$versionId >= 1020000) {
-                XenForo_Application::defer('bdApi_Deferred_Upgrade1060001', array());
-            }
-        }
-    }
-
-    public static function uninstallCustomized()
-    {
-        $db = XenForo_Application::getDb();
-
-        $db->query('DROP TABLE IF EXISTS `xf_bdapi_ping_queue`');
-        $db->query('DELETE FROM `xf_content_type` WHERE addon_id = ?', "bdApi");
-        $db->query('DELETE FROM `xf_content_type_field` WHERE content_type = ?', "api_ping");
-        $db->query('DELETE FROM `xf_content_type_field` WHERE content_type = ?', "api_client_content");
-
-        bdApi_ShippableHelper_Updater::onUninstall();
-    }
-
-    protected static function _installPhpDemoClient()
-    {
-        /** @var bdApi_Model_Client $clientModel */
-        $clientModel = XenForo_Model::create('bdApi_Model_Client');
-
-        $siteUrl = 'http://api-php-demo.xfrocks.com/';
-
-        /** @var bdApi_DataWriter_Client $dw */
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_Client');
-        $dw->bulkSet(array(
-            'name' => 'Demo Site',
-            'description' => 'Demo website for [bd] API setup and maintained by xfrocks.',
-            'redirect_uri' => $siteUrl,
-            'client_id' => $clientModel->generateClientId(),
-            'client_secret' => $clientModel->generateClientSecret(),
-            'user_id' => XenForo_Visitor::getUserId(),
-            'options' => array(),
-        ));
-        $dw->save();
-
-        $client = XenForo_Helper_Http::getClient($siteUrl . 'setup.php', array(
-            'maxredirects' => 0,
-        ));
-        $client->setParameterGet('api_root', rtrim(XenForo_Application::getOptions()->get('boardUrl'), '/') . '/api');
-        $client->setParameterGet('api_key', $dw->get('client_id'));
-        $client->setParameterGet('api_secret', $dw->get('client_secret'));
-        $client->setParameterGet('api_scope', 'read');
-
-        try {
-            $response = $client->request('HEAD');
-            if ($response->getStatus() === 302) {
-                $location = $response->getHeader('Location');
-                if (!empty($location) && parse_url($location, PHP_URL_HOST) === 'j.mp') {
-                    /** @var bdApi_DataWriter_Client $dw2 */
-                    $dw2 = XenForo_DataWriter::create('bdApi_DataWriter_Client');
-                    $dw2->setExistingData($dw->getMergedData());
-                    $dw2->set('name', $location);
-                    $dw2->save();
-                }
-            }
-        } catch (Exception $e) {
-            // ignore
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Lib/oauth2-server-php b/xenforo/library/bdApi/Lib/oauth2-server-php
deleted file mode 160000
index d1588784..00000000
--- a/xenforo/library/bdApi/Lib/oauth2-server-php
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d158878425392fe5a0cc34f15dbaf46315ae0ed9
diff --git a/xenforo/library/bdApi/Link.php b/xenforo/library/bdApi/Link.php
deleted file mode 100755
index 90eaf807..00000000
--- a/xenforo/library/bdApi/Link.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/* @var $app XenForo_Application */
-$app = XenForo_Application::getInstance();
-$xenforoLinkPath = $app->getRootDir() . '/library/XenForo/Link.php';
-$xenforoLinkContents = file_get_contents($xenforoLinkPath);
-
-// remove <?php
-$xenforoLinkContents = substr($xenforoLinkContents, 5);
-
-// rename class
-$xenforoLinkContents = str_replace('class XenForo_Link', 'class _XenForo_Link', $xenforoLinkContents);
-
-// change self reference to XenForo, required to patch https issue
-$xenforoLinkContents = str_replace('self::', 'XenForo_Link::', $xenforoLinkContents);
-
-eval($xenforoLinkContents);
-
-class bdApi_Link extends _XenForo_Link
-{
-    public function __construct($linkString, $canPrependFull = true)
-    {
-        if ($canPrependFull) {
-            // we have to verify this because caller may not know that all relative urls are forced to absolute by us
-            $canPrependFull = !Zend_Uri::check($linkString);
-        }
-
-        parent::__construct($linkString, $canPrependFull);
-    }
-
-    public static function buildPublicLink($type, $data = null, array $extraParams = array(), $skipPrepend = false)
-    {
-        // the type MUST BE canonical:$type
-        // NOTE: this is the opposite with api links
-        if (strpos($type, 'full:') === 0) {
-            // replace full: with canonical:
-            $type = str_replace('full:', 'canonical:', $type);
-        } elseif (strpos($type, 'canonical:') === false) {
-            // enforce canonical:
-            $type = 'canonical:' . $type;
-        }
-
-        return parent::buildPublicLink($type, $data, $extraParams, $skipPrepend);
-    }
-
-    public static function buildApiLink($type, $data = null, array $extraParams = array(), $skipPrepend = false)
-    {
-        // the type MUST BE full:type
-        // NOTE: this is the opposite with public links
-        if (strpos($type, 'canonical:') === 0) {
-            // replace canonical: with full:
-            $type = str_replace('canonical:', 'full:', $type);
-        } elseif (strpos($type, 'full:') === false) {
-            // enforce full:
-            $type = 'full:' . $type;
-        }
-
-        $type = XenForo_Link::_checkForFullLink($type, $fullLink, $fullLinkPrefix);
-
-        $link = XenForo_Link::_buildLink('api', $type, $data, $extraParams);
-        $queryString = XenForo_Link::buildQueryString($extraParams);
-
-        $isRaw = false;
-        if ($link instanceof XenForo_Link) {
-            $isRaw = true;
-            $canPrependFull = $link->canPrependFull();
-        } else {
-            $canPrependFull = true;
-
-            if (strpos($link, '#') !== false) {
-                list($link, $hash) = explode('#', $link);
-            }
-        }
-
-        if ($isRaw) {
-            $outputLink = ($queryString !== '' ? "$link?$queryString" : $link);
-        } else {
-            if ($queryString !== '' && $link !== '') {
-                $append = "?$link&$queryString";
-            } else {
-                // 1 or neither of these has content
-                $append = $link . $queryString;
-                if ($append !== '') {
-                    $append = "?$append";
-                }
-            }
-            if ($skipPrepend) {
-                $outputLink = $append;
-            } else {
-                $outputLink = 'index.php' . $append;
-            }
-        }
-
-        if ($fullLink && $canPrependFull) {
-            $outputLink = $fullLinkPrefix . $outputLink;
-        }
-
-        // deal with a hash in the $type {xen:link prefix#hash..}
-        if (($hashPos = strpos($type, '#')) !== false) {
-            $hash = substr($type, $hashPos + 1);
-        }
-
-        if ($outputLink === '') {
-            $outputLink = '.';
-        }
-
-        return $outputLink . (empty($hash) ? '' : '#' . $hash);
-    }
-
-    public static function convertUriToAbsoluteUri($uri, $includeHost = false, array $paths = null)
-    {
-        if (!$paths) {
-            $paths = XenForo_Application::get('requestPaths');
-        }
-
-        $boardUrl = rtrim(XenForo_Application::getOptions()->get('boardUrl'), '/') . '/';
-        $boardUrlParsed = parse_url($boardUrl);
-
-        $paths['protocol'] = $boardUrlParsed['scheme'];
-        $paths['host'] = $boardUrlParsed['host'] .
-            (isset($boardUrlParsed['port']) ?
-                (':' . $boardUrlParsed['port']) : '');
-        $paths['fullBasePath'] = $boardUrl;
-        $paths['basePath'] = $boardUrlParsed['path'];
-
-        return parent::convertUriToAbsoluteUri($uri, true, $paths);
-    }
-
-    public static function convertApiUriToAbsoluteUri($uri, $includeHost = false, array $paths = null)
-    {
-        return parent::convertUriToAbsoluteUri($uri, $includeHost || true, $paths);
-    }
-
-    protected static function _checkForFullLink($type, &$fullLink, &$fullLinkPrefix)
-    {
-        static $fullBasePath = null;
-
-        if (!$type) {
-            $fullLink = false;
-            $fullLinkPrefix = '';
-            return $type;
-        }
-
-        if ($type[0] == 'c' && substr($type, 0, 10) === 'canonical:') {
-            $type = substr($type, 10);
-            $fullLink = true;
-            $fullLinkPrefix = self::getCanonicalLinkPrefix() . '/';
-        } elseif ($type[0] == 'f' && substr($type, 0, 5) === 'full:') {
-            $type = substr($type, 5);
-            $fullLink = true;
-
-            if ($fullBasePath === null) {
-                $paths = XenForo_Application::get('requestPaths');
-                $fullBasePath = $paths['fullBasePath'];
-
-                // fix issue with HTTPS requests
-                if ($paths['protocol'] === 'https' && substr($fullBasePath, 0, 5) === 'http:') {
-                    $fullBasePath = str_replace('http://', 'https://', $fullBasePath);
-                }
-            }
-
-            $fullLinkPrefix = $fullBasePath;
-        } else {
-            $fullLink = false;
-            $fullLinkPrefix = '';
-        }
-
-        return $type;
-    }
-
-    protected static function _buildLink($group, $type, $data, array &$extraParams, &$prefix = null)
-    {
-        static $extraParamsApi = null;
-        static $extraParamsPublic = null;
-
-        $built = parent::_buildLink($group, $type, $data, $extraParams, $prefix);
-
-        switch ($group) {
-            case 'api':
-                if ($extraParamsApi === null) {
-                    $session = bdApi_Data_Helper_Core::safeGetSession();
-
-                    if (!empty($session)) {
-                        $extraParamsApi = [];
-
-                        // auto appends oauth_token param from session
-                        $oauthToken = $session->getOAuthTokenText();
-                        if (!empty($oauthToken)
-                            && !empty($_REQUEST['oauth_token'])
-                            && $_REQUEST['oauth_token'] === $oauthToken
-                        ) {
-                            // only append token to built link if the current request has token in query too
-                            // this will prevent token in links if it's requested with OTT, token in Auth header
-                            // or token in body (PUT/POST requests)
-                            $extraParamsApi['oauth_token'] = $oauthToken;
-                        }
-
-                        // auto appends locale param from session
-                        $locale = $session->get('requestLocale');
-                        if (!empty($locale)) {
-                            $extraParamsApi['locale'] = $locale;
-                        }
-                    }
-                }
-                if (is_array($extraParamsApi)) {
-                    $extraParams += $extraParamsApi;
-                }
-                break;
-            case 'public':
-                if ($extraParamsPublic === null) {
-                    $session = bdApi_Data_Helper_Core::safeGetSession();
-
-                    if (!empty($session)) {
-                        $extraParamsPublic = [];
-
-                        // auto appends _apiLanguageId param from session
-                        $locale = $session->get('requestLocale');
-                        if (!empty($locale)) {
-                            $timestamp = XenForo_Application::$time + 86400;
-                            $extraParamsPublic['_apiLanguageId'] = sprintf(
-                                '%s %s',
-                                $timestamp,
-                                bdApi_Crypt::encryptTypeOne($session->get('languageId'), $timestamp)
-                            );
-                        }
-                    }
-                }
-                if (is_array($extraParamsPublic)) {
-                    $extraParams += $extraParamsPublic;
-                }
-                break;
-        }
-
-        return $built;
-    }
-}
-
-eval('class XenForo_Link extends bdApi_Link {}');
-
-if (false) {
-    class _XenForo_Link extends XenForo_Link
-    {
-    }
-}
diff --git a/xenforo/library/bdApi/Listener.php b/xenforo/library/bdApi/Listener.php
deleted file mode 100755
index d4f2422d..00000000
--- a/xenforo/library/bdApi/Listener.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-class bdApi_Listener
-{
-    public static function load_class($class, array &$extend)
-    {
-        // these classes are always extended
-        static $classes = array(
-            'XenForo_ControllerPublic_Account',
-            'XenForo_ControllerPublic_Error',
-            'XenForo_ControllerPublic_Login',
-            'XenForo_ControllerPublic_Logout',
-            'XenForo_ControllerPublic_Misc',
-            'XenForo_ControllerPublic_Register',
-
-            'XenForo_DataWriter_Alert',
-            'XenForo_DataWriter_Discussion_Thread',
-            'XenForo_DataWriter_DiscussionMessage_Post',
-            'XenForo_DataWriter_User',
-
-            'XenForo_Model_Alert',
-            'XenForo_Model_Conversation',
-        );
-
-        if (in_array($class, $classes)) {
-            $extend[] = 'bdApi_' . $class;
-        }
-    }
-
-    public static function extend($class, array &$extend)
-    {
-        // these classes are extended only within api context
-        // this is done to reduce performance impact for public context
-        static $classes = array(
-            'XenForo_BbCode_Formatter_Base',
-
-            'XenForo_Model_Attachment',
-            'XenForo_Model_Category',
-            'XenForo_Model_Conversation',
-            'XenForo_Model_Forum',
-            'XenForo_Model_ForumWatch',
-            'XenForo_Model_LinkForum',
-            'XenForo_Model_Page',
-            'XenForo_Model_Poll',
-            'XenForo_Model_Post',
-            'XenForo_Model_ProfilePost',
-            'XenForo_Model_Search',
-            'XenForo_Model_Tag',
-            'XenForo_Model_Thread',
-            'XenForo_Model_ThreadPrefix',
-            'XenForo_Model_ThreadWatch',
-            'XenForo_Model_User',
-            'XenForo_Model_UserField',
-            'XenForo_Model_UserGroup',
-            'XenForo_Model_UserIgnore',
-
-            'XenForo_Visitor',
-        );
-
-        if (in_array($class, $classes)) {
-            $extend[] = str_replace('XenForo_', 'bdApi_Extend_', $class);
-        }
-    }
-
-    public static function init_dependencies(XenForo_Dependencies_Abstract $dependencies, array $data)
-    {
-        XenForo_CacheRebuilder_Abstract::$builders['bdApi_CacheRebuilder_ClientContentDeleteAll']
-            = 'bdApi_CacheRebuilder_ClientContentDeleteAll';
-
-        if (isset($data['routesAdmin'])) {
-            bdApi_ShippableHelper_Updater::onInitDependencies($dependencies);
-        }
-    }
-
-    public static function front_controller_pre_route(XenForo_FrontController $fc)
-    {
-        // use cookie flag to change web UI interface to match requested language_id from api
-        $request = $fc->getRequest();
-        $apiLanguageId = $request->getParam('_apiLanguageId');
-        if (!empty($apiLanguageId)
-            && preg_match('#^(?<timestamp>\d+) (?<data>.+)$#', $apiLanguageId, $matches)
-        ) {
-            try {
-                $languageId = bdApi_Crypt::decryptTypeOne($matches['data'], $matches['timestamp']);
-                if ($languageId > 0) {
-                    $cookiePrefix = XenForo_Application::getConfig()->get('cookie')->get('prefix');
-                    XenForo_Helper_Cookie::setCookie('language_id', $languageId);
-                    $_COOKIE[$cookiePrefix . 'language_id'] = $languageId;
-                    $fc->getResponse()->setHeader('X-Api-Language', $languageId);
-                }
-            } catch (XenForo_Exception $e) {
-                // ignore
-            }
-        }
-    }
-
-    public static function template_create($templateName, array &$params, XenForo_Template_Abstract $template)
-    {
-        bdApi_Template_Helper_Core::initTemplateHelpers();
-
-        if (XenForo_Application::$versionId < 1020000) {
-            // For XenForo 1.2+, we have moved to use template modifications
-            if ($templateName == 'account_wrapper') {
-                $template->preloadTemplate('bdapi_account_wrapper_sidebar');
-            } elseif ($templateName == 'PAGE_CONTAINER') {
-                $template->preloadTemplate('bdapi_navigation_visitor_tab');
-            }
-        }
-    }
-
-    public static function template_hook($hookName, &$contents, array $hookParams, XenForo_Template_Abstract $template)
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            // For XenForo 1.2+, we have moved to use template modifications
-            switch ($hookName) {
-                case 'account_wrapper_sidebar_settings':
-                    $ourTemplate = $template->create('bdapi_account_wrapper_sidebar', $template->getParams());
-                    $ourHtml = $ourTemplate->render();
-                    $contents .= $ourHtml;
-                    break;
-                case 'navigation_visitor_tab_links1':
-                    $ourTemplate = $template->create('bdapi_navigation_visitor_tab', $template->getParams());
-                    $ourHtml = $ourTemplate->render();
-                    $contents .= $ourHtml;
-                    break;
-            }
-        }
-    }
-
-    public static function file_health_check(XenForo_ControllerAdmin_Abstract $controller, array &$hashes)
-    {
-        $ourHashes = bdApi_FileSums::getHashes();
-        $hashes += $ourHashes;
-    }
-}
diff --git a/xenforo/library/bdApi/Model/AuthCode.php b/xenforo/library/bdApi/Model/AuthCode.php
deleted file mode 100755
index 9a075691..00000000
--- a/xenforo/library/bdApi/Model/AuthCode.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-class bdApi_Model_AuthCode extends XenForo_Model
-{
-    const FETCH_CLIENT = 0x01;
-    const FETCH_USER = 0x02;
-
-    public function deleteAuthCodes($clientId, $userId)
-    {
-        return $this->_getDb()->delete('xf_bdapi_auth_code', array(
-            'client_id = ?' => $clientId,
-            'user_id = ?' => $userId,
-        ));
-    }
-
-    public function pruneExpired()
-    {
-        $this->_getDb()->query('
-			DELETE FROM `xf_bdapi_auth_code`
-			WHERE expire_date > 0
-				AND expire_date < ?
-		', array(XenForo_Application::$time));
-    }
-
-    public function getAuthCodeByText($authCodeText, array $fetchOptions = array())
-    {
-        $authCodes = $this->getAuthCodes(array('auth_code_text' => $authCodeText), $fetchOptions);
-
-        return reset($authCodes);
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $authCodes = $this->getAuthCodes($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($authCodes as $authCodeId => $authCode) {
-            $list[$authCodeId] = $authCode['auth_code_text'];
-        }
-
-        return $list;
-    }
-
-    public function getAuthCodeById($authCodeId, array $fetchOptions = array())
-    {
-        $data = $this->getAuthCodes(array('auth_code_id' => $authCodeId), $fetchOptions);
-
-        return reset($data);
-    }
-
-    public function getAuthCodes(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareAuthCodeConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareAuthCodeOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareAuthCodeFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $all = $this->fetchAllKeyed($this->limitQueryResults("
-				SELECT auth_code.*
-					$joinOptions[selectFields]
-				FROM `xf_bdapi_auth_code` AS auth_code
-					$joinOptions[joinTables]
-				WHERE $whereConditions
-					$orderClause
-			", $limitOptions['limit'], $limitOptions['offset']), 'auth_code_id');
-
-        return $all;
-    }
-
-    public function countAuthCodes(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareAuthCodeConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareAuthCodeFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-			SELECT COUNT(*)
-			FROM `xf_bdapi_auth_code` AS auth_code
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-		");
-    }
-
-    public function prepareAuthCodeConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        foreach (array('auth_code_id', 'client_id', 'expire_date', 'user_id') as $columnName) {
-            if (!isset($conditions[$columnName])) {
-                continue;
-            }
-
-            if (is_array($conditions[$columnName])) {
-                if (!empty($conditions[$columnName])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "auth_code.$columnName IN (" . $db->quote($conditions[$columnName]) . ")";
-                }
-            } else {
-                $sqlConditions[] = "auth_code.$columnName = " . $db->quote($conditions[$columnName]);
-            }
-        }
-
-        if (isset($conditions['auth_code_text'])) {
-            $sqlConditions[] = 'auth_code.auth_code_text = ' . $this->_getDb()->quote($conditions['auth_code_text']);
-        }
-
-        if (isset($conditions['expired'])) {
-            if ($conditions['expired']) {
-                $sqlConditions[] = 'auth_code.expire_date > 0';
-                $sqlConditions[] = 'auth_code.expire_date < ' . XenForo_Application::$time;
-            } else {
-                $sqlConditions[] = 'auth_code.expire_date = 0 OR auth_code.expire_date > ' . XenForo_Application::$time;
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('auth_code.auth_code_text LIKE %1$s', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareAuthCodeFetchOptions(array $fetchOptions)
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & self::FETCH_CLIENT) {
-                $selectFields .= '
-					, client.name AS client_name
-					, client.description AS client_description
-					, client.redirect_uri AS client_redirect_uri';
-                $joinTables .= '
-					LEFT JOIN `xf_bdapi_client` AS client
-					ON (client.client_id = auth_code.client_id)';
-            }
-
-            if ($fetchOptions['join'] & self::FETCH_USER) {
-                $selectFields .= '
-					, user.username';
-                $joinTables .= '
-					LEFT JOIN `xf_user` AS user
-					ON (user.user_id = auth_code.user_id)';
-            }
-        }
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareAuthCodeOrderOptions(array &$fetchOptions, $defaultOrderSql = '')
-    {
-        $choices = array('issue_date' => 'auth_code.issue_date');
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Model/Client.php b/xenforo/library/bdApi/Model/Client.php
deleted file mode 100755
index 699b80f0..00000000
--- a/xenforo/library/bdApi/Model/Client.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-class bdApi_Model_Client extends XenForo_Model
-{
-    private $_clients = array();
-
-    public function signApiData($client, array &$data)
-    {
-        $str = '';
-
-        $keys = array_keys($data);
-        asort($keys);
-        foreach ($keys as $key) {
-            if ($key == 'signature') {
-                // do not include existing signature when signing
-                // it's safe to run this method more than once with the same $data
-                continue;
-            }
-
-            if (is_array($data[$key])) {
-                // do not support array in signing for now
-                unset($data[$key]);
-                continue;
-            }
-
-            if (is_bool($data[$key])) {
-                // strval(true) = 1 while strval(false) = 0
-                // so we will normalize bool to int before the strval
-                $data[$key] = ($data[$key] ? 1 : 0);
-            }
-
-            $str .= sprintf('%s=%s&', $key, $data[$key]);
-        }
-        $str .= $client['client_secret'];
-
-        $data['signature'] = md5($str);
-    }
-
-    public function canAutoAuthorize($client, $scopes)
-    {
-        $scopeArray = bdApi_Template_Helper_Core::getInstance()->scopeSplit($scopes);
-
-        foreach ($scopeArray as $scope) {
-            if (empty($client['options']['auto_authorize'][$scope])) {
-                // at least one scope requested is missing
-                // CANNOT auto authorize this set of scopes
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public function generateClientId()
-    {
-        do {
-            $clientId = $this->_generateRandomString(bdApi_Option::get('keyLength'));
-            $client = $this->getClientById($clientId);
-        } while (!empty($client));
-
-        return $clientId;
-    }
-
-    public function generateClientSecret()
-    {
-        return $this->_generateRandomString(bdApi_Option::get('secretLength'));
-    }
-
-    protected function _generateRandomString($length)
-    {
-        $chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
-        $randStr = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            $randStr .= $chars[rand(0, strlen($chars) - 1)];
-        }
-
-        return $randStr;
-    }
-
-    public function verifySecret(array $client, $secret)
-    {
-        return $client['client_secret'] == $secret;
-    }
-
-    public function getWhitelistedRedirectUri(array $client, $requestedRedirectUri)
-    {
-        if (empty($client['options']['whitelisted_domains'])) {
-            return false;
-        }
-
-        if (empty($requestedRedirectUri) OR !is_string($requestedRedirectUri)) {
-            return false;
-        }
-        $parsed = @parse_url($requestedRedirectUri);
-        if (empty($parsed['scheme']) OR empty($parsed['host'])) {
-            return false;
-        }
-
-        $domains = explode("\n", $client['options']['whitelisted_domains']);
-        foreach ($domains as $domain) {
-            if (empty($domain)) {
-                continue;
-            }
-
-            $pattern = '#^';
-            for ($i = 0, $l = utf8_strlen($domain); $i < $l; $i++) {
-                $char = utf8_substr($domain, $i, 1);
-                if ($char === '*') {
-                    $pattern .= '.+?';
-                } else {
-                    $pattern .= preg_quote($char, '#');
-                }
-            }
-            $pattern .= '$#';
-            if (preg_match($pattern, $parsed['host'])) {
-                // we have found a match
-                return $requestedRedirectUri;
-            }
-        }
-
-        return false;
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $clients = $this->getClients($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($clients as $clientId => $client) {
-            $list[$clientId] = $client['name'];
-        }
-
-        return $list;
-    }
-
-    public function getClientById($clientId, array $fetchOptions = array())
-    {
-        if (empty($fetchOptions)) {
-            foreach ($this->_clients as $client) {
-                if ($client['client_id'] == $clientId) {
-                    // try to get previously cached data
-                    return $client;
-                }
-            }
-        }
-
-        $data = $this->getClients(array('client_id' => $clientId), $fetchOptions);
-        if (empty($data)) {
-            return null;
-        }
-
-        $client = reset($data);
-        $this->_clients[$client['client_id']] = $client;
-
-        return $client;
-    }
-
-    public function getClients(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareClientConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareClientOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareClientFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $all = $this->fetchAllKeyed($this->limitQueryResults("
-				SELECT client.*
-					$joinOptions[selectFields]
-				FROM `xf_bdapi_client` AS client
-					$joinOptions[joinTables]
-				WHERE $whereConditions
-					$orderClause
-			", $limitOptions['limit'], $limitOptions['offset']), 'client_id');
-
-        foreach ($all as &$client) {
-            $client['options'] = @unserialize($client['options']);
-            if (empty($client['options'])) {
-                $client['options'] = array();
-            }
-        }
-
-        return $all;
-    }
-
-    public function countClients(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareClientConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareClientFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-			SELECT COUNT(*)
-			FROM `xf_bdapi_client` AS client
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-		");
-    }
-
-    public function prepareClientConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        foreach (array('client_id', 'user_id') as $columnName) {
-            if (!isset($conditions[$columnName])) {
-                continue;
-            }
-
-            if (is_array($conditions[$columnName])) {
-                if (!empty($conditions[$columnName])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client.$columnName IN (" . $db->quote($conditions[$columnName]) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client.$columnName = " . $db->quote($conditions[$columnName]);
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('(client.name LIKE %1$s OR client.redirect_uri LIKE %1$s)', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareClientFetchOptions(array $fetchOptions)
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareClientOrderOptions(array &$fetchOptions, $defaultOrderSql = '')
-    {
-        $choices = array();
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Model/ClientContent.php b/xenforo/library/bdApi/Model/ClientContent.php
deleted file mode 100644
index b36a995b..00000000
--- a/xenforo/library/bdApi/Model/ClientContent.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-class bdApi_Model_ClientContent extends XenForo_Model
-{
-    const FETCH_CLIENT = 0x01;
-    const FETCH_USER = 0x02;
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $clientContents = $this->getClientContents($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($clientContents as $id => $clientContent) {
-            $list[$id] = $clientContent['client_id'];
-        }
-
-        return $list;
-    }
-
-    public function getClientContentById($id, array $fetchOptions = array())
-    {
-        $clientContents = $this->getClientContents(array('client_content_id' => $id), $fetchOptions);
-
-        return reset($clientContents);
-    }
-
-    public function getClientContentIdsInRange($start, $limit)
-    {
-        $db = $this->_getDb();
-
-        return $db->fetchCol($db->limit('
-            SELECT client_content_id
-            FROM xf_bdapi_client_content
-            WHERE client_content_id > ?
-            ORDER BY client_content_id
-        ', $limit), $start);
-    }
-
-    public function getClientContents(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareClientContentConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareClientContentOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareClientContentFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $clientContents = $this->fetchAllKeyed($this->limitQueryResults("
-            SELECT client_content.*
-                $joinOptions[selectFields]
-            FROM `xf_bdapi_client_content` AS client_content
-                $joinOptions[joinTables]
-            WHERE $whereConditions
-                $orderClause
-            ", $limitOptions['limit'], $limitOptions['offset']), 'client_content_id');
-
-        foreach ($clientContents as &$clientContentRef) {
-            $clientContentRef['extraData'] = unserialize($clientContentRef['extra_data']);
-        }
-
-        return $clientContents;
-    }
-
-    public function countClientContents(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareClientContentConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareClientContentFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-            SELECT COUNT(*)
-            FROM `xf_bdapi_client_content` AS client_content
-                $joinOptions[joinTables]
-            WHERE $whereConditions
-        ");
-    }
-
-    public function prepareClientContentConditions(array $conditions = array(), array $fetchOptions = array())
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        if (isset($conditions['client_content_id'])) {
-            if (is_array($conditions['client_content_id'])) {
-                if (!empty($conditions['client_content_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.client_content_id IN (" . $db->quote($conditions['client_content_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.client_content_id = " . $db->quote($conditions['client_content_id']);
-            }
-        }
-
-        if (isset($conditions['client_id'])) {
-            if (is_array($conditions['client_id'])) {
-                if (!empty($conditions['client_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.client_id IN (" . $db->quote($conditions['client_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.client_id = " . $db->quote($conditions['client_id']);
-            }
-        }
-
-        if (isset($conditions['content_type'])) {
-            if (is_array($conditions['content_type'])) {
-                if (!empty($conditions['content_type'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.content_type IN (" . $db->quote($conditions['content_type']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.content_type = " . $db->quote($conditions['content_type']);
-            }
-        }
-
-        if (isset($conditions['content_id'])) {
-            if (is_array($conditions['content_id'])) {
-                if (!empty($conditions['content_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.content_id IN (" . $db->quote($conditions['content_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.content_id = " . $db->quote($conditions['content_id']);
-            }
-        }
-
-        if (isset($conditions['title'])) {
-            if (is_array($conditions['title'])) {
-                if (!empty($conditions['title'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.title IN (" . $db->quote($conditions['title']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.title = " . $db->quote($conditions['title']);
-            }
-        }
-
-        if (isset($conditions['date'])) {
-            if (is_array($conditions['date'])) {
-                if (!empty($conditions['date'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.date IN (" . $db->quote($conditions['date']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.date = " . $db->quote($conditions['date']);
-            }
-        }
-
-        if (isset($conditions['user_id'])) {
-            if (is_array($conditions['user_id'])) {
-                if (!empty($conditions['user_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "client_content.user_id IN (" . $db->quote($conditions['user_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "client_content.user_id = " . $db->quote($conditions['user_id']);
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('client_content.title LIKE %1$s', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareClientContentFetchOptions(array $fetchOptions = array())
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & self::FETCH_CLIENT) {
-                $selectFields .= ',
-                    client.*';
-                $joinTables .= '
-                    INNER JOIN `xf_bdapi_client` AS client
-                    ON (client.client_id = client_content.client_id)';
-            }
-
-            if ($fetchOptions['join'] & self::FETCH_USER) {
-                $selectFields .= ',
-                    user.*';
-                $joinTables .= '
-                    LEFT JOIN `xf_user` AS user
-                    ON (user.user_id = client_content.user_id)';
-            }
-        }
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareClientContentOrderOptions(array $fetchOptions = array(), $defaultOrderSql = '')
-    {
-        $choices = array(
-            'client_content_id' => 'client_content.client_content_id',
-            'date' => 'client_content.date',
-        );
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Model/Log.php b/xenforo/library/bdApi/Model/Log.php
deleted file mode 100755
index 69159d71..00000000
--- a/xenforo/library/bdApi/Model/Log.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-class bdApi_Model_Log extends XenForo_Model
-{
-    protected static $_logging = 1;
-
-    public function pauseLogging()
-    {
-        self::$_logging--;
-    }
-
-    public function resumeLogging()
-    {
-        self::$_logging++;
-    }
-
-    public function pruneExpired()
-    {
-        $days = bdApi_Option::get('logRetentionDays');
-        $cutoff = XenForo_Application::$time - $days * 86400;
-
-        return $this->_getDb()->query('DELETE FROM xf_bdapi_log WHERE request_date < ?', $cutoff);
-    }
-
-    public function logRequest(
-        $requestMethod,
-        $requestUri,
-        array $requestData,
-        $responseCode,
-        array $responseOutput,
-        array $bulkSet = array()
-    ) {
-        if (self::$_logging < 1) {
-            return false;
-        }
-
-        $days = bdApi_Option::get('logRetentionDays');
-        if ($days == 0) {
-            return false;
-        }
-
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_Log');
-
-        $dw->bulkSet($bulkSet);
-        if (!isset($bulkSet['client_id'])) {
-            /* @var $session bdApi_Session */
-            $session = XenForo_Application::getSession();
-            $dw->set('client_id', $session->getOAuthClientId());
-        }
-        if (!isset($bulkSet['user_id'])) {
-            $visitor = XenForo_Visitor::getInstance();
-            $dw->set('user_id', $visitor->get('user_id'));
-        }
-        if (!isset($bulkSet['ip_address'])) {
-            $dw->set('ip_address', isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '');
-        }
-
-        $dw->set('request_date', XenForo_Application::$time);
-        $dw->set('request_method', $requestMethod);
-        $dw->set('request_uri', $requestUri);
-        $dw->set('request_data', $this->_filterData($requestData));
-        $dw->set('response_code', $responseCode);
-        $dw->set('response_output', $this->_filterData($responseOutput));
-
-        return $dw->save();
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $data = $this->getLogs($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($data as $id => $row) {
-            $list[$id] = $row['client_id'];
-        }
-
-        return $list;
-    }
-
-    public function getLogById($id, array $fetchOptions = array())
-    {
-        $data = $this->getLogs(array('log_id' => $id), $fetchOptions);
-
-        return reset($data);
-    }
-
-    public function getLogs(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareLogConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareLogOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareLogFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $all = $this->fetchAllKeyed($this->limitQueryResults("
-				SELECT log.*
-				$joinOptions[selectFields]
-				FROM `xf_bdapi_log` AS log
-				$joinOptions[joinTables]
-				WHERE $whereConditions
-				$orderClause
-				", $limitOptions['limit'], $limitOptions['offset']), 'log_id');
-
-        foreach ($all as &$record) {
-            $record['request_data'] = unserialize($record['request_data']);
-            $record['response_output'] = unserialize($record['response_output']);
-        }
-
-        return $all;
-    }
-
-    public function countLogs(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareLogConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareLogFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-				SELECT COUNT(*)
-				FROM `xf_bdapi_log` AS log
-				$joinOptions[joinTables]
-				WHERE $whereConditions
-				");
-    }
-
-    public function prepareLogConditions(array $conditions = array(), array $fetchOptions = array())
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        if (isset($conditions['log_id'])) {
-            if (is_array($conditions['log_id'])) {
-                if (!empty($conditions['log_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.log_id IN (" . $db->quote($conditions['log_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.log_id = " . $db->quote($conditions['log_id']);
-            }
-        }
-
-        if (isset($conditions['client_id'])) {
-            if (is_array($conditions['client_id'])) {
-                if (!empty($conditions['client_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.client_id IN (" . $db->quote($conditions['client_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.client_id = " . $db->quote($conditions['client_id']);
-            }
-        }
-
-        if (isset($conditions['user_id'])) {
-            if (is_array($conditions['user_id'])) {
-                if (!empty($conditions['user_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.user_id IN (" . $db->quote($conditions['user_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.user_id = " . $db->quote($conditions['user_id']);
-            }
-        }
-
-        if (isset($conditions['ip_address'])) {
-            if (is_array($conditions['ip_address'])) {
-                if (!empty($conditions['ip_address'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.ip_address IN (" . $db->quote($conditions['ip_address']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.ip_address = " . $db->quote($conditions['ip_address']);
-            }
-        }
-
-        if (isset($conditions['request_date'])) {
-            if (is_array($conditions['request_date'])) {
-                if (!empty($conditions['request_date'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.request_date IN (" . $db->quote($conditions['request_date']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.request_date = " . $db->quote($conditions['request_date']);
-            }
-        }
-
-        if (isset($conditions['request_method'])) {
-            if (is_array($conditions['request_method'])) {
-                if (!empty($conditions['request_method'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.request_method IN (" . $db->quote($conditions['request_method']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.request_method = " . $db->quote($conditions['request_method']);
-            }
-        }
-
-        if (isset($conditions['response_code'])) {
-            if (is_array($conditions['response_code'])) {
-                if (!empty($conditions['response_code'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "log.response_code IN (" . $db->quote($conditions['response_code']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "log.response_code = " . $db->quote($conditions['response_code']);
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('(log.ip_address LIKE %1$s OR log.request_uri LIKE %1$s)', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareLogFetchOptions(array $fetchOptions = array())
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareLogOrderOptions(array $fetchOptions = array(), $defaultOrderSql = '')
-    {
-        $choices = array('request_date' => 'log.request_date');
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-
-    protected function _filterData(array &$data, $level = 0)
-    {
-        $filtered = array();
-
-        $i = 0;
-        foreach ($data as $key => &$value) {
-            $keyFirstChar = substr($key, 0, 1);
-            if ($keyFirstChar === '.'
-                || $keyFirstChar === '_'
-            ) {
-                continue;
-            }
-
-            $i++;
-            if ($i === 2) {
-                // only expand the first item in a pure array
-                $keys = array_keys($data);
-                $isNotNumeric = false;
-                foreach ($keys as $_key) {
-                    if (!is_numeric($_key)) {
-                        $isNotNumeric = true;
-                    }
-                }
-                if (!$isNotNumeric) {
-                    $filtered['...'] = count($keys);
-                    return $filtered;
-                }
-            }
-
-            if (is_array($value)) {
-                if ($level < 3) {
-                    $filtered[$key] = $this->_filterData($value, $level + 1);
-                } else {
-                    $filtered[$key] = '(array)';
-                }
-            } else {
-                if (is_bool($value)) {
-                    $filtered[$key] = $value;
-                } elseif (is_numeric($value)) {
-                    $filtered[$key] = $value;
-                } else {
-                    try {
-                        $valueAsString = strval($value);
-                        if (strlen($valueAsString) > 0) {
-                            $maxLength = 32;
-                            if (utf8_strlen($valueAsString) > $maxLength) {
-                                $filtered[$key] = utf8_substr($valueAsString, 0, $maxLength - 1) . '…';
-                            } else {
-                                $filtered[$key] = $valueAsString;
-                            }
-                        }
-                    } catch (Exception $e) {
-                        $filtered[$key] = sprintf('Exception(%s)', $e->getMessage());
-                    }
-                }
-            }
-        }
-
-        return $filtered;
-    }
-}
diff --git a/xenforo/library/bdApi/Model/OAuth2.php b/xenforo/library/bdApi/Model/OAuth2.php
deleted file mode 100755
index 2ddb252f..00000000
--- a/xenforo/library/bdApi/Model/OAuth2.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-class bdApi_Model_OAuth2 extends XenForo_Model
-{
-    const SCOPE_READ = 'read';
-    const SCOPE_POST = 'post';
-    const SCOPE_MANAGE_ACCOUNT_SETTINGS = 'usercp';
-    const SCOPE_PARTICIPATE_IN_CONVERSATIONS = 'conversate';
-    const SCOPE_MANAGE_SYSTEM = 'admincp';
-
-    protected static $_serverInstance = false;
-
-    /**
-     * Gets the server object. Only one instance will be created for
-     * each page request.
-     *
-     * @return bdApi_OAuth2
-     */
-    public function getServer()
-    {
-        if (self::$_serverInstance === false) {
-            self::$_serverInstance = new bdApi_OAuth2($this);
-        }
-
-        return self::$_serverInstance;
-    }
-
-    public function getAuthorizeParamsInputFilter()
-    {
-        return array(
-            'client_id' => XenForo_Input::STRING,
-            'response_type' => XenForo_Input::STRING,
-            'redirect_uri' => XenForo_Input::STRING,
-            'state' => XenForo_Input::STRING,
-            'scope' => XenForo_Input::STRING,
-
-            'social' => XenForo_Input::STRING,
-        );
-    }
-
-    /**
-     * Gets supported scopes for server. Other add-ons can override
-     * this method to support more scopes.
-     *
-     * @return array an array of supported scopes
-     */
-    public function getSystemSupportedScopes()
-    {
-        return array(
-            self::SCOPE_READ,
-            self::SCOPE_POST,
-            self::SCOPE_MANAGE_ACCOUNT_SETTINGS,
-            self::SCOPE_PARTICIPATE_IN_CONVERSATIONS,
-            self::SCOPE_MANAGE_SYSTEM,
-        );
-    }
-
-    public function getAutoAndUserScopes($clientId, $userId)
-    {
-        $client = $this->getClientModel()->getClientById($clientId);
-        if (empty($client)) {
-            return '';
-        }
-
-        $scopes = array();
-        if (!empty($client['options']['auto_authorize'])) {
-            foreach ($client['options']['auto_authorize'] as $scope => $canAutoAuthorize) {
-                if ($canAutoAuthorize) {
-                    $scopes[] = $scope;
-                }
-            }
-        }
-
-        $userScopes = $this->getUserScopeModel()->getUserScopes($client['client_id'], $userId);
-        if (!empty($userScopes)) {
-            foreach ($userScopes as $scope => $userScope) {
-                $scopes[] = $scope;
-            }
-            $scopes = array_unique($scopes);
-        }
-
-        return bdApi_Template_Helper_Core::getInstance()->scopeJoin($scopes);
-    }
-
-    /**
-     * Generate key pair to use with JWT Bearer grant type.
-     *
-     * @return array of $privKey and $pubKey
-     */
-    public function generateKeyPair()
-    {
-        $key = openssl_pkey_new();
-
-        openssl_pkey_export($key, $privKey);
-
-        $details = openssl_pkey_get_details($key);
-        $pubKey = $details["key"];
-
-        return array($privKey, $pubKey);
-    }
-
-    /**
-     * @return XenForo_Model_User
-     */
-    public function getUserModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('XenForo_Model_User');
-    }
-
-    /**
-     * @return bdApi_Model_AuthCode
-     */
-    public function getAuthCodeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_AuthCode');
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    public function getClientModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Client');
-    }
-
-    /**
-     * @return bdApi_Model_RefreshToken
-     */
-    public function getRefreshTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_RefreshToken');
-    }
-
-    /**
-     * @return bdApi_Model_Token
-     */
-    public function getTokenModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Token');
-    }
-
-    /**
-     * @return bdApi_Model_UserScope
-     */
-    public function getUserScopeModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_UserScope');
-    }
-
-    /**
-     * @return bdApi_Model_Subscription
-     */
-    public function getSubscriptionModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Subscription');
-    }
-
-    /**
-     * @return bdApi_Model_Log
-     */
-    public function getLogModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Log');
-    }
-}
diff --git a/xenforo/library/bdApi/Model/PingQueue.php b/xenforo/library/bdApi/Model/PingQueue.php
deleted file mode 100644
index 13739d3c..00000000
--- a/xenforo/library/bdApi/Model/PingQueue.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-class bdApi_Model_PingQueue extends XenForo_Model
-{
-    public function insertQueue($callback, $objectType, array $data, $expireDate = 0, $queueDate = 0)
-    {
-        $this->_getDb()->insert('xf_bdapi_ping_queue', array(
-            'callback_md5' => md5($callback),
-            'callback' => $callback,
-            'object_type' => $objectType,
-            'data' => serialize($data),
-            'queue_date' => $queueDate,
-            'expire_date' => $expireDate,
-        ));
-
-        if (bdApi_Option::getConfig('pingQueueUseDefer')
-            && is_callable(array(
-                'XenForo_Application',
-                'defer'
-            ))
-        ) {
-            $triggerDate = null;
-            if ($queueDate > 0) {
-                $triggerDate = $queueDate;
-            }
-
-            XenForo_Application::defer('bdApi_Deferred_PingQueue', array(), __CLASS__, false, $triggerDate);
-        }
-    }
-
-    public function reInsertQueue($records)
-    {
-        foreach ($records as $record) {
-            $data = $record['data'];
-
-            if (!isset($data['_retries'])) {
-                $data['_retries'] = 0;
-            } else {
-                $data['_retries']++;
-            }
-            if ($data['_retries'] > 5) {
-                // too many tries
-                continue;
-            }
-
-            $queueDate = time() + 60 * pow(2, $data['_retries'] - 1);
-
-            $this->insertQueue($record['callback'], $record['object_type'], $data, $record['expire_date'], $queueDate);
-        }
-    }
-
-    public function hasQueue()
-    {
-        $minId = $this->_getDb()->fetchOne('
-			SELECT MIN(ping_queue_id)
-			FROM xf_bdapi_ping_queue
-			WHERE queue_date < ?
-		', array(XenForo_Application::$time));
-
-        return (bool)$minId;
-    }
-
-    public function getQueue($limit = 20)
-    {
-        $queueRecords = $this->fetchAllKeyed($this->limitQueryResults('
-			SELECT *
-			FROM xf_bdapi_ping_queue
-			WHERE queue_date < ?
-			ORDER BY callback_md5
-		', $limit), 'ping_queue_id', array(XenForo_Application::$time));
-
-        foreach ($queueRecords as &$record) {
-            $record['data'] = unserialize($record['data']);
-        }
-
-        return $queueRecords;
-    }
-
-    public function runQueue($targetRunTime = 0)
-    {
-        $s = microtime(true);
-
-        do {
-            $queueRecords = $this->getQueue($targetRunTime ? 20 : 0);
-
-            $this->ping($queueRecords);
-
-            if ($targetRunTime && microtime(true) - $s > $targetRunTime) {
-                break;
-            }
-        } while ($queueRecords);
-
-        return $this->hasQueue();
-    }
-
-    public function ping(array $queueRecords)
-    {
-        /* @var $logModel bdApi_Model_Log */
-        $logModel = $this->getModelFromCache('bdApi_Model_Log');
-
-        while (count($queueRecords) > 0) {
-            $records = array();
-
-            foreach (array_keys($queueRecords) as $key) {
-                if (count($records) == 0 OR $queueRecords[$key]['callback'] === $records[0]['callback']) {
-                    $record = $queueRecords[$key];
-                    unset($queueRecords[$key]);
-
-                    if (!$this->_getDb()->delete(
-                        'xf_bdapi_ping_queue',
-                        'ping_queue_id = ' . intval($record['ping_queue_id'])
-                    )
-                    ) {
-                        // already been deleted - run elsewhere
-                        continue;
-                    }
-
-                    if ($record['expire_date'] > 0 AND $record['expire_date'] < XenForo_Application::$time) {
-                        // expired
-                        continue;
-                    }
-
-                    $records[] = $record;
-                }
-            }
-
-            $payloads = $this->_preparePayloadsFromRecords($records);
-            if (empty($payloads)) {
-                continue;
-            }
-
-            $client = XenForo_Helper_Http::getClient($records[0]['callback']);
-            $client->setHeaders('Content-Type', 'application/json');
-            $client->setRawData(json_encode($payloads));
-
-            $reInserted = false;
-
-            try {
-                $response = $client->request('POST');
-                $responseBody = $response->getBody();
-                $responseCode = $response->getStatus();
-            } catch (Zend_Http_Client_Exception $e) {
-                $response = null;
-                $responseBody = $e->getMessage();
-                $responseCode = 500;
-            }
-
-            if ($responseCode < 200 OR $responseCode > 299) {
-                $this->reInsertQueue($records);
-                $reInserted = true;
-            }
-
-            if (XenForo_Application::debugMode() || $reInserted) {
-                $logModel->logRequest(
-                    'POST',
-                    $records[0]['callback'],
-                    $payloads,
-                    $responseCode,
-                    array('message' => $responseBody),
-                    array(
-                        'client_id' => '',
-                        'user_id' => 0,
-                        'ip_address' => '127.0.0.1',
-                    )
-                );
-            }
-        }
-    }
-
-    protected function _preparePayloadsFromRecords(array $records)
-    {
-        $dataByTypes = array();
-        $payloads = array();
-
-        foreach ($records as $key => $record) {
-            if (!isset($dataByTypes[$record['object_type']])) {
-                $dataByTypes[$record['object_type']] = array();
-            }
-            $dataByTypes[$record['object_type']][$key] = $record['data'];
-        }
-
-        /* @var $subscriptionModel bdApi_Model_Subscription */
-        $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-        foreach ($dataByTypes as $objectType => &$dataMany) {
-            $dataMany = $subscriptionModel->preparePingDataMany($objectType, $dataMany);
-        }
-
-        foreach ($records as $key => $record) {
-            if (!empty($dataByTypes[$record['object_type']][$key])) {
-                $payloads[$key] = $dataByTypes[$record['object_type']][$key];
-            }
-        }
-
-        return $payloads;
-    }
-}
diff --git a/xenforo/library/bdApi/Model/RefreshToken.php b/xenforo/library/bdApi/Model/RefreshToken.php
deleted file mode 100755
index e9d02f54..00000000
--- a/xenforo/library/bdApi/Model/RefreshToken.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-class bdApi_Model_RefreshToken extends XenForo_Model
-{
-    const FETCH_CLIENT = 0x01;
-    const FETCH_USER = 0x02;
-
-    public function deleteRefreshTokens($clientId, $userId)
-    {
-        return $this->_getDb()->delete('xf_bdapi_refresh_token', array(
-            'client_id = ?' => $clientId,
-            'user_id = ?' => $userId,
-        ));
-    }
-
-    public function pruneExpired()
-    {
-        $this->_getDb()->query('
-			DELETE FROM `xf_bdapi_refresh_token`
-			WHERE expire_date > 0
-				AND expire_date < ?
-		', array(XenForo_Application::$time));
-    }
-
-    public function getRefreshTokenByText($refreshTokenText, array $fetchOptions = array())
-    {
-        $refreshTokens = $this->getRefreshTokens(array('refresh_token_text' => $refreshTokenText), $fetchOptions);
-
-        return reset($refreshTokens);
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $refreshTokens = $this->getRefreshTokens($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($refreshTokens as $refreshTokenId => $refreshToken) {
-            $list[$refreshTokenId] = $refreshToken['refresh_token_text'];
-        }
-
-        return $list;
-    }
-
-    public function getRefreshTokenById($refreshTokenId, array $fetchOptions = array())
-    {
-        $data = $this->getRefreshTokens(array('refresh_token_id' => $refreshTokenId), $fetchOptions);
-
-        return reset($data);
-    }
-
-    public function getRefreshTokens(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareRefreshTokenConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareRefreshTokenOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareRefreshTokenFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $all = $this->fetchAllKeyed($this->limitQueryResults("
-				SELECT refresh_token.*
-					$joinOptions[selectFields]
-				FROM `xf_bdapi_refresh_token` AS refresh_token
-					$joinOptions[joinTables]
-				WHERE $whereConditions
-					$orderClause
-			", $limitOptions['limit'], $limitOptions['offset']), 'refresh_token_id');
-
-        return $all;
-    }
-
-    public function countRefreshTokens(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareRefreshTokenConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareRefreshTokenFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-			SELECT COUNT(*)
-			FROM `xf_bdapi_refresh_token` AS refresh_token
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-		");
-    }
-
-    public function prepareRefreshTokenConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        foreach (array('refresh_token_id', 'client_id', 'expire_date', 'user_id') as $columnName) {
-            if (!isset($conditions[$columnName])) {
-                continue;
-            }
-
-            if (is_array($conditions[$columnName])) {
-                if (!empty($conditions[$columnName])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "refresh_token.$columnName IN (" . $db->quote($conditions[$columnName]) . ")";
-                }
-            } else {
-                $sqlConditions[] = "refresh_token.$columnName = " . $db->quote($conditions[$columnName]);
-            }
-        }
-
-        if (isset($conditions['refresh_token_text'])) {
-            $sqlConditions[] = 'refresh_token.refresh_token_text = ' . $this->_getDb()->quote($conditions['refresh_token_text']);
-        }
-
-        if (isset($conditions['expired'])) {
-            if ($conditions['expired']) {
-                $sqlConditions[] = 'refresh_token.expire_date > 0';
-                $sqlConditions[] = 'refresh_token.expire_date < ' . XenForo_Application::$time;
-            } else {
-                $sqlConditions[] = 'refresh_token.expire_date = 0 OR refresh_token.expire_date > ' . XenForo_Application::$time;
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('refresh_token.refresh_token_text LIKE %1$s', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareRefreshTokenFetchOptions(array $fetchOptions)
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & self::FETCH_CLIENT) {
-                $selectFields .= '
-					, client.name AS client_name
-					, client.description AS client_description
-					, client.redirect_uri AS client_redirect_uri';
-                $joinTables .= '
-					LEFT JOIN `xf_bdapi_client` AS client
-					ON (client.client_id = refresh_token.client_id)';
-            }
-
-            if ($fetchOptions['join'] & self::FETCH_USER) {
-                $selectFields .= '
-					, user.username';
-                $joinTables .= '
-					LEFT JOIN `xf_user` AS user
-					ON (user.user_id = refresh_token.user_id)';
-            }
-        }
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareRefreshTokenOrderOptions(array &$fetchOptions, $defaultOrderSql = '')
-    {
-        $choices = array('issue_date' => 'refresh_token.issue_date');
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Model/Subscription.php b/xenforo/library/bdApi/Model/Subscription.php
deleted file mode 100644
index c62d83de..00000000
--- a/xenforo/library/bdApi/Model/Subscription.php
+++ /dev/null
@@ -1,660 +0,0 @@
-<?php
-
-class bdApi_Model_Subscription extends XenForo_Model
-{
-    const TYPE_NOTIFICATION = 'user_notification';
-    const TYPE_THREAD_POST = 'thread_post';
-
-    const TYPE_USER = 'user';
-    const TYPE_USER_0_SIMPLE_CACHE = 'apiUser0';
-
-    // this is a special type, blank topic will be detect as this type
-    const TYPE_CLIENT = '__client__';
-    const TYPE_CLIENT_DATA_REGISTRY = 'apiSubs';
-
-    const FETCH_CLIENT = 0x01;
-
-    public function getClientSubscriptionsData()
-    {
-        $data = $this->_getDataRegistryModel()->get(self::TYPE_CLIENT_DATA_REGISTRY);
-
-        if (empty($data)) {
-            $data = array();
-        }
-
-        return $data;
-    }
-
-    public function updateCallbacksForTopic($topic)
-    {
-        list($type, $id) = self::parseTopic($topic);
-
-        $subscriptions = $this->getSubscriptions(array(
-            'topic' => $topic,
-            'expired' => false,
-        ));
-
-        switch ($type) {
-            case self::TYPE_NOTIFICATION:
-                if (!empty($subscriptions)) {
-                    $userOption = array(
-                        'topic' => $topic,
-                        'link' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                            'notifications',
-                            null,
-                            array('oauth_token' => '')
-                        ),
-                        'subscriptions' => $subscriptions,
-                    );
-                } else {
-                    $userOption = array();
-                }
-
-                $this->_getDb()->update(
-                    'xf_user_option',
-                    array(bdApi_Option::getConfig('subscriptionColumnUserNotification') => serialize($userOption)),
-                    array('user_id = ?' => $id)
-                );
-                break;
-            case self::TYPE_THREAD_POST:
-                if (!empty($subscriptions)) {
-                    $threadOption = array(
-                        'topic' => $topic,
-                        'link' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                            'posts',
-                            null,
-                            array(
-                                'thread_id' => $id,
-                                'oauth_token' => '',
-                            )
-                        ),
-                        'subscriptions' => $subscriptions,
-                    );
-                } else {
-                    $threadOption = array();
-                }
-
-                $this->_getDb()->update(
-                    'xf_thread',
-                    array(bdApi_Option::getConfig('subscriptionColumnThreadPost') => serialize($threadOption)),
-                    array('thread_id = ?' => $id)
-                );
-                break;
-            case self::TYPE_USER:
-                if (!empty($subscriptions)) {
-                    $userOption = array(
-                        'topic' => $topic,
-                        'link' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                            'users',
-                            array('user_id' => $id),
-                            array('oauth_token' => '')
-                        ),
-                        'subscriptions' => $subscriptions,
-                    );
-                } else {
-                    $userOption = array();
-                }
-
-                if ($id > 0) {
-                    $this->_getDb()->update(
-                        'xf_user_option',
-                        array(bdApi_Option::getConfig('subscriptionColumnUser') => serialize($userOption)),
-                        array('user_id = ?' => $id)
-                    );
-                } else {
-                    XenForo_Application::setSimpleCacheData(self::TYPE_USER_0_SIMPLE_CACHE, $userOption);
-                }
-                break;
-            case self::TYPE_CLIENT:
-                if (!empty($subscriptions)) {
-                    $data = array(
-                        'topic' => $topic,
-                        'link' => '',
-                        'subscriptions' => $subscriptions,
-                    );
-                } else {
-                    $data = array();
-                }
-
-                $this->_getDataRegistryModel()->set(self::TYPE_CLIENT_DATA_REGISTRY, $data);
-                break;
-        }
-    }
-
-    public function ping(array $option, $action, $objectType, $objectData)
-    {
-        if (!isset($option['topic'])
-            || empty($option['subscriptions'])
-        ) {
-            return false;
-        }
-
-        $pingedClientIds = array();
-
-        /* @var $pingQueueModel bdApi_Model_PingQueue */
-        $pingQueueModel = $this->getModelFromCache('bdApi_Model_PingQueue');
-
-        foreach ($option['subscriptions'] as $subscription) {
-            if ($subscription['expire_date'] > 0
-                && $subscription['expire_date'] < XenForo_Application::$time
-            ) {
-                // expired
-                continue;
-            }
-
-            if (in_array($subscription['client_id'], $pingedClientIds, true)) {
-                // duplicated subscription
-                continue;
-            }
-            $pingedClientIds[] = $subscription['client_id'];
-
-            $pingData = array(
-                'client_id' => $subscription['client_id'],
-                'topic' => $option['topic'],
-                'action' => $action,
-                'object_data' => $objectData,
-            );
-
-            if (!empty($option['link'])) {
-                $pingData['link'] = $option['link'];
-            }
-
-            $pingQueueModel->insertQueue(
-                $subscription['callback'],
-                $objectType,
-                $pingData,
-                $subscription['expire_date']
-            );
-        }
-
-        return true;
-    }
-
-    public function preparePingDataMany($objectType, array $pingDataMany)
-    {
-        if (!bdApi_Option::getSubscription($objectType)) {
-            // subscription for this topic type has been disabled
-            return array();
-        }
-
-        switch ($objectType) {
-            case self::TYPE_NOTIFICATION:
-                return $this->_preparePingDataManyNotification($pingDataMany);
-            case self::TYPE_THREAD_POST:
-                return $this->_preparePingDataManyPost($pingDataMany);
-            case self::TYPE_USER:
-                return $this->_preparePingDataManyUser($pingDataMany);
-        }
-
-        return array();
-    }
-
-    protected function _preparePingDataManyNotification($pingDataMany)
-    {
-        /* @var $alertModel bdApi_XenForo_Model_Alert */
-        $alertModel = $this->getModelFromCache('XenForo_Model_Alert');
-
-        $alertIds = array();
-        $alerts = array();
-        foreach ($pingDataMany as $key => &$pingDataRef) {
-            if (is_numeric($pingDataRef['object_data'])) {
-                $alertIds[] = $pingDataRef['object_data'];
-            } elseif (is_array($pingDataRef['object_data'])
-                && isset($pingDataRef['object_data']['alert_id'])
-                && $pingDataRef['object_data']['alert_id'] == 0
-            ) {
-                $fakeAlertId = sprintf(md5($key));
-                $pingDataRef['object_data']['alert_id'] = $fakeAlertId;
-                $alerts[$fakeAlertId] = $pingDataRef['object_data'];
-                $pingDataRef['object_data'] = $fakeAlertId;
-            }
-        }
-
-        if (!empty($alertIds)) {
-            $realAlerts = $alertModel->bdApi_getAlertsByIds($alertIds);
-            foreach ($realAlerts as $alertId => $alert) {
-                $alerts[$alertId] = $alert;
-            }
-        }
-
-        $userIds = array();
-        $alertsByUser = array();
-        foreach ($alerts as $alert) {
-            $userIds[] = $alert['alerted_user_id'];
-
-            if (!isset($alertsByUser[$alert['alerted_user_id']])) {
-                $alertsByUser[$alert['alerted_user_id']] = array();
-            }
-            $alertsByUser[$alert['alerted_user_id']][$alert['alert_id']] = $alert;
-        }
-
-        $viewingUsers = $this->_preparePingData_getViewingUsers($userIds);
-        foreach ($alertsByUser as $userId => &$userAlerts) {
-            if (!isset($viewingUsers[$userId])) {
-                // user not found
-                foreach (array_keys($userAlerts) as $userAlertId) {
-                    // delete the alert too
-                    unset($alerts[$userAlertId]);
-                }
-                continue;
-            }
-
-            $userAlerts = $alertModel->bdApi_prepareContentForAlerts($userAlerts, $viewingUsers[$userId]);
-
-            bdApi_Template_Simulation_Template::$bdApi_visitor = $viewingUsers[$userId];
-            $userAlerts = bdApi_ViewApi_Helper_Alert::getTemplates(
-                bdApi_Template_Simulation_View::create(),
-                $userAlerts,
-                $alertModel->bdApi_getAlertHandlers()
-            );
-
-            foreach (array_keys($userAlerts) as $userAlertId) {
-                $alerts[$userAlertId] = $userAlerts[$userAlertId];
-            }
-        }
-
-        foreach (array_keys($pingDataMany) as $pingDataKey) {
-            $pingDataRef = &$pingDataMany[$pingDataKey];
-
-            if (empty($pingDataRef['object_data'])) {
-                // no alert is attached to object data
-                continue;
-            }
-
-            if (!isset($alerts[$pingDataRef['object_data']])) {
-                // alert not found
-                unset($pingDataMany[$pingDataKey]);
-                continue;
-            }
-            $alertRef = &$alerts[$pingDataRef['object_data']];
-
-            $pingDataRef['object_data'] = $alertModel->prepareApiDataForAlert($alertRef);
-            if (isset($alertRef['template'])) {
-                $pingDataRef['object_data']['notification_html'] = strval($alertRef['template']);
-            }
-            if (!is_numeric($alertRef['alert_id'])
-                && !empty($alertRef['extra']['object_data'])
-            ) {
-                // fake alert, use the included object_data
-                $pingDataRef['object_data'] = array_merge(
-                    $pingDataRef['object_data'],
-                    $alertRef['extra']['object_data']
-                );
-            }
-
-            $alertedUserId = $alertRef['alerted_user_id'];
-            if (isset($viewingUsers[$alertedUserId])) {
-                $alertedUser = $viewingUsers[$alertedUserId];
-                if (isset($alertedUser['alerts_unread'])) {
-                    $pingDataRef['object_data']['user_unread_notification_count'] = $alertedUser['alerts_unread'];
-                }
-            }
-        }
-
-        return $pingDataMany;
-    }
-
-    protected function _preparePingDataManyPost($pingDataMany)
-    {
-        // TODO: do anything here?
-        return $pingDataMany;
-    }
-
-    protected function _preparePingDataManyUser($pingDataMany)
-    {
-        // TODO: do anything here?
-        return $pingDataMany;
-    }
-
-    protected function _preparePingData_getViewingUsers($userIds)
-    {
-        static $allUsers = array();
-        $users = array();
-
-        /* @var $userModel XenForo_Model_User */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-
-        $dbUserIds = array();
-        foreach ($userIds as $userId) {
-            if ($userId == XenForo_Visitor::getUserId()) {
-                $users[$userId] = XenForo_Visitor::getInstance()->toArray();
-            } elseif ($userId == 0) {
-                $users[$userId] = $userModel->getVisitingGuestUser();
-            } elseif (isset($allUsers[$userId])) {
-                $users[$userId] = $allUsers[$userId];
-            } else {
-                $dbUserIds[] = $userId;
-            }
-        }
-
-        if (!empty($dbUserIds)) {
-            $dbUsers = $userModel->getUsersByIds(
-                $dbUserIds,
-                array(
-                    'join' => XenForo_Model_User::FETCH_USER_FULL
-                        | XenForo_Model_User::FETCH_USER_PERMISSIONS
-                )
-            );
-
-            foreach ($dbUsers as $user) {
-                $user = $userModel->prepareUser($user);
-                $user['permissions'] = XenForo_Permission::unserializePermissions($user['global_permission_cache']);
-
-                $allUsers[$user['user_id']] = $user;
-                $users[$user['user_id']] = $user;
-            }
-        }
-
-        return $users;
-    }
-
-    public function isValidTopic(&$topic, array $viewingUser = null)
-    {
-        list($type, $id) = self::parseTopic($topic);
-
-        if ($type != self::TYPE_CLIENT
-            && !bdApi_Option::getSubscription($type)
-        ) {
-            // subscription for this topic type has been disabled
-            return false;
-        }
-
-        $this->standardizeViewingUserReference($viewingUser);
-        $session = bdApi_Data_Helper_Core::safeGetSession();
-
-        switch ($type) {
-            case self::TYPE_NOTIFICATION:
-                if ($id === 'me') {
-                    // now supports user_notification_me
-                    $id = $viewingUser['user_id'];
-                    $topic = self::getTopic($type, $id);
-                }
-
-                return (($id > 0) AND ($id == $viewingUser['user_id']));
-            case self::TYPE_THREAD_POST:
-                /* @var $threadModel XenForo_Model_Thread */
-                $threadModel = $this->getModelFromCache('XenForo_Model_Thread');
-                $thread = $threadModel->getThreadById($id);
-
-                return $thread['user_id'] == $viewingUser['user_id'];
-            case self::TYPE_USER:
-                if ($id === 'me') {
-                    // now supports user_me
-                    $id = $viewingUser['user_id'];
-                    $topic = self::getTopic($type, $id);
-                }
-
-                if ($id === '0'
-                    && !$session->getOAuthClientOption('allow_user_0_subscription')
-                ) {
-                    return false;
-                }
-
-                return (intval($id) === intval($viewingUser['user_id']));
-            case self::TYPE_CLIENT:
-                return $session->getOAuthClientId() !== '';
-        }
-
-        return false;
-    }
-
-    public function verifyIntentOfSubscriber($callback, $mode, $topic, $leaseSeconds, array $extraParams = array())
-    {
-        $challenge = md5(XenForo_Application::$time . $callback . $mode . $topic . $leaseSeconds);
-        $challenge = md5($challenge . XenForo_Application::getConfig()->get('globalSalt'));
-
-        $client = XenForo_Helper_Http::getClient($callback);
-
-        $requestData = array_merge(array(
-            'hub.mode' => $mode,
-            'hub.topic' => $topic,
-            'hub.lease_seconds' => $leaseSeconds,
-            'hub.challenge' => $challenge,
-        ), $extraParams);
-        $client->setParameterGet($requestData);
-
-        $response = $client->request('GET');
-        $body = trim($response->getBody());
-
-        if (XenForo_Application::debugMode()) {
-            /* @var $logModel bdApi_Model_Log */
-            $logModel = $this->getModelFromCache('bdApi_Model_Log');
-
-            $logModel->logRequest(
-                'GET',
-                $callback,
-                $requestData,
-                $response->getStatus(),
-                array('message' => $response->getBody()),
-                array(
-                    'client_id' => '',
-                    'user_id' => 0,
-                    'ip_address' => '127.0.0.1',
-                )
-            );
-        }
-
-        if ($body !== $challenge) {
-            return false;
-        }
-
-        if ($response->getStatus() < 200 OR $response->getStatus() > 299) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function deleteSubscriptionsForTopic($type, $id)
-    {
-        $topic = sprintf('%s_%s', $type, $id);
-
-        $deleted = $this->_getDb()->delete('xf_bdapi_subscription', array('topic = ?' => $topic));
-
-        return $deleted;
-    }
-
-    public function deleteSubscriptions($clientId, $type, $id)
-    {
-        $topic = sprintf('%s_%s', $type, $id);
-
-        $deleted = $this->_getDb()->delete('xf_bdapi_subscription', array(
-            'client_id = ?' => $clientId,
-            'topic = ?' => $topic,
-        ));
-
-        if ($deleted) {
-            $this->updateCallbacksForTopic($topic);
-        }
-
-        return $deleted;
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $subscriptions = $this->getSubscriptions($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($subscriptions as $id => $subscription) {
-            $list[$id] = $subscription['client_id'];
-        }
-
-        return $list;
-    }
-
-    public function getSubscriptionById($id, array $fetchOptions = array())
-    {
-        $subscriptions = $this->getSubscriptions(array('subscription_id' => $id), $fetchOptions);
-
-        return reset($subscriptions);
-    }
-
-    public function getSubscriptions(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareSubscriptionConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareSubscriptionOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareSubscriptionFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $subscriptions = $this->fetchAllKeyed($this->limitQueryResults("
-			SELECT subscription.*
-				$joinOptions[selectFields]
-			FROM `xf_bdapi_subscription` AS subscription
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-				$orderClause
-			", $limitOptions['limit'], $limitOptions['offset']), 'subscription_id');
-
-        return $subscriptions;
-    }
-
-    public function countSubscriptions(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareSubscriptionConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareSubscriptionFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-			SELECT COUNT(*)
-			FROM `xf_bdapi_subscription` AS subscription
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-		");
-    }
-
-    public function prepareSubscriptionConditions(array $conditions = array(), array $fetchOptions = array())
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        if (isset($conditions['subscription_id'])) {
-            if (is_array($conditions['subscription_id'])) {
-                if (!empty($conditions['subscription_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "subscription.subscription_id IN (" . $db->quote($conditions['subscription_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "subscription.subscription_id = " . $db->quote($conditions['subscription_id']);
-            }
-        }
-
-        if (isset($conditions['client_id'])) {
-            if (is_array($conditions['client_id'])) {
-                if (!empty($conditions['client_id'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "subscription.client_id IN (" . $db->quote($conditions['client_id']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "subscription.client_id = " . $db->quote($conditions['client_id']);
-            }
-        }
-
-        if (isset($conditions['topic'])) {
-            if (is_array($conditions['topic'])) {
-                if (!empty($conditions['topic'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "subscription.topic IN (" . $db->quote($conditions['topic']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "subscription.topic = " . $db->quote($conditions['topic']);
-            }
-        }
-
-        if (isset($conditions['subscribe_date'])) {
-            if (is_array($conditions['subscribe_date'])) {
-                if (!empty($conditions['subscribe_date'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "subscription.subscribe_date IN (" . $db->quote($conditions['subscribe_date']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "subscription.subscribe_date = " . $db->quote($conditions['subscribe_date']);
-            }
-        }
-
-        if (isset($conditions['expire_date'])) {
-            if (is_array($conditions['expire_date'])) {
-                if (!empty($conditions['expire_date'])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "subscription.expire_date IN (" . $db->quote($conditions['expire_date']) . ")";
-                }
-            } else {
-                $sqlConditions[] = "subscription.expire_date = " . $db->quote($conditions['expire_date']);
-            }
-        }
-
-        if (isset($conditions['expired'])) {
-            if ($conditions['expired']) {
-                $sqlConditions[] = 'subscription.expire_date > 0';
-                $sqlConditions[] = 'subscription.expire_date < ' . XenForo_Application::$time;
-            } else {
-                $sqlConditions[] = 'subscription.expire_date = 0 OR subscription.expire_date > ' . XenForo_Application::$time;
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf(
-                '(subscription.callback LIKE %1$s OR subscription.topic LIKE %1$s)',
-                $filterQuoted
-            );
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareSubscriptionFetchOptions(array $fetchOptions = array())
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & self::FETCH_CLIENT) {
-                $selectFields .= '
-					, client.name AS client_name
-					, client.description AS client_description
-					, client.redirect_uri AS client_redirect_uri';
-                $joinTables .= '
-					LEFT JOIN `xf_bdapi_client` AS client
-					ON (client.client_id = subscription.client_id)';
-            }
-        }
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareSubscriptionOrderOptions(array $fetchOptions = array(), $defaultOrderSql = '')
-    {
-        $choices = array();
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-
-    public static function getTopic($type, $id)
-    {
-        return sprintf('%s_%s', $type, $id);
-    }
-
-    public static function parseTopic($topic)
-    {
-        if (empty($topic)) {
-            return array(self::TYPE_CLIENT, 0);
-        }
-
-        $parts = explode('_', $topic);
-        $id = array_pop($parts);
-        $type = implode('_', $parts);
-
-        return array(
-            $type,
-            $id
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Model/Token.php b/xenforo/library/bdApi/Model/Token.php
deleted file mode 100755
index e918f81a..00000000
--- a/xenforo/library/bdApi/Model/Token.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-class bdApi_Model_Token extends XenForo_Model
-{
-    const FETCH_CLIENT = 0x01;
-    const FETCH_USER = 0x02;
-
-    public function deleteTokens($clientId, $userId)
-    {
-        return $this->_getDb()->delete('xf_bdapi_token', array(
-            'client_id = ?' => $clientId,
-            'user_id = ?' => $userId,
-        ));
-    }
-
-    public function hasExpired($client, $token)
-    {
-        if ($token['expire_date'] > 0 AND $token['expire_date'] < XenForo_Application::$time) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function hasScope($client, $token, $scope)
-    {
-        $helper = bdApi_Template_Helper_Core::getInstance();
-        $scopeArray = $helper->scopeSplit($scope);
-        $tokenScopeArray = $helper->scopeSplit($token['scope']);
-
-        foreach ($scopeArray as $scopeSingle) {
-            // use simple in_array check here without any normalization
-            if (!in_array($scopeSingle, $tokenScopeArray)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public function pruneExpired()
-    {
-        $this->_getDb()->query('
-			DELETE FROM `xf_bdapi_token`
-			WHERE expire_date > 0
-				AND expire_date < ?
-		', array(XenForo_Application::$time));
-    }
-
-    public function getTokenByText($tokenText, array $fetchOptions = array())
-    {
-        $tokens = $this->getTokens(array('token_text' => $tokenText), $fetchOptions);
-
-        return reset($tokens);
-    }
-
-    public function getList(array $conditions = array(), array $fetchOptions = array())
-    {
-        $tokens = $this->getTokens($conditions, $fetchOptions);
-        $list = array();
-
-        foreach ($tokens as $tokenId => $token) {
-            $tokens[$tokenId] = $token['token_text'];
-        }
-
-        return $list;
-    }
-
-    public function getTokenById($tokenId, array $fetchOptions = array())
-    {
-        $data = $this->getTokens(array('token_id' => $tokenId), $fetchOptions);
-
-        return reset($data);
-    }
-
-    public function getTokens(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareTokenConditions($conditions, $fetchOptions);
-
-        $orderClause = $this->prepareTokenOrderOptions($fetchOptions);
-        $joinOptions = $this->prepareTokenFetchOptions($fetchOptions);
-        $limitOptions = $this->prepareLimitFetchOptions($fetchOptions);
-
-        $all = $this->fetchAllKeyed($this->limitQueryResults("
-				SELECT token.*
-					$joinOptions[selectFields]
-				FROM `xf_bdapi_token` AS token
-					$joinOptions[joinTables]
-				WHERE $whereConditions
-					$orderClause
-			", $limitOptions['limit'], $limitOptions['offset']), 'token_id');
-
-        return $all;
-    }
-
-    public function countTokens(array $conditions = array(), array $fetchOptions = array())
-    {
-        $whereConditions = $this->prepareTokenConditions($conditions, $fetchOptions);
-        $joinOptions = $this->prepareTokenFetchOptions($fetchOptions);
-
-        return $this->_getDb()->fetchOne("
-			SELECT COUNT(*)
-			FROM `xf_bdapi_token` AS token
-				$joinOptions[joinTables]
-			WHERE $whereConditions
-		");
-    }
-
-    public function prepareTokenConditions(array $conditions, array &$fetchOptions)
-    {
-        $sqlConditions = array();
-        $db = $this->_getDb();
-
-        foreach (array('token_id', 'client_id', 'expire_date', 'user_id') as $columnName) {
-            if (!isset($conditions[$columnName])) {
-                continue;
-            }
-
-            if (is_array($conditions[$columnName])) {
-                if (!empty($conditions[$columnName])) {
-                    // only use IN condition if the array is not empty (nasty!)
-                    $sqlConditions[] = "token.$columnName IN (" . $db->quote($conditions[$columnName]) . ")";
-                }
-            } else {
-                $sqlConditions[] = "token.$columnName = " . $db->quote($conditions[$columnName]);
-            }
-        }
-
-        if (isset($conditions['token_text'])) {
-            $sqlConditions[] = 'token.token_text = ' . $this->_getDb()->quote($conditions['token_text']);
-        }
-
-        if (isset($conditions['expired'])) {
-            if ($conditions['expired']) {
-                $sqlConditions[] = 'token.expire_date > 0';
-                $sqlConditions[] = 'token.expire_date < ' . XenForo_Application::$time;
-            } else {
-                $sqlConditions[] = 'token.expire_date = 0 OR token.expire_date > ' . XenForo_Application::$time;
-            }
-        }
-
-        if (!empty($conditions['filter'])) {
-            if (is_array($conditions['filter'])) {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'][0], $conditions['filter'][1], $db);
-            } else {
-                $filterQuoted = XenForo_Db::quoteLike($conditions['filter'], 'lr', $db);
-            }
-
-            $sqlConditions[] = sprintf('token.token_text LIKE %1$s', $filterQuoted);
-        }
-
-        return $this->getConditionsForClause($sqlConditions);
-    }
-
-    public function prepareTokenFetchOptions(array $fetchOptions)
-    {
-        $selectFields = '';
-        $joinTables = '';
-
-        if (!empty($fetchOptions['join'])) {
-            if ($fetchOptions['join'] & self::FETCH_CLIENT) {
-                $selectFields .= '
-					, client.name AS client_name
-					, client.description AS client_description
-					, client.redirect_uri AS client_redirect_uri';
-                $joinTables .= '
-					LEFT JOIN `xf_bdapi_client` AS client
-					ON (client.client_id = token.client_id)';
-            }
-
-            if ($fetchOptions['join'] & self::FETCH_USER) {
-                $selectFields .= '
-					, user.username';
-                $joinTables .= '
-					LEFT JOIN `xf_user` AS user
-					ON (user.user_id = token.user_id)';
-            }
-        }
-
-        return array(
-            'selectFields' => $selectFields,
-            'joinTables' => $joinTables
-        );
-    }
-
-    public function prepareTokenOrderOptions(array &$fetchOptions, $defaultOrderSql = '')
-    {
-        $choices = array('issue_date' => 'token.issue_date');
-
-        return $this->getOrderByClause($choices, $fetchOptions, $defaultOrderSql);
-    }
-}
diff --git a/xenforo/library/bdApi/Model/UserScope.php b/xenforo/library/bdApi/Model/UserScope.php
deleted file mode 100644
index 89a4f4ca..00000000
--- a/xenforo/library/bdApi/Model/UserScope.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-class bdApi_Model_UserScope extends XenForo_Model
-{
-    public function updateUserScopes($token)
-    {
-        $userScopes = $this->getUserScopes($token['client_id'], $token['user_id']);
-        $scopes = bdApi_Template_Helper_Core::getInstance()->scopeSplit($token['scope']);
-
-        foreach ($scopes as $scope) {
-            if (!isset($userScopes[$scope])) {
-                $this->_getDb()->insert('xf_bdapi_user_scope', array(
-                    'client_id' => $token['client_id'],
-                    'user_id' => $token['user_id'],
-                    'scope' => $scope,
-                    'accept_date' => XenForo_Application::$time,
-                ));
-            }
-        }
-    }
-
-    public function getUserScopes($clientId, $userId)
-    {
-        return $this->fetchAllKeyed('
-			SELECT *
-			FROM `xf_bdapi_user_scope`
-			WHERE client_id = ?
-				AND user_id = ?
-		', 'scope', array(
-            $clientId,
-            $userId
-        ));
-    }
-
-    public function getUserScopesForAllClients($userId)
-    {
-        return $this->_getDb()->fetchAll('
-			SELECT user_scope.*, client.*
-			FROM `xf_bdapi_user_scope` AS user_scope
-			INNER JOIN `xf_bdapi_client` AS client
-				ON (client.client_id = user_scope.client_id) 
-			WHERE user_scope.user_id = ?
-		', $userId);
-    }
-
-    public function deleteUserScope($clientId, $userId, $scope)
-    {
-        return $this->_getDb()->delete('xf_bdapi_user_scope', array(
-            'client_id = ?' => $clientId,
-            'user_id = ?' => $userId,
-            'scope = ?' => $scope,
-        ));
-    }
-}
diff --git a/xenforo/library/bdApi/OAuth2.php b/xenforo/library/bdApi/OAuth2.php
deleted file mode 100755
index 9d6a4f19..00000000
--- a/xenforo/library/bdApi/OAuth2.php
+++ /dev/null
@@ -1,683 +0,0 @@
-<?php
-
-require(dirname(__FILE__) . '/Lib/oauth2-server-php/src/OAuth2/Autoloader.php');
-OAuth2\Autoloader::register();
-
-class bdApi_OAuth2 extends \OAuth2\Server
-{
-    /**
-     * @var bdApi_Model_OAuth2
-     */
-    protected $_model;
-
-    protected $_actionOauthToken_tfaProviders = array();
-
-    /**
-     * Process /oauth/token request.
-     *
-     * @param bdApi_ControllerApi_Abstract $controller
-     *
-     * @return XenForo_ControllerResponse_Abstract
-     */
-    public function actionOauthToken(bdApi_ControllerApi_Abstract $controller)
-    {
-        foreach ($this->storages as $storage) {
-            if ($storage instanceof bdApi_OAuth2_Storage) {
-                $storage->setControllerApi($controller);
-                break;
-            }
-        }
-
-        $request = $this->_generateOAuth2Request();
-        /** @var OAuth2\Response $response */
-        $response = $this->handleTokenRequest($request);
-
-        if ($response->isClientError()
-            && count($this->_actionOauthToken_tfaProviders) > 0
-        ) {
-            // supports XenForo 1.5+ two factor authentication
-            $response->setStatusCode(202);
-
-            $errorDescription = $response->getParameter('error_description');
-            if (!empty($errorDescription)) {
-                $response->setParameter('error_description', 'Two-factor authorization code is required');
-            }
-
-            $response->addHttpHeaders(array(
-                'X-Api-Tfa-Providers' => implode(', ', array_keys($this->_actionOauthToken_tfaProviders)),
-            ));
-        }
-
-        return $this->_generateControllerResponse($controller, $response);
-    }
-
-    public function actionOauthToken_setTfaProviders(array $providers)
-    {
-        // supports XenForo 1.5+ two factor authentication
-        $this->_actionOauthToken_tfaProviders = $providers;
-    }
-
-    /**
-     * Process /oauth/authorize request (step 1).
-     *
-     * @param XenForo_Controller $controller
-     * @param array $authorizeParams
-     *
-     * @return bool|XenForo_ControllerResponse_Abstract
-     */
-    public function actionOauthAuthorize1(XenForo_Controller $controller, array $authorizeParams)
-    {
-        if (!empty($authorizeParams['redirect_uri'])) {
-            $storage = $this->storages['client'];
-            if ($storage instanceof bdApi_OAuth2_Storage) {
-                $storage->setRequestRedirectUri($authorizeParams['redirect_uri']);
-            }
-        }
-
-        $request = new OAuth2\Request($authorizeParams);
-        $validated = $this->validateAuthorizeRequest($request);
-
-        if (!$validated) {
-            return $this->_generateControllerResponse($controller, $this->getResponse());
-        }
-
-        return true;
-    }
-
-    /**
-     * Process /oauth/authorize request (step 2).
-     *
-     * @param XenForo_Controller $controller
-     * @param array $authorizeParams
-     * @param $accepted
-     * @param $userId
-     *
-     * @return XenForo_ControllerResponse_Abstract
-     */
-    public function actionOauthAuthorize2(XenForo_Controller $controller, array $authorizeParams, $accepted, $userId)
-    {
-        if (!empty($authorizeParams['redirect_uri'])) {
-            $storage = $this->getStorage('client');
-            if ($storage instanceof bdApi_OAuth2_Storage) {
-                $storage->setRequestRedirectUri($authorizeParams['redirect_uri']);
-            }
-        }
-
-        $request = new OAuth2\Request($authorizeParams);
-        $response = new OAuth2\Response();
-
-        $this->handleAuthorizeRequest($request, $response, $accepted, $userId);
-
-        return $this->_generateControllerResponse($controller, $response);
-    }
-
-    /**
-     * Get effective token of current request.
-     *
-     * @return array
-     */
-    public function getEffectiveToken()
-    {
-        static $effectiveToken = null;
-
-        if ($effectiveToken === null) {
-            $effectiveToken = array();
-
-            $request = $this->_generateOAuth2Request();
-            if ($this->verifyResourceRequest($request)) {
-                $token = $this->getResourceController()->getToken();
-                $effectiveToken = $token;
-            }
-        }
-
-        return $effectiveToken;
-    }
-
-    /**
-     * Create access token for specified client/user pair.
-     *
-     * @param string $clientId
-     * @param int $userId
-     * @param string $scope
-     * @param int|null $ttl
-     * @param bool $includeRefreshToken
-     *
-     * @return array
-     */
-    public function createAccessToken($clientId, $userId, $scope = null, $ttl = null, $includeRefreshToken = true)
-    {
-        $token = $this->getAccessTokenResponseType()->createAccessToken(
-            $clientId,
-            $userId,
-            $scope,
-            $includeRefreshToken
-        );
-
-        if ($ttl !== null) {
-            $dbToken = $this->_model->getTokenModel()->getTokenByText($token['access_token']);
-            if (!empty($dbToken)) {
-                /** @var bdApi_DataWriter_Token $dw */
-                $dw = XenForo_DataWriter::create('bdApi_DataWriter_Token');
-                $dw->setExistingData($dbToken);
-                $dw->set('expire_date', time() + $ttl);
-                $dw->save();
-
-                $token['expires_in'] = $ttl;
-            }
-        }
-
-        return $token;
-    }
-
-    /**
-     * Get the expected audience value for JWT Bearer grant type.
-     *
-     * @return string
-     */
-    public function getJwtAudience()
-    {
-        $aud = bdApi_Data_Helper_Core::safeBuildApiLink('full:index', null, array('oauth_token' => ''));
-
-        $indexDotPhp = 'index.php';
-        if (substr($aud, -strlen($indexDotPhp)) === $indexDotPhp) {
-            $aud = substr($aud, 0, -strlen($indexDotPhp));
-        }
-
-        $aud = rtrim($aud, '/');
-
-        return $aud;
-    }
-
-    /**
-     * Get XenForo controller response for default OAuth2 response.
-     *
-     * @param XenForo_Controller $controller
-     *
-     * @return XenForo_ControllerResponse_Abstract
-     */
-    public function getErrorControllerResponse(XenForo_Controller $controller)
-    {
-        /** @var OAuth2\Response $response */
-        $response = $this->response;
-
-        if (!empty($response) && $response->getParameter('error')) {
-            return $this->_generateControllerResponse($controller, $response);
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param bdApi_Model_OAuth2 $model
-     */
-    public function __construct(bdApi_Model_OAuth2 $model)
-    {
-        $storage = new bdApi_OAuth2_Storage($model, $this);
-
-        parent::__construct(array(
-            'access_token' => $storage,
-            'authorization_code' => $storage,
-            'client_credentials' => $storage,
-            'user_credentials' => $storage,
-            'refresh_token' => $storage,
-        ), array(
-            'auth_code_lifetime' => bdApi_Option::get('authCodeTTL'),
-            'access_lifetime' => bdApi_Option::get('tokenTTL'),
-            'refresh_token_lifetime' => bdApi_Option::get('refreshTokenTTLDays') * 86400,
-            'token_param_name' => 'oauth_token',
-            'enforce_state' => false,
-            'require_exact_redirect_uri' => false,
-            'allow_implicit' => true,
-            'always_issue_new_refresh_token' => true,
-        ));
-
-        $this->_model = $model;
-    }
-
-    protected function createDefaultAccessTokenResponseType()
-    {
-        $config = array_intersect_key(
-            $this->config,
-            array_flip(explode(' ', 'access_lifetime refresh_token_lifetime'))
-        );
-        $config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() : $this->getDefaultTokenType()->getTokenType();
-
-        return new bdApi_OAuth2_ResponseType_AccessToken(
-            $this->storages['access_token'],
-            $this->storages['access_token'],
-            $config
-        );
-    }
-
-    protected function getDefaultGrantTypes()
-    {
-        $grantTypes = parent::getDefaultGrantTypes();
-
-        $aud = $this->getJwtAudience();
-        if (!empty($aud)) {
-            $jwtBearer = new bdApi_OAuth2_GrantType_JwtBearer(reset($this->storages), $aud);
-            $grantTypes[$jwtBearer->getQuerystringIdentifier()] = $jwtBearer;
-        }
-
-        return $grantTypes;
-    }
-
-    protected function _generateOAuth2Request()
-    {
-        $server = $_SERVER;
-        if (isset($server['CONTENT_TYPE'])) {
-            // workaround to accept multi-part request
-            unset($server['CONTENT_TYPE']);
-        }
-
-        return new OAuth2\Request($_GET, $_POST, array(), $_COOKIE, $_FILES, $server);
-    }
-
-    protected function _generateControllerResponse(XenForo_Controller $controller, OAuth2\Response $response)
-    {
-        if ($response->isRedirection()) {
-            return $controller->responseRedirect(
-                XenForo_ControllerResponse_Redirect::SUCCESS,
-                $response->getHttpHeader('Location')
-            );
-        }
-
-        $params = $response->getParameters();
-        $params['_statusCode'] = $response->getStatusCode();
-        $params['_headers'] = $response->getHttpHeaders();
-
-        if ($controller instanceof bdApi_ControllerApi_Abstract) {
-            return $controller->responseData('bdApi_ViewApi_OAuth', $params);
-        } else {
-            if ($response->isClientError()) {
-                return $controller->responseError(
-                    $response->getParameter('error_description'),
-                    $response->getStatusCode()
-                );
-            } else {
-                $controller->getRouteMatch()->setResponseType('json');
-                return $controller->responseView('bdApi_ViewPublic_OAuth', '', $params);
-            }
-        }
-    }
-}
-
-class bdApi_OAuth2_Storage implements
-    OAuth2\Storage\AccessTokenInterface,
-    OAuth2\Storage\AuthorizationCodeInterface,
-    OAuth2\Storage\ClientInterface,
-    OAuth2\Storage\ClientCredentialsInterface,
-    OAuth2\Storage\JwtBearerInterface,
-    OAuth2\Storage\RefreshTokenInterface,
-    OAuth2\Storage\ScopeInterface,
-    OAuth2\Storage\UserCredentialsInterface
-{
-
-    /** @var bdApi_Model_OAuth2 */
-    protected $_model;
-
-    /** @var bdApi_OAuth2 */
-    protected $_server;
-
-    protected $_requestRedirectUri = '';
-
-    /** @var bdApi_ControllerApi_Abstract */
-    protected $_controller = null;
-
-    public function getModel()
-    {
-        return $this->_model;
-    }
-
-    public function setRequestRedirectUri($redirectUri)
-    {
-        $this->_requestRedirectUri = $redirectUri;
-    }
-
-    public function setControllerApi(bdApi_ControllerApi_Abstract $controller)
-    {
-        $this->_controller = $controller;
-    }
-
-    public function __construct(bdApi_Model_OAuth2 $model, bdApi_OAuth2 $server)
-    {
-        $this->_model = $model;
-        $this->_server = $server;
-    }
-
-    public function getAccessToken($oauthToken)
-    {
-        $token = $this->_model->getTokenModel()->getTokenByText($oauthToken);
-
-        if (empty($token)) {
-            // token not found
-            return null;
-        }
-
-        return array_merge($token, array(
-            'expires' => $token['expire_date'],
-        ));
-    }
-
-    public function setAccessToken($oauthToken, $clientId, $userId, $expires, $scope = null)
-    {
-        /* @var $dw bdApi_DataWriter_Token */
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_Token');
-
-        $dw->set('token_text', $oauthToken);
-        $dw->set('client_id', $clientId);
-        $dw->set('user_id', $userId);
-        $dw->set('expire_date', $expires);
-        $dw->set('scope', $scope ? $scope : '');
-
-        $dw->save();
-    }
-
-    public function getAuthorizationCode($code)
-    {
-        $authCode = $this->_model->getAuthCodeModel()->getAuthCodeByText($code);
-
-        if (empty($authCode)) {
-            // auth code not found
-            return null;
-        }
-
-        return array_merge($authCode, array(
-            'expires' => $authCode['expire_date'],
-        ));
-    }
-
-    public function setAuthorizationCode($code, $clientId, $userId, $redirectUri, $expires, $scope = null)
-    {
-        /* @var $dw bdApi_DataWriter_AuthCode */
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_AuthCode');
-
-        $dw->set('auth_code_text', $code);
-        $dw->set('client_id', $clientId);
-        $dw->set('user_id', $userId);
-        $dw->set('redirect_uri', urldecode($redirectUri));
-        $dw->set('expire_date', $expires);
-        $dw->set('scope', $scope ? $scope : '');
-
-        $dw->save();
-    }
-
-    public function expireAuthorizationCode($code)
-    {
-        $authCode = $this->_model->getAuthCodeModel()->getAuthCodeByText($code);
-
-        if (!empty($authCode)) {
-            /* @var $dw bdApi_DataWriter_AuthCode */
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_AuthCode');
-            $dw->setExistingData($authCode, true);
-            $dw->delete();
-        }
-    }
-
-    public function getClientDetails($clientId)
-    {
-        $client = $this->_model->getClientModel()->getClientById($clientId);
-
-        if (empty($client)) {
-            // client not found
-            return false;
-        }
-
-        if (!empty($this->_requestRedirectUri)) {
-            $clientRedirectUri = $this->_model->getClientModel()->getWhitelistedRedirectUri(
-                $client,
-                $this->_requestRedirectUri
-            );
-            if (is_string($clientRedirectUri)) {
-                $client['redirect_uri'] .= sprintf(' %s', $clientRedirectUri);
-            }
-        }
-
-        return array_merge($client, array(
-            'user_id' => 0,
-            'scope' => bdApi_Template_Helper_Core::getInstance()->scopeJoin($this->_model->getSystemSupportedScopes()),
-        ));
-    }
-
-    public function getClientScope($clientId)
-    {
-        return bdApi_Template_Helper_Core::getInstance()->scopeJoin($this->_model->getSystemSupportedScopes());
-    }
-
-    public function checkRestrictedGrantType($clientId, $grant_type)
-    {
-        return true;
-    }
-
-    public function checkClientCredentials($clientId, $clientSecret = null)
-    {
-        $client = $this->_model->getClientModel()->getClientById($clientId);
-
-        if (empty($client)) {
-            // client not found
-            return false;
-        }
-
-        if (!$this->_model->getClientModel()->verifySecret($client, $clientSecret)) {
-            // the secret exists but not valid
-            return false;
-        }
-
-        return true;
-    }
-
-    public function isPublicClient($client_id)
-    {
-        // TODO: Implement isPublicClient() method.
-        return false;
-    }
-
-    public function getClientKey($clientId, $subject)
-    {
-        $client = $this->_model->getClientModel()->getClientById($clientId);
-
-        if (empty($client)) {
-            // client not found
-            return false;
-        }
-
-        if (empty($client['options']['public_key'])) {
-            // no public key has been configured
-            return false;
-        }
-
-        return $client['options']['public_key'];
-    }
-
-    public function getJti($client_id, $subject, $audience, $expiration, $jti)
-    {
-        return null;
-    }
-
-    public function setJti($client_id, $subject, $audience, $expiration, $jti)
-    {
-        // do nothing
-    }
-
-    public function getRefreshToken($refreshToken)
-    {
-        $token = $this->_model->getRefreshTokenModel()->getRefreshTokenByText($refreshToken);
-
-        if (empty($token)) {
-            // refresh token not found
-            return null;
-        }
-
-        return array_merge($token, array(
-            'refresh_token' => $token['refresh_token_text'],
-            'expires' => $token['expire_date'],
-        ));
-    }
-
-    public function setRefreshToken($refreshToken, $clientId, $userId, $expires, $scope = null)
-    {
-        /* @var $dw bdApi_DataWriter_RefreshToken */
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_RefreshToken');
-
-        $dw->set('refresh_token_text', $refreshToken);
-        $dw->set('client_id', $clientId);
-        $dw->set('user_id', $userId);
-        $dw->set('expire_date', $expires);
-        $dw->set('scope', $scope ? $scope : '');
-
-        $dw->save();
-    }
-
-    public function unsetRefreshToken($refreshToken)
-    {
-        $token = $this->_model->getRefreshTokenModel()->getRefreshTokenByText($refreshToken);
-
-        if (!empty($token)) {
-            /* @var $dw bdApi_DataWriter_RefreshToken */
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_RefreshToken');
-            $dw->setExistingData($token, true);
-            $dw->delete();
-        }
-    }
-
-    public function scopeExists($scope)
-    {
-        return in_array($scope, $this->_model->getSystemSupportedScopes(), true);
-    }
-
-    public function getDefaultScope($client_id = null)
-    {
-        return false;
-    }
-
-    public function checkUserCredentials($nameOrEmail, $password)
-    {
-        /** @var XenForo_Model_Login $loginModel */
-        $loginModel = $this->_model->getModelFromCache('XenForo_Model_Login');
-        if ($loginModel->requireLoginCaptcha($nameOrEmail)) {
-            return false;
-        }
-
-        $userId = $this->_model->getUserModel()->validateAuthentication($nameOrEmail, $password);
-
-        if (!$userId) {
-            $loginModel->logLoginAttempt($nameOrEmail);
-        }
-
-        if (!$this->_checkUserCredentials_runTfaValidation($userId)) {
-            return false;
-        }
-
-        if (!empty($userId)) {
-            $loginModel->clearLoginAttempts($nameOrEmail);
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    protected function _checkUserCredentials_runTfaValidation($userId)
-    {
-        if ($userId < 1
-            || XenForo_Application::$versionId < 1050000
-        ) {
-            return true;
-        }
-
-        if ($this->_controller === null) {
-            // since XenForo 1.5+, $_controller must be set to check for two factor authentication
-            // otherwise, deny access immediately
-            return false;
-        }
-
-        /** @var XenForo_ControllerHelper_Login $loginHelper */
-        $loginHelper = $this->_controller->getHelper('Login');
-        $user = $this->_model->getUserModel()->getFullUserById($userId);
-
-        if (!$loginHelper->userTfaConfirmationRequired($user)) {
-            return true;
-        }
-
-        /** @var XenForo_Model_Tfa $tfaModel */
-        $tfaModel = $this->_model->getModelFromCache('XenForo_Model_Tfa');
-        $providers = $tfaModel->getTfaConfigurationForUser($user['user_id'], $userData);
-        if (empty($providers)) {
-            return true;
-        }
-        $this->_server->actionOauthToken_setTfaProviders($providers);
-
-        $tfaProvider = $this->_controller->getInput()->filterSingle('tfa_provider', XenForo_Input::STRING);
-        if (strlen($tfaProvider) === 0) {
-            return false;
-        }
-
-        $tfaTrigger = $this->_controller->getInput()->filterSingle('tfa_trigger', XenForo_Input::BOOLEAN);
-        if ($tfaTrigger) {
-            $loginHelper->triggerTfaCheck($user, $tfaProvider, $providers, $userData);
-            throw $this->_controller->responseException($this->_controller->responseMessage(
-                new XenForo_Phrase('changes_saved')
-            ));
-        }
-
-        $loginHelper->assertNotTfaAttemptLimited($user['user_id']);
-        if ($loginHelper->runTfaValidation($user, $tfaProvider, $providers, $userData) === true) {
-            return true;
-        }
-
-        throw $this->_controller->responseException($this->_controller->responseError(
-            new XenForo_Phrase('two_step_verification_value_could_not_be_confirmed')
-        ));
-    }
-
-    public function getUserDetails($nameOrEmail)
-    {
-        $user = $this->_model->getUserModel()->getUserByNameOrEmail($nameOrEmail);
-
-        if (empty($user)) {
-            // user not found
-            return false;
-        }
-
-        return array(
-            'user_id' => $user['user_id'],
-            'scope' => bdApi_Template_Helper_Core::getInstance()->scopeJoin($this->_model->getSystemSupportedScopes()),
-        );
-    }
-}
-
-class bdApi_OAuth2_GrantType_JwtBearer extends OAuth2\GrantType\JwtBearer
-{
-    public function getScope()
-    {
-        $storage = $this->storage;
-        if ($storage instanceof bdApi_OAuth2_Storage) {
-            if ($this->getUserId() > 0) {
-                return $storage->getModel()->getAutoAndUserScopes($this->getClientId(), $this->getUserId());
-            } else {
-                return bdApi_Template_Helper_Core::getInstance()->scopeJoin($storage->getModel()->getSystemSupportedScopes());
-            }
-        }
-
-        return '';
-    }
-}
-
-class bdApi_OAuth2_ResponseType_AccessToken extends OAuth2\ResponseType\AccessToken
-{
-    public function createAccessToken($clientId, $userId, $scope = null, $includeRefreshToken = true)
-    {
-        $token = parent::createAccessToken($clientId, $userId, $scope, $includeRefreshToken);
-        $token['user_id'] = $userId;
-
-        if (!empty($token['refresh_token'])
-            && !empty($this->config['refresh_token_lifetime'])
-        ) {
-            $token['refresh_token_expires_in'] = $this->config['refresh_token_lifetime'];
-        }
-
-        return $token;
-    }
-}
diff --git a/xenforo/library/bdApi/Option.php b/xenforo/library/bdApi/Option.php
deleted file mode 100755
index e27e8cea..00000000
--- a/xenforo/library/bdApi/Option.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class bdApi_Option
-{
-    public static function get($key)
-    {
-        $options = XenForo_Application::getOptions();
-
-        switch ($key) {
-            case 'keyLength':
-                return 10;
-            case 'secretLength':
-                return 15;
-            case 'authorizeBypassSecs':
-                return 600;
-        }
-
-        return $options->get('bdApi_' . $key);
-    }
-
-    public static function getConfig($key)
-    {
-        static $config = null;
-
-        if ($config === null) {
-            $config = array(
-                'pingQueueUseDefer' => true,
-                'publicSessionToken' => 'public',
-                'publicSessionClientId' => '',
-                'publicSessionScopes' => 'read post',
-                'subscriptionColumnUser' => 'bdapi_user',
-                'subscriptionColumnUserNotification' => 'bdapi_user_notification',
-                'subscriptionColumnThreadPost' => 'bdapi_thread_post',
-            );
-
-            $values = XenForo_Application::getConfig()->get('api');
-            if ($values !== null && $values instanceof Zend_Config) {
-                foreach (array_keys($config) as $_key) {
-                    $value = $values->get($_key);
-                    if ($value !== null) {
-                        $config[$_key] = $value;
-                    }
-                }
-            }
-        }
-
-        return isset($config[$key]) ? $config[$key] : null;
-    }
-
-    public static function getSubscription($topicType)
-    {
-        $optionKey = str_replace(' ', '', ucwords(str_replace('_', ' ', $topicType)));
-        return self::get('subscription' . $optionKey);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/AuthCode.php b/xenforo/library/bdApi/Route/PrefixAdmin/AuthCode.php
deleted file mode 100755
index 128e3956..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/AuthCode.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_AuthCode implements XenForo_Route_Interface
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array(
-            'add',
-            'save'
-        ))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithIntegerParam($routePath, $request, 'auth_code_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_AuthCode', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam(
-                $outputPrefix,
-                $action,
-                $extension,
-                $data,
-                'auth_code_id'
-            );
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/Client.php b/xenforo/library/bdApi/Route/PrefixAdmin/Client.php
deleted file mode 100755
index 408d2435..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/Client.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_Client implements XenForo_Route_Interface
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array(
-            'add',
-            'save'
-        ))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithStringParam($routePath, $request, 'client_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_Client', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithStringParam($outputPrefix, $action, $extension, $data, 'client_id');
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/ClientContent.php b/xenforo/library/bdApi/Route/PrefixAdmin/ClientContent.php
deleted file mode 100644
index f127e4a5..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/ClientContent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_ClientContent implements XenForo_Route_Interface
-{
-
-    /* Start auto-generated lines of code. Change made will be overwriten... */
-
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array('add', 'save'))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithIntegerParam($routePath, $request, 'client_content_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_ClientContent', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam(
-                $outputPrefix,
-                $action,
-                $extension,
-                $data,
-                'client_content_id'
-            );
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-
-    /* End auto-generated lines of code. Feel free to make changes below */
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/Log.php b/xenforo/library/bdApi/Route/PrefixAdmin/Log.php
deleted file mode 100755
index 75a497d6..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/Log.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_Log implements XenForo_Route_Interface
-{
-
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array(
-            'add',
-            'save'
-        ))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithIntegerParam($routePath, $request, 'log_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_Log', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'log_id');
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/RefreshToken.php b/xenforo/library/bdApi/Route/PrefixAdmin/RefreshToken.php
deleted file mode 100755
index d4350298..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/RefreshToken.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_RefreshToken implements XenForo_Route_Interface
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array(
-            'add',
-            'save'
-        ))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithIntegerParam($routePath, $request, 'refresh_token_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_RefreshToken', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam(
-                $outputPrefix,
-                $action,
-                $extension,
-                $data,
-                'refresh_token_id'
-            );
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/Subscription.php b/xenforo/library/bdApi/Route/PrefixAdmin/Subscription.php
deleted file mode 100644
index f9218bca..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/Subscription.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_Subscription implements XenForo_Route_Interface
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'subscription_id');
-        return $router->getRouteMatch('bdApi_ControllerAdmin_Subscription', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam(
-                $outputPrefix,
-                $action,
-                $extension,
-                $data,
-                'subscription_id'
-            );
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixAdmin/Token.php b/xenforo/library/bdApi/Route/PrefixAdmin/Token.php
deleted file mode 100755
index 8a287dda..00000000
--- a/xenforo/library/bdApi/Route/PrefixAdmin/Token.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixAdmin_Token implements XenForo_Route_Interface
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        if (in_array($routePath, array(
-            'add',
-            'save'
-        ))) {
-            $action = $routePath;
-        } else {
-            $action = $router->resolveActionWithIntegerParam($routePath, $request, 'token_id');
-        }
-        return $router->getRouteMatch('bdApi_ControllerAdmin_Token', $action, 'bdApi');
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if (is_array($data)) {
-            return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'token_id');
-        } else {
-            return XenForo_Link::buildBasicLink($outputPrefix, $action, $extension);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi.php b/xenforo/library/bdApi/Route/PrefixApi.php
deleted file mode 100755
index 618b3a69..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi extends XenForo_Route_Prefix
-{
-    /** @noinspection PhpMissingParentConstructorInspection
-     * @param string $routeType
-     */
-    public function __construct($routeType)
-    {
-        $this->_routeType = $routeType;
-    }
-
-    /**
-     * Setups all default routes for [bd] Api. Also fires the code event
-     * `api_setup_routes` and let any other add-ons to setup extra
-     * routes for the system.
-     *
-     * @param array $routes the target routes array
-     */
-    public static function setupRoutes(array &$routes)
-    {
-        self::addRoute($routes, 'index', 'bdApi_Route_PrefixApi_Index');
-
-        self::addRoute($routes, 'oauth', 'bdApi_Route_PrefixApi_OAuth');
-
-        self::addRoute($routes, 'attachments', 'bdApi_Route_PrefixApi_Attachments', 'data_only');
-        self::addRoute($routes, 'categories', 'bdApi_Route_PrefixApi_Categories', 'data_only');
-        self::addRoute($routes, 'conversations', 'bdApi_Route_PrefixApi_Conversations', 'data_only');
-        self::addRoute($routes, 'conversation-messages', 'bdApi_Route_PrefixApi_ConversationMessages', 'data_only');
-        self::addRoute($routes, 'forums', 'bdApi_Route_PrefixApi_Forums', 'data_only');
-        self::addRoute($routes, 'navigation', 'bdApi_Route_PrefixApi_Navigation');
-        self::addRoute($routes, 'notifications', 'bdApi_Route_PrefixApi_Notifications');
-        self::addRoute($routes, 'pages', 'bdApi_Route_PrefixApi_Pages', 'data_only');
-        self::addRoute($routes, 'posts', 'bdApi_Route_PrefixApi_Posts', 'data_only');
-        self::addRoute($routes, 'profile-posts', 'bdApi_Route_PrefixApi_ProfilePosts', 'data_only');
-        self::addRoute($routes, 'tags', 'bdApi_Route_PrefixApi_Tags', 'data_only');
-        self::addRoute($routes, 'threads', 'bdApi_Route_PrefixApi_Threads', 'data_only');
-        self::addRoute($routes, 'users', 'bdApi_Route_PrefixApi_Users', 'data_only');
-
-        self::addRoute($routes, 'search', 'bdApi_Route_PrefixApi_Search', 'data_only');
-
-        self::addRoute($routes, 'assets', 'bdApi_Route_PrefixApi_Assets');
-        self::addRoute($routes, 'batch', 'bdApi_Route_PrefixApi_Batch');
-        self::addRoute($routes, 'subscriptions', 'bdApi_Route_PrefixApi_Subscriptions');
-        self::addRoute($routes, 'tools', 'bdApi_Route_PrefixApi_Tools');
-
-        // backward compatibility
-        self::addRoute($routes, 'all-threads', 'bdApi_Route_PrefixApi_Threads');
-
-        XenForo_CodeEvent::fire('api_setup_routes', array(&$routes));
-    }
-
-    /**
-     * Helper method to easily add new route to a routes array.
-     *
-     * @param array $routes the target routes array
-     * @param string $originalPrefix
-     * @param string $routeClass
-     * @param string $buildLink
-     */
-    public static function addRoute(array &$routes, $originalPrefix, $routeClass, $buildLink = 'none')
-    {
-        $routes[$originalPrefix] = array(
-            'route_class' => $routeClass,
-            'build_link' => $buildLink,
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Abstract.php b/xenforo/library/bdApi/Route/PrefixApi/Abstract.php
deleted file mode 100755
index bce8a399..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Abstract.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-abstract class bdApi_Route_PrefixApi_Abstract implements XenForo_Route_Interface
-{
-
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Assets.php b/xenforo/library/bdApi/Route/PrefixApi/Assets.php
deleted file mode 100755
index ecaa1d2a..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Assets.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Assets extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Asset', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Attachments.php b/xenforo/library/bdApi/Route/PrefixApi/Attachments.php
deleted file mode 100755
index ade04cb3..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Attachments.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Attachments extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'attachment_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Attachment', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if ($action === 'data'
-            && is_array($data)
-            && !empty($data['viewUrl'])
-        ) {
-            $session = bdApi_Data_Helper_Core::safeGetSession();
-            if (!empty($session)) {
-                $oauthClient = $session->getOAuthClient();
-                if (!empty($oauthClient['_isPublicSessionClient'])) {
-                    return new XenForo_Link($data['viewUrl'], false);
-                }
-            }
-        }
-
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'attachment_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Batch.php b/xenforo/library/bdApi/Route/PrefixApi/Batch.php
deleted file mode 100755
index f245e22d..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Batch.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Batch extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Batch', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Categories.php b/xenforo/library/bdApi/Route/PrefixApi/Categories.php
deleted file mode 100755
index cc022c63..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Categories.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Categories extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'node_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Category', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'node_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/ConversationMessages.php b/xenforo/library/bdApi/Route/PrefixApi/ConversationMessages.php
deleted file mode 100755
index 00c4c1c8..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/ConversationMessages.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_ConversationMessages extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'message_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_ConversationMessage', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'message_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Conversations.php b/xenforo/library/bdApi/Route/PrefixApi/Conversations.php
deleted file mode 100755
index 86b6b5e6..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Conversations.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Conversations extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'conversation_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Conversation', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam(
-            $outputPrefix,
-            $action,
-            $extension,
-            $data,
-            'conversation_id'
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Forums.php b/xenforo/library/bdApi/Route/PrefixApi/Forums.php
deleted file mode 100755
index 3aeab67c..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Forums.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Forums extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'node_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Forum', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'node_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Index.php b/xenforo/library/bdApi/Route/PrefixApi/Index.php
deleted file mode 100755
index ce84b063..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Index extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Index', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Navigation.php b/xenforo/library/bdApi/Route/PrefixApi/Navigation.php
deleted file mode 100644
index 5f6213f6..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Navigation.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Navigation extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Navigation', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Notifications.php b/xenforo/library/bdApi/Route/PrefixApi/Notifications.php
deleted file mode 100755
index 018ce809..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Notifications.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Notifications extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Notification', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/OAuth.php b/xenforo/library/bdApi/Route/PrefixApi/OAuth.php
deleted file mode 100755
index 28a0c980..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/OAuth.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_OAuth extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_OAuth', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Pages.php b/xenforo/library/bdApi/Route/PrefixApi/Pages.php
deleted file mode 100755
index 0527d322..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Pages.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Pages extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'node_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Page', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'node_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Posts.php b/xenforo/library/bdApi/Route/PrefixApi/Posts.php
deleted file mode 100755
index 1927543b..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Posts.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Posts extends bdApi_Route_PrefixApi_Abstract
-{
-    const PREFIX_ATTACHMENTS = 'attachments';
-    const PARAM_ATTACHMENT_ID = 'attachment_id';
-
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'post_id');
-
-        $prefixAttachments = sprintf('%s/', self::PREFIX_ATTACHMENTS);
-        if (strpos($action, $prefixAttachments) === 0) {
-            $request->setParam(self::PARAM_ATTACHMENT_ID, intval(substr($action, strlen($prefixAttachments))));
-            $action = self::PREFIX_ATTACHMENTS;
-        }
-
-        return $router->getRouteMatch('bdApi_ControllerApi_Post', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if ($action === self::PREFIX_ATTACHMENTS AND isset($extraParams[self::PARAM_ATTACHMENT_ID])) {
-            $action .= sprintf('/%d', $extraParams[self::PARAM_ATTACHMENT_ID]);
-            unset($extraParams[self::PARAM_ATTACHMENT_ID]);
-        }
-
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'post_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/ProfilePosts.php b/xenforo/library/bdApi/Route/PrefixApi/ProfilePosts.php
deleted file mode 100755
index 6fd0688b..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/ProfilePosts.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_ProfilePosts extends bdApi_Route_PrefixApi_Abstract
-{
-    const PREFIX_COMMENTS = 'comments';
-    const PARAM_COMMENT_ID = 'comment_id';
-
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'profile_post_id');
-
-        $prefixComments = sprintf('%s/', self::PREFIX_COMMENTS);
-        if (strpos($action, $prefixComments) === 0) {
-            $request->setParam(self::PARAM_COMMENT_ID, intval(substr($action, strlen($prefixComments))));
-            $action = self::PREFIX_COMMENTS;
-        }
-
-        return $router->getRouteMatch('bdApi_ControllerApi_ProfilePost', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        if ($action === self::PREFIX_COMMENTS AND isset($extraParams[self::PARAM_COMMENT_ID])) {
-            $action .= sprintf('/%d', $extraParams[self::PARAM_COMMENT_ID]);
-            unset($extraParams[self::PARAM_COMMENT_ID]);
-        }
-
-        return XenForo_Link::buildBasicLinkWithIntegerParam(
-            $outputPrefix,
-            $action,
-            $extension,
-            $data,
-            'profile_post_id'
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Search.php b/xenforo/library/bdApi/Route/PrefixApi/Search.php
deleted file mode 100755
index a2462c00..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Search.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Search extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'search_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Search', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'search_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Subscriptions.php b/xenforo/library/bdApi/Route/PrefixApi/Subscriptions.php
deleted file mode 100755
index 316c729c..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Subscriptions.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Subscriptions extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Subscription', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Tags.php b/xenforo/library/bdApi/Route/PrefixApi/Tags.php
deleted file mode 100755
index 2ae36e8b..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Tags.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Tags extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'tag_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Tag', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'tag_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Threads.php b/xenforo/library/bdApi/Route/PrefixApi/Threads.php
deleted file mode 100755
index cdb7a20e..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Threads.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Threads extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'thread_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_Thread', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'thread_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Tools.php b/xenforo/library/bdApi/Route/PrefixApi/Tools.php
deleted file mode 100755
index 7d46e946..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Tools.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Tools extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        return $router->getRouteMatch('bdApi_ControllerApi_Tool', $routePath);
-    }
-}
diff --git a/xenforo/library/bdApi/Route/PrefixApi/Users.php b/xenforo/library/bdApi/Route/PrefixApi/Users.php
deleted file mode 100755
index 96dce560..00000000
--- a/xenforo/library/bdApi/Route/PrefixApi/Users.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class bdApi_Route_PrefixApi_Users extends bdApi_Route_PrefixApi_Abstract
-{
-    public function match($routePath, Zend_Controller_Request_Http $request, XenForo_Router $router)
-    {
-        $action = $router->resolveActionWithIntegerParam($routePath, $request, 'user_id');
-        return $router->getRouteMatch('bdApi_ControllerApi_User', $action);
-    }
-
-    public function buildLink($originalPrefix, $outputPrefix, $action, $extension, $data, array &$extraParams)
-    {
-        return XenForo_Link::buildBasicLinkWithIntegerParam($outputPrefix, $action, $extension, $data, 'user_id');
-    }
-}
diff --git a/xenforo/library/bdApi/Search/DataHandler/ClientContent.php b/xenforo/library/bdApi/Search/DataHandler/ClientContent.php
deleted file mode 100644
index 42efe21c..00000000
--- a/xenforo/library/bdApi/Search/DataHandler/ClientContent.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-class bdApi_Search_DataHandler_ClientContent extends XenForo_Search_DataHandler_Abstract
-{
-    const CONTENT_TYPE = 'api_client_content';
-
-    /** @var bdApi_Model_ClientContent */
-    protected $_clientContentModel = null;
-
-    protected function _insertIntoIndex(XenForo_Search_Indexer $indexer, array $data, array $parentData = null)
-    {
-        $metadata = array();
-        $metadata['client_id'] = $data['client_id'];
-
-        $indexer->insertIntoIndex(
-            self::CONTENT_TYPE,
-            $data['client_content_id'],
-            $data['title'],
-            $data['body'],
-            $data['date'],
-            $data['user_id'],
-            0,
-            $metadata
-        );
-    }
-
-    protected function _updateIndex(XenForo_Search_Indexer $indexer, array $data, array $fieldUpdates)
-    {
-        $indexer->updateIndex(self::CONTENT_TYPE, $data['client_content_id'], $fieldUpdates);
-    }
-
-    protected function _deleteFromIndex(XenForo_Search_Indexer $indexer, array $dataList)
-    {
-        $clientContentIds = array();
-        foreach ($dataList AS $data) {
-            $clientContentIds[] = is_array($data) ? $data['client_content_id'] : $data;
-        }
-
-        $indexer->deleteFromIndex(self::CONTENT_TYPE, $clientContentIds);
-    }
-
-    public function rebuildIndex(XenForo_Search_Indexer $indexer, $lastId, $batchSize)
-    {
-        $clientContentIds = $this->_getClientContentModel()->getClientContentIdsInRange($lastId, $batchSize);
-        if (!$clientContentIds) {
-            return false;
-        }
-
-        $this->quickIndex($indexer, $clientContentIds);
-
-        return max($clientContentIds);
-    }
-
-    public function quickIndex(XenForo_Search_Indexer $indexer, array $contentIds)
-    {
-        $clientContents = $this->_getClientContentModel()->getClientContents(array(
-            'client_content_id' => $contentIds
-        ));
-
-        foreach ($clientContents AS $clientContent) {
-            $this->insertIntoIndex($indexer, $clientContent);
-        }
-
-        return true;
-    }
-
-    public function getDataForResults(array $ids, array $viewingUser, array $resultsGrouped)
-    {
-        return $this->_getClientContentModel()->getClientContents(array(
-            'client_content_id' => $ids
-        ), array(
-            'join' => bdApi_Model_ClientContent::FETCH_CLIENT
-                | bdApi_Model_ClientContent::FETCH_USER,
-        ));
-    }
-
-    public function canViewResult(array $result, array $viewingUser)
-    {
-        return true;
-    }
-
-    public function getResultDate(array $result)
-    {
-        return $result['date'];
-    }
-
-    public function renderResult(XenForo_View $view, array $result, array $search)
-    {
-        return $view->createTemplateObject('bdapi_search_result_client_content', array(
-            'clientContent' => $result,
-            'search' => $search,
-        ));
-    }
-
-    public function getSearchContentTypes()
-    {
-        return array(self::CONTENT_TYPE);
-    }
-
-    /**
-     * @return bdApi_Model_ClientContent
-     */
-    protected function _getClientContentModel()
-    {
-        if (!$this->_clientContentModel) {
-            $this->_clientContentModel = XenForo_Model::create('bdApi_Model_ClientContent');
-        }
-
-        return $this->_clientContentModel;
-    }
-}
diff --git a/xenforo/library/bdApi/Session.php b/xenforo/library/bdApi/Session.php
deleted file mode 100755
index 7c2c1734..00000000
--- a/xenforo/library/bdApi/Session.php
+++ /dev/null
@@ -1,469 +0,0 @@
-<?php
-
-class bdApi_Session extends XenForo_Session
-{
-    /**
-     * The effective OAuth token of current request.
-     *
-     * @var array|false
-     */
-    protected $_oauthToken = false;
-
-    /**
-     * The effective OAuth client of current request.
-     *
-     * @var array|false
-     */
-    protected $_oauthClient = false;
-
-    /**
-     * The http request triggered this session.
-     *
-     * @var Zend_Controller_Request_Http|null
-     */
-    protected $_request = null;
-
-    public function getOAuthClientId()
-    {
-        if (!empty($this->_oauthToken)) {
-            return $this->_oauthToken['client_id'];
-        }
-
-        return '';
-    }
-
-    /**
-     * Gets the effective OAuth client full data.
-     *
-     * @return array|false
-     */
-    public function getOAuthClient()
-    {
-        if (!empty($this->_oauthToken)) {
-            if ($this->_oauthClient === false) {
-                $this->_oauthClient = self::_bdApi_getClientModel()->getClientById($this->_oauthToken['client_id']);
-            }
-
-            return $this->_oauthClient;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the effective OAuth client secret.
-     *
-     * @return string|false
-     */
-    public function getOAuthClientSecret()
-    {
-        $client = $this->getOAuthClient();
-
-        if (!empty($client['client_secret'])) {
-            return $client['client_secret'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the effective OAuth client option by key.
-     *
-     * @param string $key
-     * @return mixed|null
-     */
-    public function getOAuthClientOption($key)
-    {
-        $client = $this->getOAuthClient();
-
-        if (!empty($client['options'])
-            && isset($client['options'][$key])
-        ) {
-            return $client['options'][$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets the effective OAuth token text of current request or false
-     * if no token could be found.
-     */
-    public function getOAuthTokenText()
-    {
-        if (!empty($this->_oauthToken)) {
-            return $this->_oauthToken['token_text'];
-        }
-
-        return false;
-    }
-
-    public function isValidRedirectUri($uri)
-    {
-        $this->getOAuthClientSecret();
-
-        $clientRedirectUri = false;
-
-        if (!empty($this->_oauthClient['client_id'])) {
-            /** @var bdApi_Model_Client $clientModel */
-            $clientModel = XenForo_Model::create('bdApi_Model_Client');
-            $clientRedirectUri = $clientModel->getWhitelistedRedirectUri($this->_oauthClient, $uri);
-
-            if ($clientRedirectUri === false && !empty($this->_oauthClient['redirect_uri'])) {
-                $clientRedirectUri = $this->_oauthClient['redirect_uri'];
-            }
-        }
-
-        if ($clientRedirectUri !== false) {
-            $uri = rtrim($uri, '/');
-            $clientUri = rtrim($clientRedirectUri, '/');
-
-            if (strpos($uri, $clientUri) !== 0) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks for the specified scope to see if the effective scopes
-     * contain it.
-     *
-     * @param string $scope
-     *
-     * @return boolean true if the scope is found
-     */
-    public function checkScope($scope)
-    {
-        $scopes = $this->get('scopes');
-        if (empty($scopes)) {
-            // no scopes...
-            return false;
-        }
-
-        return in_array($scope, $scopes);
-    }
-
-    /**
-     * Starts running the API session handler. This will automatically log in the
-     * user via OAuth if needed, and setup the visitor object. The session will be
-     * registered in the registry.
-     *
-     * @param Zend_Controller_Request_Http|null $request
-     *
-     * @return XenForo_Session
-     */
-    public static function startApiSession(Zend_Controller_Request_Http $request = null)
-    {
-        if (!$request) {
-            $request = new Zend_Controller_Request_Http();
-        }
-
-        if (XenForo_Application::$versionId >= 1020000) {
-            $addOns = XenForo_Application::get('addOns');
-            if (empty($addOns['bdApi'])) {
-                die('The API is currently disabled.');
-            }
-        }
-
-        $session = new bdApi_Session();
-        $session->_request = $request;
-        $session->start();
-
-        // XenForo_ControllerPublic_Abstract::_executeTrophyUpdate
-        // avoid running trophy check
-        $session->set('trophyChecked', true);
-
-        // XenForo_ControllerPublic_Abstract::_executePromotionUpdate
-        // avoid running promotion check
-        $session->set('promotionChecked', true);
-
-        // XenForo_ControllerPublic_Abstract::_updateDismissedNoticeSessionCache
-        // avoid querying dismissed notices
-        $session->set('dismissedNotices', array());
-
-        // XenForo_ControllerPublic_Abstract::_updateModeratorSessionReportCounts
-        // XenForo_ControllerPublic_Abstract::_updateModeratorSessionModerationCounts
-        // avoid recounting moderator counters
-        $session->set('reportCounts', array('activeCount' => 0, 'lastBuildDate' => XenForo_Application::$time));
-        $session->set('moderationCounts', array('total' => 0, 'lastBuildDate' => XenForo_Application::$time));
-
-        // XenForo_ControllerPublic_Abstract::_updateAdminSessionModerationCounts
-        // avoid recounting admin counters
-        $session->set('canAdminUsers', false);
-        $session->set('userModerationCounts', array('total' => 0, 'lastBuildDate' => XenForo_Application::$time));
-
-        // sondh@2015-10-04
-        // added support for locale via XenForo languages
-        // api requests containing `locale` parameter will use one of the installed languages that matches
-        // the specified locale. The value must be a valid language code (ISO 639-1) with optional inclusion of
-        // a valid country code (ISO 3166-1 alpha 2) separated by hyphen ("-").
-        $requestLanguageId = 0;
-        $requestLocale = $request->getParam('locale');
-        if (!empty($requestLocale)
-            && preg_match('#^(?<lang>\w{2})(\-(?<country>\w{2}))?$#', $requestLocale, $matches)
-        ) {
-            $requestLang = utf8_strtolower($matches['lang']);
-            $requestCountry = utf8_strtoupper(isset($matches['country']) ? $matches['country'] : '');
-            $requestLocale = !empty($requestCountry) ? sprintf('%s-%s', $requestLang, $requestCountry) : $requestLang;
-            $languages = XenForo_Application::get('languages');
-            ksort($languages);
-
-            foreach ($languages as $language) {
-                if (utf8_substr($language['language_code'], 0, 2) === $requestLang
-                    && (
-                        empty($requestLanguageId)
-                        || (
-                            !empty($requestCountry)
-                            && $requestLocale === $language['language_code']
-                        )
-                    )
-                ) {
-                    $requestLanguageId = $language['language_id'];
-                }
-            }
-        }
-        $session->set('languageId', $requestLanguageId);
-
-        XenForo_Application::set('session', $session);
-        $options = $session->getAll();
-        $visitor = XenForo_Visitor::setup($session->get('user_id'), $options);
-
-        if (empty($visitor['user_id'])) {
-            $guestUsername = $request->getParam('guestUsername');
-            if (!empty($guestUsername)) {
-                $visitor['username'] = $guestUsername;
-            }
-        }
-
-        if (!empty($requestLocale)
-            && $requestLanguageId > 0
-        ) {
-            $languages = XenForo_Application::get('languages');
-            $requestLanguage = $languages[$requestLanguageId];
-            $session->set('requestLocale', $requestLanguage['language_code']);
-        }
-
-        self::_startApiSession_setStyleProperties($visitor);
-
-        return $session;
-    }
-
-    /**
-     * @param XenForo_Visitor $visitor
-     * @see XenForo_Dependencies_Public::preRenderView
-     */
-    protected static function _startApiSession_setStyleProperties(XenForo_Visitor $visitor)
-    {
-        $styles = XenForo_Application::isRegistered('styles') ? XenForo_Application::get('styles') : array();
-        $defaultProperties = XenForo_Application::isRegistered('defaultStyleProperties')
-            ? XenForo_Application::get('defaultStyleProperties')
-            : array();
-
-        $styleId = intval($visitor->get('style_id'));
-        $forceStyleId = !!$visitor->get('is_admin');
-        if ($styleId && isset($styles[$styleId]) && ($styles[$styleId]['user_selectable'] || $forceStyleId)) {
-            $style = $styles[$styleId];
-        } else {
-            $defaultStyleId = XenForo_Application::getOptions()->get('defaultStyleId');
-            $style = (isset($styles[$defaultStyleId]) ? $styles[$defaultStyleId] : reset($styles));
-        }
-
-        if ($style) {
-            // TODO: switch to use XenForo_Helper_Php::safeUnserialize
-            $properties = unserialize($style['properties']);
-            $properties = XenForo_Application::mapMerge($defaultProperties, $properties);
-            XenForo_Template_Helper_Core::setStyleProperties($properties);
-        } else {
-            XenForo_Template_Helper_Core::setStyleProperties($defaultProperties);
-        }
-    }
-
-    public function start($sessionId = null, $ipAddress = null)
-    {
-        parent::start($sessionId, $ipAddress);
-
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = XenForo_Model::create('bdApi_Model_OAuth2');
-
-        $helper = bdApi_Template_Helper_Core::getInstance();
-
-        if (empty($this->_oauthToken)
-            && isset($_REQUEST['oauth_token'])
-        ) {
-            // one time token support
-            $parts = explode(',', $_REQUEST['oauth_token']);
-            $userId = 0;
-            $timestamp = 0;
-            $once = '';
-            $ottClient = null;
-
-            if (count($parts) == 4) {
-                $userId = intval($parts[0]);
-                $timestamp = intval($parts[1]);
-                $once = $parts[2];
-
-                if ($timestamp >= XenForo_Application::$time) {
-                    $ottClient = $oauth2Model->getClientModel()->getClientById($parts[3]);
-                }
-            }
-
-            if (!empty($ottClient)) {
-                if ($userId == 0) {
-                    // guest
-                    if ($once == md5($userId . $timestamp . $ottClient['client_secret'])) {
-                        // make up fake token with full scopes for guest
-                        $this->_oauthToken = array(
-                            'token_id' => 0,
-                            'client_id' => $ottClient['client_id'],
-                            'token_text' => '',
-                            'expire_date' => XenForo_Application::$time,
-                            'issue_date' => XenForo_Application::$time,
-                            'user_id' => $userId,
-                            'scope' => $helper->scopeJoin($oauth2Model->getSystemSupportedScopes()),
-                        );
-                    }
-                } else {
-                    // user
-                    $userTokens = $oauth2Model->getTokenModel()->getTokens(array(
-                        'client_id' => $ottClient['client_id'],
-                        'user_id' => $userId,
-                    ));
-                    foreach ($userTokens as $userToken) {
-                        if ($userToken['expire_date'] >= XenForo_Application::$time) {
-                            if ($once == md5($userId . $timestamp . $userToken['token_text'] . $ottClient['client_secret'])) {
-                                $this->_oauthToken = $userToken;
-                            }
-                        }
-                    }
-                }
-
-                if (!empty($this->_oauthToken)) {
-                    // oauth token is set using one time token
-                    // update the token text to avoid exposing real access token
-                    $this->_oauthToken['token_text'] = $_REQUEST['oauth_token'];
-
-                    $this->_oauthClient = $ottClient;
-                }
-            }
-        }
-
-        if (empty($this->_oauthToken)
-            && isset($_REQUEST['oauth_token'])
-            && $this->_request !== null
-        ) {
-            // public session support
-            $publicSessionToken = bdApi_Option::getConfig('publicSessionToken');
-            $publicSessionClientId = bdApi_Option::getConfig('publicSessionClientId');
-            $publicSessionScopes = bdApi_Option::getConfig('publicSessionScopes');
-            if (!empty($publicSessionToken)
-                && $publicSessionToken === $_REQUEST['oauth_token']
-                && !empty($publicSessionClientId)
-                && !empty($publicSessionScopes)
-            ) {
-                $publicSessionClient = $oauth2Model->getClientModel()->getClientById($publicSessionClientId);
-                if (!empty($publicSessionClient)) {
-                    $publicSession = XenForo_Session::getPublicSession($this->_request);
-                    $publicSessionUserId = $publicSession->get('user_id');
-
-                    $this->_oauthToken = array(
-                        'token_id' => 0,
-                        'client_id' => $publicSessionClient['client_id'],
-                        'token_text' => md5($publicSessionToken),
-                        'expire_date' => XenForo_Application::$time,
-                        'issue_date' => XenForo_Application::$time,
-                        'user_id' => $publicSessionUserId,
-                        'scope' => $publicSessionScopes,
-                    );
-
-                    $this->_oauthClient = $publicSessionClient;
-                    $this->_oauthClient['_isPublicSessionClient'] = true;
-                }
-            }
-        }
-
-        if (empty($this->_oauthToken)) {
-            $this->_oauthToken = $oauth2Model->getServer()->getEffectiveToken();
-        }
-
-        if (!empty($this->_oauthToken)) {
-            if (!empty($this->_oauthToken['user_id'])) {
-                $this->changeUserId($this->_oauthToken['user_id']);
-                $this->_sessionId = md5($this->_oauthToken['user_id']);
-            } else {
-                $this->_sessionId = md5($this->_oauthToken['token_text']);
-            }
-
-            $scopes = $helper->scopeSplit($this->_oauthToken['scope']);
-            $this->set('scopes', $scopes);
-        } else {
-            $guestScopes = array();
-
-            if (!bdApi_Option::get('restrictAccess')) {
-                $guestScopes[] = bdApi_Model_OAuth2::SCOPE_READ;
-            }
-
-            $this->set('scopes', $guestScopes);
-        }
-    }
-
-    public function fakeStart(array $client, XenForo_Visitor $visitor, array $scopes)
-    {
-        $this->_oauthToken = array(
-            'token_id' => 0,
-            'client_id' => $client['client_id'],
-            'token_text' => '',
-            'expire_date' => XenForo_Application::$time,
-            'issue_date' => XenForo_Application::$time,
-            'user_id' => $visitor['user_id'],
-            'scope' => bdApi_Template_Helper_Core::getInstance()->scopeJoin($scopes),
-        );
-        $this->changeUserId($visitor['user_id']);
-        $this->set('scopes', $scopes);
-
-        XenForo_Application::set('_bdApi_session', $this);
-    }
-
-    public function getSessionFromSource($sessionId)
-    {
-        // api sessions are not saved
-        // so it's unnecessary to query the db for it
-        return false;
-    }
-
-    public function save()
-    {
-        // do nothing
-    }
-
-    public function saveSessionToSource($sessionId, $isUpdate)
-    {
-        // do nothing
-    }
-
-    public function delete()
-    {
-        // do nothing
-    }
-
-    public function deleteSessionFromSource($sessionId)
-    {
-        // do nothing
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    protected static function _bdApi_getClientModel()
-    {
-        /** @var bdApi_Model_Client $model */
-        static $model = null;
-
-        if ($model === null) {
-            $model = XenForo_Model::create('bdApi_Model_Client');
-        }
-
-        return $model;
-    }
-}
diff --git a/xenforo/library/bdApi/ShippableHelper/Crypt.php b/xenforo/library/bdApi/ShippableHelper/Crypt.php
deleted file mode 100644
index 3427090b..00000000
--- a/xenforo/library/bdApi/ShippableHelper/Crypt.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2017-12-13T03:18:14+00:00
-
-/**
- * Class bdApi_ShippableHelper_Crypt
- * @version 4
- * @see DevHelper_Helper_ShippableHelper_Crypt
- */
-class bdApi_ShippableHelper_Crypt
-{
-    const ALGO_AES_128 = 'aes128';
-    const ALGO_AES_256 = 'aes256';
-
-    const OPENSSL_METHOD_AES128 = 'aes-128-ecb';
-    const OPENSSL_METHOD_AES256 = 'aes-256-cbc';
-    const OPENSSL_OPT_RAW_DATA = 1;
-
-    public static function encrypt($data, $key = null, $algo = null)
-    {
-        if ($key === null) {
-            $key = XenForo_Application::getConfig()->get('globalSalt');
-        }
-
-        switch ($algo) {
-            case self::ALGO_AES_128:
-                return self::_aes128_encrypt($data, $key);
-            default:
-            case self::ALGO_AES_256:
-                return self::_aes256_encrypt($data, $key);
-        }
-    }
-
-    public static function decrypt($data, $key = null, $algo = null)
-    {
-        if ($key === null) {
-            $key = XenForo_Application::getConfig()->get('globalSalt');
-        }
-
-        if ($algo === null) {
-            if (substr($data, 0, strlen(self::ALGO_AES_256)) === self::ALGO_AES_256) {
-                $algo = self::ALGO_AES_256;
-            } else {
-                $algo = self::ALGO_AES_128;
-            }
-        }
-
-        switch ($algo) {
-            case self::ALGO_AES_128:
-                return self::_aes128_decrypt($data, $key);
-            default:
-            case self::ALGO_AES_256:
-                return self::_aes256_decrypt($data, $key);
-        }
-    }
-
-    /**
-     * Legacy AES 128 encryption.
-     * Supports both OpenSSL and mcrypt.
-     * Warning: This method is insecure and potentially dangerous, should be avoided for new application.
-     *
-     * @param string $data
-     * @param string $key
-     * @return string
-     */
-    protected static function _aes128_encrypt($data, $key)
-    {
-        if (function_exists('openssl_encrypt')) {
-            $key = md5($key, true);
-            return openssl_encrypt($data, self::OPENSSL_METHOD_AES128, $key, self::OPENSSL_OPT_RAW_DATA);
-        }
-
-        if (function_exists('mcrypt_encrypt')) {
-            $key = md5($key, true);
-            $padding = 16 - (strlen($data) % 16);
-            $data .= str_repeat(chr($padding), $padding);
-            /** @noinspection PhpDeprecationInspection */
-            return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_ECB);
-        }
-
-        throw new RuntimeException('Cannot encrypt data');
-    }
-
-    /**
-     * Legacy AES 128 decryption.
-     * Supports both OpenSSL and mcrypt.
-     * Warning: This method is insecure and potentially dangerous, should be avoided for new application.
-     *
-     * @param string $data
-     * @param string $key
-     * @return string
-     */
-    protected static function _aes128_decrypt($data, $key)
-    {
-        if (function_exists('openssl_decrypt')) {
-            $key = md5($key, true);
-            return openssl_decrypt($data, self::OPENSSL_METHOD_AES128, $key, self::OPENSSL_OPT_RAW_DATA);
-        }
-
-        if (function_exists('mcrypt_decrypt')) {
-            $key = md5($key, true);
-            /** @noinspection PhpDeprecationInspection */
-            $data = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_ECB);
-            $padding = ord($data[strlen($data) - 1]);
-            return substr($data, 0, -$padding);
-        }
-
-        throw new RuntimeException('Cannot decrypt data');
-    }
-
-    /**
-     * Secure AES 256 encryption.
-     * This method only supports OpenSSL (unlike the AES 128 variant which also supports mcrypt).
-     *
-     * @param string $data
-     * @param string $key
-     * @return string
-     */
-    protected static function _aes256_encrypt($data, $key)
-    {
-        if (function_exists('mb_substr') && function_exists('openssl_encrypt')) {
-            $ivLength = openssl_cipher_iv_length(self::OPENSSL_METHOD_AES256);
-            $iv = openssl_random_pseudo_bytes($ivLength);
-            $encrypted = openssl_encrypt($data, self::OPENSSL_METHOD_AES256, $key, self::OPENSSL_OPT_RAW_DATA, $iv);
-
-            return self::ALGO_AES_256 . $iv . $encrypted;
-        }
-
-        throw new RuntimeException('Cannot encrypt data');
-    }
-
-    /**
-     * Secure AES 256 decryption.
-     * This method only supports OpenSSL (unlike the AES 128 variant which also supports mcrypt).
-     *
-     * @param string $data
-     * @param string $key
-     * @return string
-     */
-    protected static function _aes256_decrypt($data, $key)
-    {
-        if (function_exists('mb_substr') && function_exists('openssl_encrypt')) {
-            $prefixLength = mb_strlen(self::ALGO_AES_256, '8bit');
-            $prefix = mb_substr($data, 0, $prefixLength);
-            if ($prefix === self::ALGO_AES_256) {
-                $ivLength = openssl_cipher_iv_length(self::OPENSSL_METHOD_AES256);
-                $iv = mb_substr($data, $prefixLength, $ivLength, '8bit');
-                $encrypted = mb_substr($data, $prefixLength + $ivLength, null, '8bit');
-
-                return openssl_decrypt($encrypted, self::OPENSSL_METHOD_AES256, $key, self::OPENSSL_OPT_RAW_DATA, $iv);
-            }
-        }
-
-        throw new RuntimeException('Cannot decrypt data');
-    }
-
-}
diff --git a/xenforo/library/bdApi/ShippableHelper/TempFile.php b/xenforo/library/bdApi/ShippableHelper/TempFile.php
deleted file mode 100644
index 1de1913f..00000000
--- a/xenforo/library/bdApi/ShippableHelper/TempFile.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2017-10-26T03:42:22+00:00
-
-/**
- * Class bdApi_ShippableHelper_TempFile
- * @version 13
- * @see DevHelper_Helper_ShippableHelper_TempFile
- */
-class bdApi_ShippableHelper_TempFile
-{
-    protected static $_cached = array();
-    protected static $_latestDownloadHeaders = array();
-    protected static $_maxDownloadSize = 0;
-    protected static $_registeredShutdownFunction = false;
-
-    /**
-     * Downloads and put content into the specified temp file
-     *
-     * @param string $url
-     * @param string $tempFile
-     */
-    public static function cache($url, $tempFile)
-    {
-        self::$_cached[$url] = $tempFile;
-
-        if (!self::$_registeredShutdownFunction) {
-            register_shutdown_function(array(__CLASS__, 'deleteAllCached'));
-        }
-    }
-
-    /**
-     * Creates a new temp file with the given contents and prefix.
-     *
-     * @param string|null $contents if null, no contents will be written to file
-     * @param string|null $prefix if null, the default prefix will be used
-     * @return string
-     */
-    public static function create($contents = null, $prefix = null)
-    {
-        if ($prefix === null) {
-            $prefix = self::_getPrefix();
-        }
-
-        $tempFile = tempnam(XenForo_Helper_File::getTempDir(), $prefix);
-        self::cache(sprintf('%s::%s', __METHOD__, md5($tempFile)), $tempFile);
-
-        if ($contents !== null) {
-            file_put_contents($tempFile, $contents);
-        }
-
-        return $tempFile;
-    }
-
-    public static function download($url, array $options = array())
-    {
-        self::$_latestDownloadHeaders = array();
-
-        $options += array(
-            'tempFile' => '',
-            'userAgent' => '',
-            'timeOutInSeconds' => 0,
-            'maxRedirect' => 3,
-            'maxDownloadSize' => XenForo_Application::getOptions()->get('attachmentMaxFileSize') * 1024,
-            'secured' => 0,
-        );
-
-        $tempFile = trim(strval($options['tempFile']));
-        $managedTempFile = false;
-        if (strlen($tempFile) === 0) {
-            $tempFile = tempnam(XenForo_Helper_File::getTempDir(), self::_getPrefix());
-            $managedTempFile = true;
-        }
-        if (strlen($tempFile) === 0) {
-            return false;
-        }
-
-        if (isset(self::$_cached[$url])
-            && filesize(self::$_cached[$url]) > 0
-        ) {
-            if ($managedTempFile) {
-                unlink($tempFile);
-                return self::$_cached[$url];
-            } else {
-                copy(self::$_cached[$url], $tempFile);
-                return $tempFile;
-            }
-        }
-
-        if ($managedTempFile) {
-            self::cache($url, $tempFile);
-        }
-
-        self::$_maxDownloadSize = $options['maxDownloadSize'];
-
-        $fh = fopen($tempFile, 'wb');
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_FILE, $fh);
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array(__CLASS__, 'download_curlHeaderFunction'));
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_NOPROGRESS, 0);
-        curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, array(__CLASS__, 'download_curlProgressFunction'));
-
-        if (!empty($options['userAgent'])) {
-            curl_setopt($ch, CURLOPT_USERAGENT, $options['userAgent']);
-        }
-        if ($options['timeOutInSeconds'] > 0) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $options['timeOutInSeconds']);
-        }
-        if ($options['maxRedirect'] > 0) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $options['maxRedirect']);
-        } else {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-        }
-        if ($options['secured'] === 0) {
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        }
-
-        curl_exec($ch);
-        $curlInfo = curl_getinfo($ch);
-        curl_close($ch);
-        fclose($fh);
-
-        $downloaded = true;
-        if (!isset($curlInfo['http_code'])
-            || $curlInfo['http_code'] < 200
-            || $curlInfo['http_code'] >= 300
-        ) {
-            // no http response status / non success status, must be an error
-            $downloaded = false;
-        }
-
-        $fileSize = filesize($tempFile);
-        if ($downloaded && $fileSize === 0) {
-            clearstatcache();
-            $fileSize = filesize($tempFile);
-        }
-
-        if ($downloaded
-            && isset($curlInfo['size_download'])
-            && $fileSize !== intval($curlInfo['size_download'])
-        ) {
-            // file size reported by our system seems to be off, probably a write error
-            $downloaded = false;
-        }
-
-        if ($downloaded
-            && isset($curlInfo['download_content_length'])
-            && $curlInfo['download_content_length'] > 0
-            && $fileSize !== intval($curlInfo['download_content_length'])
-        ) {
-            // file size is different from Content-Length header, probably a cancelled download (or corrupted)
-            $downloaded = false;
-        }
-
-        if (XenForo_Application::debugMode()) {
-            XenForo_Helper_File::log(__CLASS__, call_user_func_array('sprintf', array(
-                'download %s -> %s, %s, %s',
-                $url,
-                $tempFile,
-                ($downloaded ? 'succeeded' : 'failed'),
-                json_encode($curlInfo),
-            )));
-        }
-
-        if ($downloaded) {
-            return $tempFile;
-        } else {
-            file_put_contents($tempFile, '');
-            return false;
-        }
-    }
-
-    public static function download_curlHeaderFunction($curl, $header)
-    {
-        self::$_latestDownloadHeaders[] = $header;
-
-        return strlen($header);
-    }
-
-    public static function download_curlProgressFunction($downloadSize, $downloaded)
-    {
-        return ((self::$_maxDownloadSize > 0
-            && ($downloadSize > self::$_maxDownloadSize
-                || $downloaded > self::$_maxDownloadSize))
-            ? 1 : 0);
-    }
-
-    public static function deleteAllCached()
-    {
-        foreach (self::$_cached as $url => $tempFile) {
-            if (XenForo_Application::debugMode()) {
-                $fileSize = @filesize($tempFile);
-            }
-
-            $deleted = @unlink($tempFile);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, call_user_func_array('sprintf', array(
-                    'delete %s -> %s, %s, %d bytes',
-                    $url,
-                    $tempFile,
-                    ($deleted ? 'succeeded' : 'failed'),
-                    (!empty($fileSize) ? $fileSize : 0),
-                )));
-            }
-        }
-
-        self::$_cached = array();
-    }
-
-    public static function getLatestDownloadHeaders()
-    {
-        return self::$_latestDownloadHeaders;
-    }
-
-    protected static function _getPrefix()
-    {
-        static $prefix = null;
-
-        if ($prefix === null) {
-            $prefix = strtolower(preg_replace('#[^A-Z]#', '', __CLASS__)) . '_';
-        }
-
-        return $prefix;
-    }
-
-}
diff --git a/xenforo/library/bdApi/ShippableHelper/Updater.php b/xenforo/library/bdApi/ShippableHelper/Updater.php
deleted file mode 100644
index b4d67a65..00000000
--- a/xenforo/library/bdApi/ShippableHelper/Updater.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2017-12-05T22:45:12+00:00
-
-/**
- * Class bdApi_ShippableHelper_Updater
- * @version 8
- * @see DevHelper_Helper_ShippableHelper_Updater
- */
-class bdApi_ShippableHelper_Updater
-{
-    const KEY = 'ShippableHelper_Updater';
-    const API_URL = 'https://xfrocks.com/api/index.php?updater';
-
-    public static $_version = 2016050601;
-
-    /**
-     * Verifies config to make sure the Updater should run.
-     * 1. It has not been configured yet
-     * 2. Or it has been enabled at some point
-     *
-     * Tips:
-     * 1. Wrap this call within a `if (isset($data['routesAdmin'])) { ... }` for small performance boost
-     *
-     * @param XenForo_Dependencies_Abstract $dependencies
-     * @param string|null $apiUrl
-     * @param string|null $addOnId
-     * @throws XenForo_Exception
-     */
-    public static function onInitDependencies(
-        XenForo_Dependencies_Abstract $dependencies,
-        $apiUrl = null,
-        $addOnId = null
-    ) {
-        if (get_class($dependencies) !== 'XenForo_Dependencies_Admin') {
-            // do nothing unless user are in AdminCP
-            return;
-        }
-
-        if (XenForo_Application::$versionId < 1020000) {
-            // only run if XenForo is at least 1.2.0
-            return;
-        }
-
-        if (!is_string($apiUrl)) {
-            // use default api url if nothing provided
-            // this will also make this method compatible with XenForo code event
-            // in which an array will be sent as the second parameter
-            $apiUrl = self::API_URL;
-        }
-
-        if (!parse_url($apiUrl, PHP_URL_HOST)) {
-            throw new XenForo_Exception(sprintf('$apiUrl is invalid: %s', $apiUrl));
-        }
-
-        $addOnId = self::_getAddOnId($addOnId);
-        $config = self::_readConfig($addOnId, $apiUrl);
-        if (!empty($config['configured'])
-            && empty($config['enabled'])
-        ) {
-            // admin has turned it off, bye bye
-            return;
-        }
-
-        if (!isset($GLOBALS[self::KEY])) {
-            $GLOBALS[self::KEY] = array(
-                'version' => array(),
-                'onPreRoute' => array(),
-                'setupMethod' => array(),
-                'addOns' => array(),
-            );
-        }
-
-        $GLOBALS[self::KEY]['version'][$apiUrl][self::$_version]
-            = 'bdApi_ShippableHelper_UpdaterCore';
-
-        if (!isset($GLOBALS[self::KEY]['onPreRoute'][$apiUrl])) {
-            $GLOBALS[self::KEY]['onPreRoute'][$apiUrl] = function ($fc) use ($config) {
-                self::onPreRoute($fc, $config);
-            };
-            XenForo_CodeEvent::addListener('front_controller_pre_route',
-                $GLOBALS[self::KEY]['onPreRoute'][$apiUrl]);
-        }
-
-        $GLOBALS[self::KEY][$apiUrl]['addOns'][$addOnId] = true;
-    }
-
-    /**
-     * Removes trace of Updater if it is no longer needed.
-     *
-     * @param string|null $apiUrl
-     * @param string|null $addOnId
-     * @throws Zend_Exception
-     * @throws XenForo_Exception
-     */
-    public static function onUninstall($apiUrl = null, $addOnId = null)
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            // only run if XenForo is at least 1.2.0
-            return;
-        }
-
-        if (!is_string($apiUrl)) {
-            // use default api url if nothing provided
-            $apiUrl = self::API_URL;
-        }
-
-        $addOnId = self::_getAddOnId($addOnId);
-        $config = self::_readConfig($addOnId, $apiUrl);
-        $addOns = XenForo_Application::get('addOns');
-
-        $activeAddOnIds = array();
-        foreach ($config['addOnIds'] as $configAddOnId) {
-            if ($configAddOnId === $addOnId
-                || !isset($addOns[$configAddOnId])
-            ) {
-                continue;
-            }
-
-            $activeAddOnIds[] = $configAddOnId;
-        }
-
-        if (empty($activeAddOnIds)) {
-            // no active add-ons found, trigger uninstall routine
-            bdApi_ShippableHelper_UpdaterCore::_uninstallSelf($apiUrl);
-        }
-    }
-
-    /**
-     * Finds the latest Updater version and let it setup.
-     * THIS METHOD SHOULD NOT BE ALTERED BETWEEN VERSIONS.
-     *
-     * @param XenForo_FrontController $fc
-     * @param array $config
-     *
-     * @internal
-     */
-    public static function onPreRoute(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_FrontController $fc,
-        array $config
-    ) {
-        if (empty($GLOBALS[self::KEY]['version'][$config['apiUrl']])) {
-            return;
-        }
-        $versions = $GLOBALS[self::KEY]['version'][$config['apiUrl']];
-
-        ksort($versions);
-        $latest = array_pop($versions);
-
-        call_user_func(array($latest, 'bootstrap'), $config);
-    }
-
-    public static function getConfigOptionId($apiUrl)
-    {
-        $configOptionId = sprintf('updater%s%s', str_replace(' ', '', ucwords(preg_replace('#[^A-Za-z]+#', ' ',
-            parse_url($apiUrl, PHP_URL_HOST)))), md5($apiUrl));
-        if (strlen($configOptionId) > 50) {
-            $configOptionId = 'updater_' . md5($configOptionId);
-        }
-
-        return $configOptionId;
-    }
-
-    private static function _getAddOnId($addOnId)
-    {
-        if ($addOnId !== null) {
-            return $addOnId;
-        }
-
-        $clazz = __CLASS__;
-        $strPos = strpos($clazz, '_ShippableHelper_');
-        if ($strPos === false) {
-            throw new XenForo_Exception('Unable to determine $addOnId');
-        }
-
-        return substr($clazz, 0, $strPos);
-    }
-
-    private static function _readConfig($addOnId, $apiUrl)
-    {
-        $options = XenForo_Application::getOptions();
-
-        $configOptionId = self::getConfigOptionId($apiUrl);
-        $config = $options->get($configOptionId);
-
-        if ($config === null) {
-            $config = array(
-                'version' => 0,
-                'apiUrl' => $apiUrl,
-                'addOnIds' => array($addOnId),
-
-                'enabled' => false,
-                'ignored' => array(),
-            );
-        }
-
-        return $config;
-    }
-}
\ No newline at end of file
diff --git a/xenforo/library/bdApi/ShippableHelper/UpdaterCore.php b/xenforo/library/bdApi/ShippableHelper/UpdaterCore.php
deleted file mode 100644
index b4b224f2..00000000
--- a/xenforo/library/bdApi/ShippableHelper/UpdaterCore.php
+++ /dev/null
@@ -1,797 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2017-07-12T03:28:57+00:00
-
-/**
- * Class bdApi_ShippableHelper_UpdaterCore
- * @version 1
- * @see DevHelper_Helper_ShippableHelper_UpdaterCore
- */
-class bdApi_ShippableHelper_UpdaterCore
-{
-    const PARAM_ENABLE = 'updater-enable';
-    const PARAM_DISABLE = 'updater-disable';
-    const PARAM_FORCE = 'updater-force';
-    const PARAM_DOWNLOAD = 'updater-download';
-    const PARAM_IMPORT_XML = 'updater-importXml';
-    const PARAM_IMPORT_XML_PATH = 'updater-xmlPath';
-    const PARAM_AUTHORIZE = 'updater-authorize';
-    const PARAM_ACCESS_TOKEN = 'updater-accessToken';
-    const PARAM_IGNORE = 'updater-ignore';
-
-    protected static $_isBeta = true;
-
-    /**
-     * Bootstraps the Updater.
-     * This routine cannot be executed at `init_dependencies` due to version resolving,
-     * it will run at `front_controller_pre_route` instead. This method should only be called once
-     * for each <code>$config.apiUrl</code.
-     *
-     * @param array $config
-     *
-     * @internal
-     */
-    public static function bootstrap(array $config)
-    {
-        if (isset($GLOBALS[bdApi_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']])) {
-            if (XenForo_Application::debugMode()) {
-                die(sprintf('Updater for %s has been setup by %s already!', $config['apiUrl'],
-                    $GLOBALS[bdApi_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']]));
-            }
-            return;
-        }
-        $GLOBALS[bdApi_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']] = __METHOD__;
-
-        if (self::$_config !== null) {
-            if (XenForo_Application::debugMode()) {
-                die(sprintf('%s has been setup to run with %s already!', __METHOD__, self::$_config['apiUrl']));
-            }
-            return;
-        }
-        self::_updateSelf($config);
-
-        // from this point, we no longer need to care about other implementations of Updater
-        // all checks have been passed and indicated that the current one is the latest version
-
-        XenForo_CodeEvent::addListener('front_controller_pre_view', array(__CLASS__, 'front_controller_pre_view'));
-    }
-
-    /**
-     * Handles pre_view code event and execute Updater routines appropriately.
-     *
-     * @param XenForo_FrontController $fc
-     * @param XenForo_ControllerResponse_Abstract $controllerResponse
-     * @param XenForo_ViewRenderer_Abstract $viewRenderer
-     * @param array $containerParams
-     *
-     * @internal
-     */
-    public static function front_controller_pre_view(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_FrontController $fc,
-        XenForo_ControllerResponse_Abstract &$controllerResponse,
-        XenForo_ViewRenderer_Abstract &$viewRenderer,
-        array &$containerParams
-    ) {
-        if (!$controllerResponse instanceof XenForo_ControllerResponse_View) {
-            return;
-        }
-
-        switch ($controllerResponse->viewName) {
-            case 'XenForo_ViewAdmin_AddOn_List':
-                self::_onAddOnList($controllerResponse, $containerParams);
-                break;
-            case 'XenForo_ViewAdmin_AddOn_Upgrade':
-                self::_onAddOnUpgrade($controllerResponse);
-                break;
-        }
-    }
-
-    private static function _onAddOnList(XenForo_ControllerResponse_View &$controllerResponse, array &$containerParams)
-    {
-        $message = '';
-
-        if (!empty($_GET[self::PARAM_ENABLE])
-            && $_GET[self::PARAM_ENABLE] === self::$_config['apiUrl']
-        ) {
-            self::$_config['configured'] = true;
-            self::$_config['enabled'] = true;
-            self::_saveConfig(self::$_config);
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-            return;
-        }
-
-        if (!empty($_GET[self::PARAM_DISABLE])
-            && $_GET[self::PARAM_DISABLE] === self::$_config['apiUrl']
-        ) {
-            self::$_config['configured'] = true;
-            self::$_config['enabled'] = false;
-            self::_saveConfig(self::$_config);
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-            return;
-        }
-
-        if (empty(self::$_config['configured'])) {
-            if (!self::$_isBeta
-                || XenForo_Application::debugMode()
-            ) {
-                $enabledAddOnIds = self::_getEnabledAddOnIds(self::$_config['addOnIds']);
-
-                if (!empty($enabledAddOnIds)) {
-                    /** @noinspection HtmlUnknownTarget */
-                    $message .= sprintf('Updater for %s: <a href="%s">enable</a> or <a href="%s">disable</a>?',
-                        implode(', ', $enabledAddOnIds),
-                        XenForo_Link::buildAdminLink('add-ons', null, array(
-                            self::PARAM_ENABLE => self::$_config['apiUrl'],
-                        )),
-                        XenForo_Link::buildAdminLink('add-ons', null, array(
-                            self::PARAM_DISABLE => self::$_config['apiUrl'],
-                        ))
-                    );
-
-                    if (self::$_isBeta) {
-                        $message .= ' Warning: The Updater is currently in beta.';
-                    }
-                }
-            }
-        } elseif (self::$_config['configured']) {
-            $forceRefresh = (!empty($_GET[self::PARAM_FORCE]) && $_GET[self::PARAM_FORCE] === self::$_config['apiUrl']);
-            $data = self::_refreshData(self::$_config['apiUrl'], self::$_config['addOnIds'], $forceRefresh);
-
-            if (!empty($data)) {
-                $message .= self::_onAddOnShowStatuses($data, $forceRefresh);
-            }
-
-        }
-
-        $paramKey = '_' . md5(self::$_config['apiUrl']);
-        $containerParams[$paramKey] = array('message' => $message);
-    }
-
-    private static function _onAddOnShowStatuses(array $data, $forceRefresh)
-    {
-        $statuses = '';
-        $xenAddOns = XenForo_Application::get('addOns');
-
-        foreach ($xenAddOns as $addOnId => $addOnVersionId) {
-            if (!in_array($addOnId, self::$_config['addOnIds'], true)) {
-                continue;
-            }
-
-            if (!isset($data[$addOnId])) {
-                if ($forceRefresh) {
-                    $statuses .= sprintf('%1$s cannot be verified with the Updater Server.<br />', $addOnId);
-                }
-                continue;
-            }
-
-            if ($addOnVersionId < $data[$addOnId]['version_id']) {
-                $ignoredVersionId = 0;
-                if (!empty(self::$_config['ignored'][$addOnId])) {
-                    $ignoredVersionId = self::$_config['ignored'][$addOnId];
-                }
-                $isIgnored = $data[$addOnId]['version_id'] <= $ignoredVersionId;
-
-                $actions = array();
-                if ($forceRefresh
-                    || !$isIgnored
-                ) {
-                    if (!empty($data[$addOnId]['links']['permalink'])) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">read more</a>', $data[$addOnId]['links']['permalink']);
-                    }
-
-                    if (!empty($data[$addOnId]['links']['content'])) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">update</a>',
-                            XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_DOWNLOAD => self::$_config['apiUrl'])));
-                    } elseif (!empty($data[$addOnId]['links']['authorize'])) {
-                        $authorizeUrl = sprintf('%s&redirect_uri=%s',
-                            $data[$addOnId]['links']['authorize'],
-                            rawurlencode(XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_AUTHORIZE => self::$_config['apiUrl'])))
-                        );
-
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">authorize an update</a>', $authorizeUrl);
-                    }
-                }
-
-                if (!empty($actions)) {
-                    $outOfDateMessage = sprintf('%1$s is out of date, latest version is v%3$s (#%4$d, yours is #%2$d).',
-                        $addOnId,
-                        $addOnVersionId,
-                        $data[$addOnId]['version_string'],
-                        $data[$addOnId]['version_id']);
-
-                    $ignoreMessage = '';
-                    if (!$isIgnored) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $ignoreMessage = sprintf(' or <a href="%1$s">ignore this version</a>',
-                            XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_IGNORE => self::$_config['apiUrl'])));
-                    }
-
-                    $statuses .= sprintf('%1$s You may: %2$s%3$s.<br />',
-                        $outOfDateMessage,
-                        implode(', ', $actions),
-                        $ignoreMessage);
-                }
-            } else {
-                if ($forceRefresh) {
-                    if ($addOnVersionId > $data[$addOnId]['version_id']) {
-                        $statuses .= sprintf('%1$s appears to be even newer than'
-                            . ' reported from the Updater Server: their v%3$s (#%4$d) vs. your #%2$d.'
-                            . ' Awesome!<br />',
-                            $addOnId,
-                            $addOnVersionId,
-                            $data[$addOnId]['version_string'],
-                            $data[$addOnId]['version_id']);
-                    } else {
-                        $statuses .= sprintf('%1$s is up to date.<br />', $addOnId);
-                    }
-                }
-            }
-        }
-
-        return $statuses;
-    }
-
-    private static function _onAddOnUpgrade(XenForo_ControllerResponse_View &$controllerResponse)
-    {
-        if (!empty($_GET[self::PARAM_AUTHORIZE])
-            && $_GET[self::PARAM_AUTHORIZE] === self::$_config['apiUrl']
-        ) {
-            $downloadLink = XenForo_Link::buildAdminLink(
-                'full:add-ons/upgrade',
-                $controllerResponse->params['addOn'],
-                array(
-                    self::PARAM_DOWNLOAD => self::$_config['apiUrl']
-                )
-            );
-            $downloadLinkJson = json_encode($downloadLink);
-            $accessTokenParamJson = json_encode(self::PARAM_ACCESS_TOKEN);
-
-            $js = <<<EOF
-<script>
-var hash = window.location.hash.substr(1);
-var regex = /access_token=(.+?)(&|$)/;
-var match = hash.match(regex);
-if (match) {
-    var accessToken = match[1];
-    var downloadLink = $downloadLinkJson;
-    window.location = downloadLink + '&' + $accessTokenParamJson + '=' + encodeURIComponent(accessToken);
-}
-</script>
-EOF;
-            die($js);
-        }
-
-        if (!empty($_GET[self::PARAM_DOWNLOAD])
-            && $_GET[self::PARAM_DOWNLOAD] === self::$_config['apiUrl']
-        ) {
-            $accessToken = '';
-            if (!empty($_GET[self::PARAM_ACCESS_TOKEN])) {
-                $accessToken = $_GET[self::PARAM_ACCESS_TOKEN];
-            }
-
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $data = self::_fetchData(self::$_config['apiUrl'], array($addOnId), $accessToken);
-
-            if (!empty($data[$addOnId]['links']['content'])) {
-                $tempFile = bdApi_ShippableHelper_TempFile::download($data[$addOnId]['links']['content']);
-                $xmlPath = self::_updateAddOnFiles($addOnId, $tempFile);
-
-                /** @noinspection BadExpressionStatementJS */
-                die(sprintf('<script>window.location = %s;</script>',
-                    json_encode(XenForo_Link::buildAdminLink('add-ons/upgrade', array('addon_id' => $addOnId), array(
-                        self::PARAM_IMPORT_XML => self::$_config['apiUrl'],
-                        self::PARAM_IMPORT_XML_PATH => $xmlPath
-                    ))))
-                );
-            }
-        }
-
-        if (!empty($_GET[self::PARAM_IMPORT_XML])
-            && $_GET[self::PARAM_IMPORT_XML] === self::$_config['apiUrl']
-            && !empty($_GET[self::PARAM_IMPORT_XML_PATH])
-        ) {
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $xmlPath = $_GET[self::PARAM_IMPORT_XML_PATH];
-
-            /** @var XenForo_Model_AddOn $addOnModel */
-            $addOnModel = XenForo_Model::create('XenForo_Model_AddOn');
-            $addOnModel->installAddOnXmlFromFile($xmlPath, $addOnId);
-
-            $addOn = $addOnModel->getAddOnById($addOnId);
-            echo(sprintf('Updated add-on %1$s to v%2$s (#%3$d)',
-                $addOn['title'], $addOn['version_string'], $addOn['version_id']));
-
-            /** @noinspection BadExpressionStatementJS */
-            die(sprintf('<script>window.f=function(){window.location=%s;};'
-                . 'window.setTimeout("f()",5000);</script>',
-                json_encode(XenForo_Link::buildAdminLink('full:tools/run-deferred', null, array(
-                    'redirect' => XenForo_Link::buildAdminLink('full:add-ons')
-                )))));
-        }
-
-        if (!empty($_GET[self::PARAM_IGNORE])
-            && $_GET[self::PARAM_IGNORE] === self::$_config['apiUrl']
-        ) {
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $data = self::_refreshData(self::$_config['apiUrl'], self::$_config['addOnIds'], false);
-            if (!empty($data[$addOnId]['version_id'])) {
-                self::$_config['ignored'][$addOnId] = $data[$addOnId]['version_id'];
-                self::_saveConfig(self::$_config);
-            }
-
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-        }
-    }
-
-    private static function _updateSelf(array $config)
-    {
-        $options = XenForo_Application::getOptions();
-
-        $configOptionId = bdApi_ShippableHelper_Updater::getConfigOptionId($config['apiUrl']);
-        $templateTitle = $configOptionId;
-        $templateModKey = $configOptionId;
-
-        $configVersion = $config['version'];
-        $configUpdated = array();
-        if ($configVersion === 0) {
-            $configUpdated[] = '$config';
-        }
-
-        if ($configVersion < bdApi_ShippableHelper_Updater::$_version) {
-            if ($configVersion < 2015100121) {
-                /** @var XenForo_DataWriter_AdminTemplate $templateDw */
-                $templateDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplate');
-
-                /** @var XenForo_Model_AdminTemplate $templateModel */
-                $templateModel = XenForo_Model::create('XenForo_Model_AdminTemplate');
-                $template = $templateModel->getAdminTemplateByTitle($templateTitle);
-                if (!empty($template)) {
-                    $templateDw->setExistingData($template, true);
-                }
-
-                $templateDw->bulkSet(array(
-                    'title' => $templateTitle,
-                    'template' => self::$_template,
-                ));
-                $templateDw->save();
-
-                $configUpdated[] = '$templateDw';
-            }
-
-            if ($configVersion < 2015100107) {
-                /** @var XenForo_DataWriter_AdminTemplateModification $templateModDw */
-                $templateModDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplateModification');
-
-                /** @var XenForo_Model_AdminTemplateModification $templateModModel */
-                $templateModModel = XenForo_Model::create('XenForo_Model_AdminTemplateModification');
-                $templateMod = $templateModModel->getModificationByKey($templateModKey);
-                if (!empty($templateMod)) {
-                    $templateModDw->setExistingData($templateMod, true);
-                }
-
-                $templateModDw->bulkSet(array(
-                    'template' => 'content_header',
-                    'modification_key' => $templateModKey,
-                    'description' => $config['apiUrl'],
-                    'action' => 'preg_replace',
-                    'find' => '#^.+$#s',
-                    'replace' => '$0' . str_replace('md5', md5($config['apiUrl']), self::$_templateMod),
-                ));
-                $templateModDw->save();
-
-                $configUpdated[] = '$templateModDw';
-            }
-
-            $config['version'] = bdApi_ShippableHelper_Updater::$_version;
-            $configUpdated[] = '$config["version"]';
-        }
-
-        $addOnIdsUpdated = false;
-        foreach ($GLOBALS[bdApi_ShippableHelper_Updater::KEY][$config['apiUrl']]['addOns'] as $addOnId => $enabled) {
-            if (!in_array($addOnId, $config['addOnIds'], true)) {
-                $config['addOnIds'][] = $addOnId;
-                $addOnIdsUpdated = true;
-            }
-        }
-        if ($addOnIdsUpdated) {
-            sort($config['addOnIds']);
-            $configUpdated[] = '$config["addOnIds"]';
-        }
-
-        if (count($configUpdated) > 0) {
-            /** @var XenForo_DataWriter_Option $optionDw */
-            $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-            if ($configVersion > 0) {
-                $optionDw->setExistingData($configOptionId);
-            }
-            $optionDw->bulkSet(array(
-                'option_id' => $configOptionId,
-                'option_value' => $config,
-                'default_value' => 'a:0:{}',
-                'edit_format' => 'template',
-                'edit_format_params' => $templateTitle,
-                'data_type' => 'array',
-                'sub_options' => '*',
-            ));
-            $optionDw->setRelations(array(
-                'debug' => 9999,
-            ));
-            $optionDw->setExtraData(XenForo_DataWriter_Option::DATA_TITLE, 'Add-on Updates'
-                . (self::$_isBeta ? ' (BETA)' : ''));
-            $optionDw->setExtraData(XenForo_DataWriter_Option::DATA_EXPLAIN, 'Turn on this option if you want to'
-                . ' check for add-on updates from <a href="' . $config['apiUrl'] . '" target="_blank">'
-                . $config['apiUrl'] . '</a> regularly. If you want to perform update check immediately, <a href="'
-                . XenForo_Link::buildAdminLink('add-ons', null, array(self::PARAM_FORCE => $config['apiUrl']))
-                . '" target="_blank">click here</a>.');
-            $optionDw->save();
-            $options->set($configOptionId, $config);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): $configVersion=%d,'
-                    . ' self::$_version=%d, $configUpdated=%s',
-                    __METHOD__, $config['apiUrl'], var_export($configVersion, true),
-                    var_export(bdApi_ShippableHelper_Updater::$_version, true),
-                    var_export($configUpdated, true)));
-            }
-        }
-
-        self::$_config = $config;
-    }
-
-    private static function _updateAddOnFiles($addOnId, $tempFile)
-    {
-        $tempDir = $tempFile . '_extracted';
-
-        XenForo_Helper_File::createDirectory($tempDir, false);
-        XenForo_Helper_File::makeWritableByFtpUser($tempDir);
-
-        $decompress = new Zend_Filter_Decompress(array(
-            'adapter' => 'Zip',
-            'options' => array('target' => $tempDir)
-        ));
-
-        if (!$decompress->filter($tempFile)) {
-            throw new XenForo_Exception('Unable to extract add-on package.', true);
-        }
-
-        $uploadDir = sprintf('%s/upload', $tempDir);
-        if (!is_dir($uploadDir)) {
-            throw new XenForo_Exception('Unsupported add-on package (no "upload" directory found).', true);
-        }
-
-        $xfDir = dirname(XenForo_Autoloader::getInstance()->getRootDir());
-        $files = self::_verifyAddOnFiles($uploadDir, $xfDir);
-
-        $xmlPath = self::_findXmlPath($addOnId, $tempDir, $xfDir, $files);
-
-        self::_moveAddOnFiles($uploadDir, $xfDir, $files);
-
-        return $xmlPath;
-    }
-
-    private static function _verifyAddOnFiles($packageDir, $xfDir, $relativePath = null)
-    {
-        $files = array();
-
-        $dir = sprintf('%s/%s', $packageDir, $relativePath);
-        $entries = scandir($dir);
-        $subDirs = array();
-
-        foreach ($entries as $entry) {
-            if (substr($entry, 0, 1) === '.') {
-                // ignore hidden files
-                continue;
-            }
-
-            if ($relativePath !== null) {
-                $fileRelativePath = sprintf('%s/%s', $relativePath, $entry);
-            } else {
-                $fileRelativePath = $entry;
-            }
-
-            if (is_file(sprintf('%s/%s', $packageDir, $fileRelativePath))) {
-                $files[] = $fileRelativePath;
-
-                $fileSystemPath = sprintf('%s/%s', $xfDir, $fileRelativePath);
-                if (is_file($fileSystemPath)) {
-                    if (!is_writable($fileSystemPath)) {
-                        throw new XenForo_Exception('File is not writable: ' . $fileSystemPath, true);
-                    }
-                } elseif (is_dir($fileSystemPath)) {
-                    throw new XenForo_Exception('File/directory conflict: ' . $fileSystemPath, true);
-                } else {
-                    $parentOfFileSystemPath = dirname($fileSystemPath);
-                    if (is_dir($parentOfFileSystemPath)) {
-                        if (!is_writable($parentOfFileSystemPath)) {
-                            throw new XenForo_Exception('Directory is not writable: '
-                                . $parentOfFileSystemPath, true);
-                        }
-                    } else {
-                        if (!XenForo_Helper_File::createDirectory($parentOfFileSystemPath)) {
-                            throw new XenForo_Exception('Directory cannot be created: '
-                                . $parentOfFileSystemPath, true);
-                        }
-                    }
-                }
-            } else {
-                $subDirs[] = $fileRelativePath;
-            }
-        }
-
-        foreach ($subDirs as $subDir) {
-            $files = array_merge($files, self::_verifyAddOnFiles($packageDir, $xfDir, $subDir));
-        }
-
-        return $files;
-    }
-
-    private static function _moveAddOnFiles($packageDir, $xfDir, array $files)
-    {
-        foreach ($files as $file) {
-            $packagePath = sprintf('%s/%s', $packageDir, $file);
-            $systemPath = sprintf('%s/%s', $xfDir, $file);
-
-            if (!XenForo_Helper_File::safeRename($packagePath, $systemPath)) {
-                throw new XenForo_Exception('File cannot be updated: ' . $file);
-            }
-        }
-    }
-
-    private static function _findXmlPath($addOnId, $tempDir, $xfDir, array $files)
-    {
-        foreach ($files as $file) {
-            $fileName = basename($file);
-            if (preg_match('#^addon-(?<id>.+)\.xml$#', $fileName, $matches)) {
-                if ($addOnId === $matches['id']) {
-                    return sprintf('%s/%s', $xfDir, $file);
-                }
-            }
-        }
-
-        $entries = scandir($tempDir);
-        foreach ($entries as $entry) {
-            if (preg_match('#^addon-(?<id>.+)\.xml$#', $entry, $matches)) {
-                if ($addOnId === $matches['id']) {
-                    return sprintf('%s/%s', $tempDir, $entry);
-                }
-            }
-        }
-
-        throw new XenForo_Exception('Unsupported add-on package (no xml found).', true);
-    }
-
-    public static function _uninstallSelf($apiUrl)
-    {
-        $configOptionId = bdApi_ShippableHelper_Updater::getConfigOptionId($apiUrl);
-        $templateTitle = $configOptionId;
-        $templateModKey = $configOptionId;
-
-        try {
-            XenForo_Db::beginTransaction();
-
-            /** @var XenForo_Model_AdminTemplate $templateModel */
-            $templateModel = XenForo_Model::create('XenForo_Model_AdminTemplate');
-            $template = $templateModel->getAdminTemplateByTitle($templateTitle);
-            if (!empty($template)) {
-                /** @var XenForo_DataWriter_AdminTemplate $templateDw */
-                $templateDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplate');
-                $templateDw->setExistingData($template, true);
-                $templateDw->delete();
-            }
-
-
-            /** @var XenForo_Model_AdminTemplateModification $templateModModel */
-            $templateModModel = XenForo_Model::create('XenForo_Model_AdminTemplateModification');
-            $templateMod = $templateModModel->getModificationByKey($templateModKey);
-            if (!empty($templateMod)) {
-                /** @var XenForo_DataWriter_AdminTemplateModification $templateModDw */
-                $templateModDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplateModification');
-                $templateModDw->setExistingData($templateMod, true);
-                $templateModDw->delete();
-            }
-
-            /** @var XenForo_DataWriter_Option $optionDw */
-            $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-            $optionDw->setExistingData($configOptionId);
-            $optionDw->delete();
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): ok',
-                    __METHOD__, $apiUrl));
-            }
-
-            XenForo_Db::commit();
-        } catch (XenForo_Exception $e) {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): %s',
-                    __METHOD__, $apiUrl, $e->__toString()));
-            }
-
-            XenForo_Db::rollback();
-        }
-    }
-
-    private static function _refreshData($apiUrl, array $addOnIds, $forceRefresh)
-    {
-        $data = ($forceRefresh ? null : self::_getCache($apiUrl));
-        if (empty($data)
-            || $data['version'] < bdApi_ShippableHelper_Updater::$_version
-            || $data['timestamp'] < XenForo_Application::$time - 86400
-        ) {
-            $data = array(
-                'version' => bdApi_ShippableHelper_Updater::$_version,
-                'timestamp' => time(),
-                'json' => self::_fetchData($apiUrl, $addOnIds),
-            );
-
-            self::_setCache($apiUrl, $data);
-        }
-
-        return $data['json'];
-    }
-
-    private static function _fetchData($url, array $addOnIds, $accessToken = '')
-    {
-        if (empty($addOnIds)) {
-            return array();
-        }
-
-        $url .= sprintf('%s_version=%d', ((strpos($url, '?') === false) ? '?' : '&'),
-            bdApi_ShippableHelper_Updater::$_version);
-        if (!empty($accessToken)) {
-            $url .= sprintf('&oauth_token=%s', rawurlencode($accessToken));
-        }
-        foreach ($addOnIds as $addOnId) {
-            $url .= sprintf('&ids[]=%s', rawurlencode($addOnId));
-        }
-
-        $client = XenForo_Helper_Http::getClient($url);
-
-        try {
-            $response = $client->request('GET');
-
-            $responseStatus = $response->getStatus();
-            $responseBody = $response->getBody();
-        } catch (Exception $e) {
-            $responseStatus = 503;
-            $responseBody = $e->getMessage();
-        }
-
-        $json = null;
-        if ($responseStatus === 200) {
-            $json = @json_decode($responseBody, true);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($url=%s): status=%d, json=%s',
-                    __METHOD__, $url,
-                    var_export($responseStatus, true), var_export($json, true)));
-            }
-        } else {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($url=%s): status=%d, body=%s',
-                    __METHOD__, $url,
-                    var_export($responseStatus, true), var_export($responseBody, true)));
-            }
-        }
-
-        return $json;
-    }
-
-    private static function _getCache($apiUrl)
-    {
-        /** @var XenForo_Model_DataRegistry $dataRegistryModel */
-        $dataRegistryModel = XenForo_Model::create('XenForo_Model_DataRegistry');
-        $data = $dataRegistryModel->get(bdApi_ShippableHelper_Updater::KEY);
-
-        if (!empty($data)
-            && isset($data[$apiUrl])
-        ) {
-            return $data[$apiUrl];
-        }
-
-        return array();
-    }
-
-    private static function _setCache($apiUrl, array $thisData)
-    {
-        /** @var XenForo_Model_DataRegistry $dataRegistryModel */
-        $dataRegistryModel = XenForo_Model::create('XenForo_Model_DataRegistry');
-        $data = $dataRegistryModel->get(bdApi_ShippableHelper_Updater::KEY);
-        if (empty($data)) {
-            $data = array();
-        }
-        $data[$apiUrl] = $thisData;
-        $dataRegistryModel->set(bdApi_ShippableHelper_Updater::KEY, $data);
-        return true;
-    }
-
-    private static function _saveConfig(array $config)
-    {
-        $configOptionId = bdApi_ShippableHelper_Updater::getConfigOptionId($config['apiUrl']);
-
-        /** @var XenForo_DataWriter_Option $optionDw */
-        $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-        $optionDw->setExistingData($configOptionId);
-        $optionDw->set('option_value', $config);
-
-        if ($optionDw->save()) {
-            XenForo_Application::getOptions()->set($configOptionId, $config);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s)',
-                    __METHOD__, $config['apiUrl']));
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private static function _getEnabledAddOnIds($addOnIds)
-    {
-        $xenAddOns = XenForo_Application::get('addOns');
-        $enabledIds = array();
-        foreach ($addOnIds as $configAddOnId) {
-            if (isset($xenAddOns[$configAddOnId])) {
-                $enabledIds[] = $configAddOnId;
-            }
-        }
-
-        return $enabledIds;
-    }
-
-    private static $_template = '
-<xen:set var="$addOnListStr">
-    <xen:foreach loop="$preparedOption.option_value.addOnIds" value="$configAddOnId">
-        <xen:foreach loop="$xenAddOns" key="$xenAddOnId" value="$xenAddOnVersionId">
-            <xen:if is="{$configAddOnId} == {$xenAddOnId}">
-               {$configAddOnId}
-            </xen:if>
-        </xen:foreach>
-    </xen:foreach>
-</xen:set>
-
-<xen:checkboxunit label="{$preparedOption.title}">
-	<xen:explain>
-	    {xen:raw $preparedOption.explain}
-	    Supported add-ons: {$addOnListStr}</xen:explain>
-    <xen:option name="{$fieldPrefix}[{$preparedOption.option_id}][enabled]" value="1"
-        label="{xen:phrase enabled}"
-        selected="{$preparedOption.option_value.enabled}" />
-	<xen:html>
-		<input type="hidden" name="{$listedFieldName}" value="{$preparedOption.option_id}" />
-		{xen:raw $editLink}
-
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][configured]" value="1" />
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][version]" value="{$preparedOption.option_value.version}" />
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][apiUrl]" value="{$preparedOption.option_value.apiUrl}" />
-		<xen:foreach loop="$preparedOption.option_value.addOnIds" value="$addOnId">
-            <input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][addOnIds][]" value="{$addOnId}" />
-        </xen:foreach>
-	</xen:html>
-</xen:checkboxunit>';
-
-    private static $_templateMod = '
-<xen:if is="{$_md5.message}">
-    <p class="importantMessage" style="text-align: left">{xen:raw $_md5.message}</p>
-</xen:if>';
-
-    private static $_config = null;
-}
\ No newline at end of file
diff --git a/xenforo/library/bdApi/Template/Helper/Core.php b/xenforo/library/bdApi/Template/Helper/Core.php
deleted file mode 100755
index ad5c8aa1..00000000
--- a/xenforo/library/bdApi/Template/Helper/Core.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-class bdApi_Template_Helper_Core
-{
-    public function buildLink()
-    {
-        $args = func_get_args();
-        return call_user_func_array(array('bdApi_Data_Helper_Core', 'safeBuildApiLink'), $args);
-    }
-
-    public function scopeSplit($scopesStr)
-    {
-        return array_map('trim', preg_split('#\s#', $scopesStr, -1, PREG_SPLIT_NO_EMPTY));
-    }
-
-    public function scopeJoin(array $scopes)
-    {
-        return implode(' ', array_map('trim', $scopes));
-    }
-
-    public function scopeGetText($scope)
-    {
-        switch ($scope) {
-            case bdApi_Model_OAuth2::SCOPE_READ:
-                return new XenForo_Phrase('bdapi_scope_read');
-            case bdApi_Model_OAuth2::SCOPE_POST:
-                return new XenForo_Phrase('bdapi_scope_post');
-            case bdApi_Model_OAuth2::SCOPE_MANAGE_ACCOUNT_SETTINGS:
-                return new XenForo_Phrase('bdapi_scope_manage_account_settings');
-            case bdApi_Model_OAuth2::SCOPE_PARTICIPATE_IN_CONVERSATIONS:
-                return new XenForo_Phrase('bdapi_scope_participate_in_conversations');
-            case bdApi_Model_OAuth2::SCOPE_MANAGE_SYSTEM:
-                return new XenForo_Phrase('bdapi_scope_manage_system');
-        }
-
-        return false;
-    }
-
-    public function visitorHasPermission($permission, $group = 'general')
-    {
-        return XenForo_Visitor::getInstance()->hasPermission($group, 'bdApi_' . $permission);
-    }
-
-    private function __construct()
-    {
-        // singleton
-    }
-
-    private function __clone()
-    {
-        // singleton
-    }
-
-    /**
-     * Singleton instance
-     * @var bdApi_Template_Helper_Core
-     */
-    private static $_instance = null;
-
-    /**
-     * @return bdApi_Template_Helper_Core
-     */
-    public static function getInstance()
-    {
-        if (self::$_instance === null) {
-            // TODO: $type is required because of XenForo 1.1, drop support for this old version?
-            $templateHelperClass = XenForo_Application::resolveDynamicClass(__CLASS__, __CLASS__);
-            self::$_instance = new $templateHelperClass();
-        }
-
-        return self::$_instance;
-    }
-
-    public static function initTemplateHelpers()
-    {
-        static $initialized = false;
-        if ($initialized) {
-            return;
-        }
-        $initialized = true;
-
-        $templateHelper = bdApi_Template_Helper_Core::getInstance();
-
-        // register the helper methods in the format `api_<method_name>`
-        $templateHelperReflector = new ReflectionClass(get_class($templateHelper));
-        $methods = $templateHelperReflector->getMethods();
-        foreach ($methods as $method) {
-            if (!($method->getModifiers() & ReflectionMethod::IS_PUBLIC)
-                || ($method->getModifiers() & ReflectionMethod::IS_STATIC)
-            ) {
-                // ignore restricted or static methods
-                continue;
-            }
-
-            $methodName = $method->getName();
-            $helperCallbackName = utf8_strtolower('api_' . $methodName);
-            XenForo_Template_Helper_Core::$helperCallbacks[$helperCallbackName] = array(
-                $templateHelper,
-                $methodName
-            );
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Template/Simulation/Dependencies.php b/xenforo/library/bdApi/Template/Simulation/Dependencies.php
deleted file mode 100644
index edd0efa3..00000000
--- a/xenforo/library/bdApi/Template/Simulation/Dependencies.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class bdApi_Template_Simulation_Dependencies extends XenForo_Dependencies_Public
-{
-    protected $_noNameTemplate = null;
-
-    public function createTemplateObject($templateName, array $params = array())
-    {
-        if ($templateName === '' && $this->_noNameTemplate !== null) {
-            return $this->_noNameTemplate;
-        }
-
-        if ($params) {
-            $params = XenForo_Application::mapMerge($this->_defaultTemplateParams, $params);
-        } else {
-            $params = $this->_defaultTemplateParams;
-        }
-
-        $template = new bdApi_Template_Simulation_Template($templateName, $params);
-
-        if ($templateName === '') {
-            $this->_noNameTemplate = $template;
-        }
-
-        return $template;
-    }
-}
diff --git a/xenforo/library/bdApi/Template/Simulation/Template.php b/xenforo/library/bdApi/Template/Simulation/Template.php
deleted file mode 100644
index 4d1af039..00000000
--- a/xenforo/library/bdApi/Template/Simulation/Template.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-class bdApi_Template_Simulation_Template extends XenForo_Template_Public
-{
-    public static $bdApi_visitor = null;
-    public static $bdApi_mapping = array(
-        'bb_code_tag_attach' => 'bdapi_bb_code_tag_attach',
-    );
-
-    public function clearRequiredExternalsForApi()
-    {
-        $this->_setRequiredExternals(array());
-    }
-
-    public function getRequiredExternalsAsHtmlForApi()
-    {
-        $required = $this->_getRequiredExternals();
-        $html = '';
-
-        $extraData = self::getExtraContainerData();
-        if (!empty($extraData['head'])) {
-            foreach ($extraData['head'] as $head) {
-                $html .= utf8_trim($head);
-            }
-        }
-
-        foreach (array_keys($required) as $type) {
-            $html .= $this->getRequiredExternalsAsHtml($type);
-        }
-
-        return $html;
-    }
-
-    public function getRequiredCssUrl(array $requirements)
-    {
-        $cssUrl = parent::getRequiredCssUrl($requirements);
-        return XenForo_Link::convertUriToAbsoluteUri($cssUrl, true);
-    }
-
-    public function __construct($templateName, array $params = array())
-    {
-        if (isset(self::$bdApi_mapping[$templateName])) {
-            $templateName = self::$bdApi_mapping[$templateName];
-        }
-
-        if (self::$bdApi_visitor !== null) {
-            $params['visitor'] = self::$bdApi_visitor;
-        }
-
-        $languageId = 0;
-        if (!empty($params['visitor']['language_id'])) {
-            $languageId = $params['visitor']['language_id'];
-        }
-        if (empty($languageId)) {
-            $languageId = XenForo_Application::getOptions()->get('defaultLanguageId');
-        }
-
-        $params['xenOptions'] = XenForo_Application::getOptions()->getOptions();
-
-        parent::__construct(sprintf('__%s_%d', $templateName, $languageId), $params);
-    }
-
-    protected function _getTemplatesFromDataSource(array $templateList)
-    {
-        $db = XenForo_Application::getDb();
-
-        $listByLanguageId = array();
-        foreach ($templateList as $template) {
-            if (preg_match('#^__(.+)_(\d+)$#', $template, $matches)) {
-                $templateName = $matches[1];
-                $languageId = $matches[2];
-
-                if (!isset($listByLanguageId[$languageId])) {
-                    $listByLanguageId[$languageId] = array();
-                }
-                $listByLanguageId[$languageId][] = $templateName;
-            }
-        }
-
-        $results = array();
-
-        foreach ($listByLanguageId as $languageId => $templateNames) {
-            $templates = $db->fetchPairs('
-				SELECT title, template_compiled
-				FROM xf_template_compiled
-				WHERE title IN (' . $db->quote($templateNames) . ')
-					AND style_id = ?
-					AND language_id = ?
-			', array(
-                XenForo_Application::getOptions()->get('defaultStyleId'),
-                $languageId,
-            ));
-
-            foreach ($templates as $title => $compiled) {
-                $results[sprintf('__%s_%d', $title, $languageId)] = $compiled;
-            }
-        }
-
-        return $results;
-    }
-
-    protected function _loadTemplateFilePath($templateName)
-    {
-        if ($this->_usingTemplateFiles() AND preg_match('#^__(.+)_(\d+)$#', $templateName, $matches)) {
-            $templateName = $matches[1];
-            $styleId = XenForo_Application::getOptions()->get('defaultStyleId');
-            $languageId = $matches[2];
-
-            return XenForo_Template_FileHandler::get($templateName, $styleId, $languageId);
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/Template/Simulation/View.php b/xenforo/library/bdApi/Template/Simulation/View.php
deleted file mode 100644
index 2d57dfbc..00000000
--- a/xenforo/library/bdApi/Template/Simulation/View.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-class bdApi_Template_Simulation_View extends XenForo_View
-{
-    protected static $_bdApi_viewRenderer = null;
-
-    public static function create()
-    {
-        if (self::$_bdApi_viewRenderer === null) {
-            self::$_bdApi_viewRenderer = bdApi_Template_Simulation_ViewRenderer::create();
-        }
-
-        return new bdApi_Template_Simulation_View(
-            self::$_bdApi_viewRenderer,
-            self::$_bdApi_viewRenderer->bdApi_getResponse()
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Template/Simulation/ViewRenderer.php b/xenforo/library/bdApi/Template/Simulation/ViewRenderer.php
deleted file mode 100644
index 69feff83..00000000
--- a/xenforo/library/bdApi/Template/Simulation/ViewRenderer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class bdApi_Template_Simulation_ViewRenderer extends XenForo_ViewRenderer_HtmlPublic
-{
-    protected static $_bdApi_dependencies = null;
-    protected static $_bdApi_response = null;
-    protected static $_bdApi_request = null;
-
-    public function bdApi_getResponse()
-    {
-        return $this->_response;
-    }
-
-    public static function create()
-    {
-        if (self::$_bdApi_dependencies === null) {
-            self::$_bdApi_dependencies = new bdApi_Template_Simulation_Dependencies();
-        }
-
-        if (self::$_bdApi_request === null) {
-            self::$_bdApi_request = new Zend_Controller_Request_Http();
-        }
-
-        if (self::$_bdApi_response === null) {
-            self::$_bdApi_response = new Zend_Controller_Response_Http();
-        }
-
-        return new bdApi_Template_Simulation_ViewRenderer(
-            self::$_bdApi_dependencies,
-            self::$_bdApi_response,
-            self::$_bdApi_request
-        );
-    }
-}
diff --git a/xenforo/library/bdApi/Upload.php b/xenforo/library/bdApi/Upload.php
deleted file mode 100644
index 6fbbb995..00000000
--- a/xenforo/library/bdApi/Upload.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-// this is loaded only when $_SERVER['REQUEST_METHOD'] === 'OPTIONS'
-
-/* @var $app XenForo_Application */
-$app = XenForo_Application::getInstance();
-$xenforoUploadPath = $app->getRootDir() . '/library/XenForo/Upload.php';
-$xenforoUploadContents = file_get_contents($xenforoUploadPath);
-
-// remove <?php
-$xenforoUploadContents = substr($xenforoUploadContents, 5);
-
-// rename class
-$xenforoUploadContents = str_replace('class XenForo_Upload', 'class _XenForo_Upload', $xenforoUploadContents);
-
-eval($xenforoUploadContents);
-
-class bdApi_Upload extends _XenForo_Upload
-{
-    public static function getUploadedFiles($formField, array $source = null)
-    {
-        bdApi_Input::bdApi_addFile($formField);
-
-        return parent::getUploadedFiles($formField, $source);
-    }
-}
-
-eval('class XenForo_Upload extends bdApi_Upload {}');
-
-if (false) {
-    class _XenForo_Upload extends XenForo_Upload
-    {
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/AuthCode/List.php b/xenforo/library/bdApi/ViewAdmin/AuthCode/List.php
deleted file mode 100755
index 6547e978..00000000
--- a/xenforo/library/bdApi/ViewAdmin/AuthCode/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_AuthCode_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_auth_code_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/Client/List.php b/xenforo/library/bdApi/ViewAdmin/Client/List.php
deleted file mode 100755
index 999379c1..00000000
--- a/xenforo/library/bdApi/ViewAdmin/Client/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_Client_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_client_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/ClientContent/List.php b/xenforo/library/bdApi/ViewAdmin/ClientContent/List.php
deleted file mode 100755
index 6bcb738c..00000000
--- a/xenforo/library/bdApi/ViewAdmin/ClientContent/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_ClientContent_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_client_content_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/Log/List.php b/xenforo/library/bdApi/ViewAdmin/Log/List.php
deleted file mode 100755
index 77739718..00000000
--- a/xenforo/library/bdApi/ViewAdmin/Log/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_Log_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_log_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/RefreshToken/List.php b/xenforo/library/bdApi/ViewAdmin/RefreshToken/List.php
deleted file mode 100755
index 9fb6a764..00000000
--- a/xenforo/library/bdApi/ViewAdmin/RefreshToken/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_RefreshToken_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_refresh_token_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/Subscription/List.php b/xenforo/library/bdApi/ViewAdmin/Subscription/List.php
deleted file mode 100755
index 139fb211..00000000
--- a/xenforo/library/bdApi/ViewAdmin/Subscription/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_Subscription_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_subscription_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewAdmin/Token/List.php b/xenforo/library/bdApi/ViewAdmin/Token/List.php
deleted file mode 100755
index 4fbd2e19..00000000
--- a/xenforo/library/bdApi/ViewAdmin/Token/List.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewAdmin_Token_List extends XenForo_ViewAdmin_Base
-{
-    public function renderJson()
-    {
-        if (!empty($this->_params['filterView'])) {
-            $this->_templateName = 'bdapi_token_list_items';
-        }
-
-        return null;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Base.php b/xenforo/library/bdApi/ViewApi/Base.php
deleted file mode 100755
index 113b1c5a..00000000
--- a/xenforo/library/bdApi/ViewApi/Base.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Base extends XenForo_View
-{
-
-}
diff --git a/xenforo/library/bdApi/ViewApi/Batch/Index.php b/xenforo/library/bdApi/ViewApi/Batch/Index.php
deleted file mode 100644
index 27ef9492..00000000
--- a/xenforo/library/bdApi/ViewApi/Batch/Index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Batch_Index extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        $this->_params = bdApi_Data_Helper_Batch::prepareViewParams($this->_renderer, $this);
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Helper/Alert.php b/xenforo/library/bdApi/ViewApi/Helper/Alert.php
deleted file mode 100644
index a4425fc3..00000000
--- a/xenforo/library/bdApi/ViewApi/Helper/Alert.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Helper_Alert
-{
-    public static function getTemplates(XenForo_View $view, array $alerts, array $handlers)
-    {
-        $alerts = XenForo_ViewPublic_Helper_Alert::getTemplates($view, $alerts, $handlers);
-
-        foreach ($alerts as $id => $item) {
-            $alerts[$id]['template'] = self::convertUrisToAbsoluteUris($alerts[$id]['template']);
-        }
-
-        return $alerts;
-    }
-
-    public static function convertUrisToAbsoluteUris($html)
-    {
-        $offset = 0;
-        while (true) {
-            if (preg_match('#<a[^>]+href="([^"]+)"#', $html, $matches, PREG_OFFSET_CAPTURE, $offset)) {
-                $href = $matches[1];
-
-                $uri = $href[0];
-                $absoluteUri = XenForo_Link::convertUriToAbsoluteUri($uri, true);
-
-                if ($uri !== $absoluteUri) {
-                    $html = substr_replace($html, $absoluteUri, $href[1], strlen($uri));
-                    $offset = $href[1] + strlen($absoluteUri);
-                } else {
-                    $offset = $href[1] + strlen($uri);
-                }
-            } else {
-                break;
-            }
-        }
-
-        return $html;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Helper/Attachment/Data.php b/xenforo/library/bdApi/ViewApi/Helper/Attachment/Data.php
deleted file mode 100755
index 22f2a48b..00000000
--- a/xenforo/library/bdApi/ViewApi/Helper/Attachment/Data.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Helper_Attachment_Data extends bdApi_ViewApi_Base
-{
-    public function renderRaw()
-    {
-        $attachment = $this->_params['attachment'];
-        $attachmentFile = $this->_params['attachmentFile'];
-        $attachmentFileSize = $attachment['file_size'];
-        $isTempFile = false;
-
-        $extension = XenForo_Helper_File::getFileExtension($attachment['filename']);
-        $imageTypes = array(
-            'gif' => 'image/gif',
-            'jpg' => 'image/jpeg',
-            'jpeg' => 'image/jpeg',
-            'jpe' => 'image/jpeg',
-            'png' => 'image/png'
-        );
-
-        if (in_array($extension, array_keys($imageTypes))) {
-            $this->_response->setHeader('Content-type', $imageTypes[$extension], true);
-            $this->setDownloadFileName($attachment['filename'], true);
-
-            $resize = $this->_params['resize'];
-            switch ($extension) {
-                case 'gif':
-                    $imageType = IMAGETYPE_GIF;
-                    break;
-                case 'jpg':
-                case 'jpeg':
-                case 'jpe':
-                    $imageType = IMAGETYPE_JPEG;
-                    break;
-                case 'png':
-                    $imageType = IMAGETYPE_PNG;
-                    break;
-            }
-
-            if ((!empty($resize['max_width']) OR !empty($resize['max_height'])) AND !empty($imageType)) {
-                // start resizing...
-                $image = XenForo_Image_Abstract::createFromFile($attachmentFile, $imageType);
-                if (empty($image)) {
-                    throw new XenForo_Exception('Unable to read attachment as image');
-                }
-
-                $tempFile = tempnam(XenForo_Helper_File::getTempDir(), 'xf');
-                if (empty($tempFile)) {
-                    throw new XenForo_Exception('Unable to create temp file to resize attachment');
-                }
-
-                if (!empty($resize['keep_ratio'])) {
-                    $image->thumbnail($resize['max_width'], $resize['max_height']);
-                } elseif (!empty($resize['max_width']) AND !empty($resize['max_height'])) {
-                    $image->thumbnailFixedShorterSide(max($resize['max_width'], $resize['max_height']));
-
-                    if ($image->getWidth() >= $resize['max_width'] AND $image->getHeight() >= $resize['max_height']) {
-                        $x = ($image->getWidth() - $resize['max_width']) / 2;
-                        $y = ($image->getHeight() - $resize['max_height']) / 2;
-
-                        /** @noinspection PhpParamsInspection */
-                        $image->crop($x, $y, $resize['max_width'], $resize['max_height']);
-                    }
-                }
-
-                /** @noinspection PhpParamsInspection */
-                $image->output($imageType, $tempFile);
-                $attachmentFile = $tempFile;
-                $attachmentFileSize = filesize($tempFile);
-                $isTempFile = true;
-
-                unset($image);
-            }
-        } else {
-            $this->_response->setHeader('Content-type', 'application/octet-stream', true);
-            $this->setDownloadFileName($attachment['filename']);
-        }
-
-        $this->_response->setHeader('ETag', $attachment['attach_date'], true);
-        $this->_response->setHeader('Content-Length', $attachmentFileSize, true);
-        $this->_response->setHeader('X-Content-Type-Options', 'nosniff');
-
-        if (!empty($this->_params['skipFileOutput'])) {
-            if ($isTempFile) {
-                @unlink($attachmentFile);
-            }
-
-            $this->_response->setHeader('X-SKIP-FILE-OUTPUT', '1');
-            return '';
-        }
-
-        if ($isTempFile) {
-            return new bdApi_Data_TempFileOutput($attachmentFile);
-        } else {
-            return new XenForo_FileOutput($attachmentFile);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Helper/Subscription.php b/xenforo/library/bdApi/ViewApi/Helper/Subscription.php
deleted file mode 100644
index 7323a382..00000000
--- a/xenforo/library/bdApi/ViewApi/Helper/Subscription.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Helper_Subscription
-{
-    public static function prepareDiscoveryParams(
-        array &$params,
-        Zend_Controller_Response_Http $response,
-        $topicType,
-        $topicId,
-        $selfLink,
-        $subscriptionOption
-    ) {
-        if (!bdApi_Option::getSubscription($topicType)) {
-            // subscription for this topic type has been disabled
-            return false;
-        }
-
-        // subscription discovery
-        $hubLink = bdApi_Data_Helper_Core::safeBuildApiLink('subscriptions', null, array(
-            'hub.topic' => bdApi_Model_Subscription::getTopic($topicType, $topicId),
-            'oauth_token' => '',
-        ));
-        $response->setHeader('Link', sprintf('<%s>; rel=hub', $hubLink));
-
-        if (!empty($selfLink)) {
-            $response->setHeader('Link', sprintf('<%s>; rel=self', $selfLink));
-        }
-
-        // subscription info
-        if (!empty($subscriptionOption)) {
-            if (is_string($subscriptionOption)) {
-                $subscriptionOption = @unserialize($subscriptionOption);
-            }
-            if (is_array($subscriptionOption)
-                && !empty($subscriptionOption['subscriptions'])
-            ) {
-                $clientId = bdApi_Data_Helper_Core::safeGetSession()->getOAuthClientId();
-                foreach ($subscriptionOption['subscriptions'] as $subscription) {
-                    if ($subscription['client_id'] == $clientId) {
-                        $params['subscription_callback'] = $subscription['callback'];
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Notification/List.php b/xenforo/library/bdApi/ViewApi/Notification/List.php
deleted file mode 100644
index 5f73b0d9..00000000
--- a/xenforo/library/bdApi/ViewApi/Notification/List.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Notification_List extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        // render notification html
-        $notifications = &$this->_params['notifications'];
-        $templates = bdApi_ViewApi_Helper_Alert::getTemplates(
-            $this,
-            $this->_params['_alerts'],
-            $this->_params['_alertHandlers']
-        );
-        foreach ($notifications as $key => &$notification) {
-            $notification['notification_html'] = $templates[$notification['notification_id']]['template'];
-        }
-
-        bdApi_ViewApi_Helper_Subscription::prepareDiscoveryParams(
-            $this->_params,
-            $this->_response,
-            bdApi_Model_Subscription::TYPE_NOTIFICATION,
-            XenForo_Visitor::getUserId(),
-            bdApi_Data_Helper_Core::safeBuildApiLink('notifications', null, array('oauth_token' => '')),
-            XenForo_Visitor::getInstance()->get(bdApi_Option::getConfig('subscriptionColumnUserNotification'))
-        );
-
-        parent::prepareParams();
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/OAuth.php b/xenforo/library/bdApi/ViewApi/OAuth.php
deleted file mode 100644
index 31f91577..00000000
--- a/xenforo/library/bdApi/ViewApi/OAuth.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class bdApi_ViewApi_OAuth extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        parent::prepareParams();
-
-        if (!empty($this->_params['_statusCode'])) {
-            $this->_response->setHttpResponseCode($this->_params['_statusCode']);
-        }
-
-        if (!empty($this->_params['_headers'])) {
-            foreach ($this->_params['_headers'] as $headerName => $headerValue) {
-                $this->_response->setHeader($headerName, $headerValue);
-            }
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Page/Single.php b/xenforo/library/bdApi/ViewApi/Page/Single.php
deleted file mode 100644
index 5fa3670b..00000000
--- a/xenforo/library/bdApi/ViewApi/Page/Single.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Page_Single extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        if (empty($this->_params['_pageTemplate'])
-            && !empty($this->_params['page'])
-            && !empty($this->_params['_pageTemplateTitle'])
-        ) {
-            $this->_params['page']['page_html'] = $this->createTemplateObject(
-                $this->_params['_pageTemplateTitle'],
-                $this->_params
-            );
-
-            $this->_params['_pageTemplate'] = true;
-        }
-
-        parent::prepareParams();
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Post/List.php b/xenforo/library/bdApi/ViewApi/Post/List.php
deleted file mode 100644
index f7906746..00000000
--- a/xenforo/library/bdApi/ViewApi/Post/List.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Post_List extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        if (!empty($this->_params['_thread']['thread_id'])) {
-            $subColumn = bdApi_Option::getConfig('subscriptionColumnThreadPost');
-
-            bdApi_ViewApi_Helper_Subscription::prepareDiscoveryParams(
-                $this->_params,
-                $this->_response,
-                bdApi_Model_Subscription::TYPE_THREAD_POST,
-                $this->_params['_thread']['thread_id'],
-                bdApi_Data_Helper_Core::safeBuildApiLink('posts', null, array(
-                    'thread_id' => $this->_params['_thread']['thread_id'],
-                    'oauth_token' => '',
-                )),
-                isset($this->_params['_thread'][$subColumn]) ? $this->_params['_thread'][$subColumn] : ''
-            );
-        }
-
-        parent::prepareParams();
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/Subscription/Post.php b/xenforo/library/bdApi/ViewApi/Subscription/Post.php
deleted file mode 100644
index 6d08d337..00000000
--- a/xenforo/library/bdApi/ViewApi/Subscription/Post.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class bdApi_ViewApi_Subscription_Post extends bdApi_ViewApi_Base
-{
-    public function renderRaw()
-    {
-        if (!empty($this->_params['httpResponseCode'])) {
-            $this->_response->setHttpResponseCode($this->_params['httpResponseCode']);
-        }
-
-        if (!empty($this->_params['message'])) {
-            return $this->_params['message'];
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/User/List.php b/xenforo/library/bdApi/ViewApi/User/List.php
deleted file mode 100644
index db4f9425..00000000
--- a/xenforo/library/bdApi/ViewApi/User/List.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class bdApi_ViewApi_User_List extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        if (XenForo_Visitor::getUserId() == 0) {
-            if (!!bdApi_Data_Helper_Core::safeGetSession()->getOAuthClientOption('allow_user_0_subscription')) {
-                bdApi_ViewApi_Helper_Subscription::prepareDiscoveryParams(
-                    $this->_params,
-                    $this->_response,
-                    bdApi_Model_Subscription::TYPE_USER,
-                    0,
-                    '',
-                    XenForo_Application::getSimpleCacheData(bdApi_Model_Subscription::TYPE_USER_0_SIMPLE_CACHE)
-                );
-            }
-        }
-
-        parent::prepareParams();
-    }
-}
diff --git a/xenforo/library/bdApi/ViewApi/User/Single.php b/xenforo/library/bdApi/ViewApi/User/Single.php
deleted file mode 100644
index 46d969c0..00000000
--- a/xenforo/library/bdApi/ViewApi/User/Single.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class bdApi_ViewApi_User_Single extends bdApi_ViewApi_Base
-{
-    public function prepareParams()
-    {
-        if (!empty($this->_params['_user']['user_id'])) {
-            $subColumn = bdApi_Option::getConfig('subscriptionColumnUser');
-
-            bdApi_ViewApi_Helper_Subscription::prepareDiscoveryParams(
-                $this->_params,
-                $this->_response,
-                bdApi_Model_Subscription::TYPE_USER,
-                $this->_params['_user']['user_id'],
-                bdApi_Data_Helper_Core::safeBuildApiLink('users', $this->_params['_user'], array('oauth_token' => '')),
-                isset($this->_params['_user'][$subColumn]) ? $this->_params['_user'][$subColumn] : ''
-            );
-        }
-
-        parent::prepareParams();
-    }
-}
diff --git a/xenforo/library/bdApi/ViewPublic/Account/Api/Index.php b/xenforo/library/bdApi/ViewPublic/Account/Api/Index.php
deleted file mode 100755
index 270e2885..00000000
--- a/xenforo/library/bdApi/ViewPublic/Account/Api/Index.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class bdApi_ViewPublic_Account_Api_Index extends XenForo_ViewPublic_Base
-{
-    public function renderHtml()
-    {
-        if (!empty($this->_params['tokens'])) {
-            foreach ($this->_params['tokens'] as &$token) {
-                $token['_scopes'] = bdApi_Template_Helper_Core::getInstance()->scopeSplit($token['scope']);
-            }
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewPublic/Account/Authorize.php b/xenforo/library/bdApi/ViewPublic/Account/Authorize.php
deleted file mode 100755
index 28ae94bf..00000000
--- a/xenforo/library/bdApi/ViewPublic/Account/Authorize.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class bdApi_ViewPublic_Account_Authorize extends XenForo_ViewPublic_Base
-{
-    public function renderHtml()
-    {
-        $this->_params['authorizeScopes'] = array();
-
-        if (!empty($this->_params['authorizeParams']['scope'])) {
-            $this->_params['authorizeScopes'] =
-                bdApi_Template_Helper_Core::getInstance()->scopeSplit($this->_params['authorizeParams']['scope']);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewPublic/Misc/Api/Data.php b/xenforo/library/bdApi/ViewPublic/Misc/Api/Data.php
deleted file mode 100755
index 5c30b89a..00000000
--- a/xenforo/library/bdApi/ViewPublic/Misc/Api/Data.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class bdApi_ViewPublic_Misc_Api_Data extends XenForo_ViewPublic_Base
-{
-    public function renderRaw()
-    {
-        bdApi_Data_Helper_Cors::addHeaders($this->_renderer, $this->_response);
-
-        if (!empty($this->_params['callback'])) {
-            $this->_response->setHeader('Content-Type', 'application/x-javascript; charset=UTF-8', true);
-            return sprintf('%s(%s);', $this->_params['callback'], json_encode($this->_params['data']));
-        } else {
-            $this->_response->setHeader('Content-Type', 'application/json; charset=UTF-8', true);
-            return json_encode($this->_params['data']);
-        }
-    }
-}
diff --git a/xenforo/library/bdApi/ViewRenderer/Json.php b/xenforo/library/bdApi/ViewRenderer/Json.php
deleted file mode 100755
index 63c4f10d..00000000
--- a/xenforo/library/bdApi/ViewRenderer/Json.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-class bdApi_ViewRenderer_Json extends XenForo_ViewRenderer_Json
-{
-    public function renderError($error)
-    {
-        bdApi_Data_Helper_Cors::addHeaders($this, $this->_response);
-
-        if (!is_array($error)) {
-            $error = array($error);
-        }
-
-        return self::jsonEncodeForOutput(array('errors' => $error));
-    }
-
-    public function renderMessage($message)
-    {
-        bdApi_Data_Helper_Cors::addHeaders($this, $this->_response);
-
-        return self::jsonEncodeForOutput(array(
-            'status' => 'ok',
-            'message' => $message
-        ));
-    }
-
-    public function renderRedirect(
-        $redirectType,
-        $redirectTarget,
-        $redirectMessage = null,
-        array $redirectParams = array()
-    ) {
-        bdApi_Data_Helper_Cors::addHeaders($this, $this->_response);
-
-        switch ($redirectType) {
-            case XenForo_ControllerResponse_Redirect::RESOURCE_CREATED:
-            case XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED:
-            case XenForo_ControllerResponse_Redirect::SUCCESS:
-                $this->_response->setRedirect($redirectTarget, 303);
-                break;
-
-            case XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL:
-                $this->_response->setRedirect($redirectTarget, 307);
-                break;
-
-            case XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT:
-                $this->_response->setRedirect($redirectTarget, 301);
-                break;
-
-            default:
-                throw new XenForo_Exception('Unknown redirect type');
-        }
-
-        $this->_needsContainer = false;
-
-        return '';
-    }
-
-    public function renderView(
-        $viewName,
-        array $params = array(),
-        $templateName = '',
-        XenForo_ControllerResponse_View $subView = null
-    ) {
-        bdApi_Data_Helper_Cors::addHeaders($this, $this->_response);
-        $viewOutput = $this->renderViewObject($viewName, 'Json', $params, $templateName);
-
-        if (is_array($viewOutput)) {
-            return self::jsonEncodeForOutput($viewOutput);
-        } else {
-            if ($viewOutput === null) {
-                return self::jsonEncodeForOutput($this->getDefaultOutputArray($viewName, $params, $templateName));
-            } else {
-                return $viewOutput;
-            }
-        }
-    }
-
-    public function getDefaultOutputArray($viewName, $params, $templateName)
-    {
-        return $params;
-    }
-
-    public static function jsonEncodeForOutput($input, $addDefaultParams = true)
-    {
-        if ($addDefaultParams) {
-            self::_addDefaultParams($input);
-        }
-
-        return XenForo_ViewRenderer_Json::jsonEncodeForOutput($input, false);
-    }
-
-    public function renderViewObject($class, $responseType, array &$params = array(), &$templateName = '')
-    {
-        $return = parent::renderViewObject($class, $responseType, $params, $templateName);
-
-        if ($return === null) {
-            foreach (array_keys($params) as $paramKey) {
-                if (strpos($paramKey, '_') === 0) {
-                    // filter out internal params
-                    unset($params[$paramKey]);
-                }
-            }
-        }
-
-        return $return;
-    }
-
-    protected static function _addDefaultParams(array &$params = array())
-    {
-        bdApi_Data_Helper_Core::addDefaultResponse($params);
-    }
-}
diff --git a/xenforo/library/bdApi/ViewRenderer/Jsonp.php b/xenforo/library/bdApi/ViewRenderer/Jsonp.php
deleted file mode 100755
index 4a06c052..00000000
--- a/xenforo/library/bdApi/ViewRenderer/Jsonp.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class bdApi_ViewRenderer_Jsonp extends bdApi_ViewRenderer_Json
-{
-    public function renderError($error)
-    {
-        $json = parent::renderError($error);
-
-        return self::jsonpForOutput($json);
-    }
-
-    public function renderMessage($message)
-    {
-        $json = parent::renderMessage($message);
-
-        return self::jsonpForOutput($json);
-    }
-
-    public function renderView(
-        $viewName,
-        array $params = array(),
-        $templateName = '',
-        XenForo_ControllerResponse_View $subView = null
-    ) {
-        $json = parent::renderView($viewName, $params, $templateName, $subView);
-
-        return self::jsonpForOutput($json);
-    }
-
-    public function jsonpForOutput($json)
-    {
-        $callback = 'callback';
-        if (isset($_REQUEST['callback'])) {
-            $callback = $_REQUEST['callback'];
-        }
-
-        return sprintf('%s(%s);', $callback, $json);
-    }
-}
diff --git a/xenforo/library/bdApi/ViewRenderer/Xml.php b/xenforo/library/bdApi/ViewRenderer/Xml.php
deleted file mode 100755
index d4c8a82f..00000000
--- a/xenforo/library/bdApi/ViewRenderer/Xml.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-class bdApi_ViewRenderer_Xml extends XenForo_ViewRenderer_Xml
-{
-    public function renderError($error)
-    {
-        $document = new DOMDocument('1.0', 'utf-8');
-        $document->formatOutput = true;
-
-        if (!is_array($error)) {
-            $error = array($error);
-        }
-
-        $errors = array();
-
-        foreach ($error as $errorMessage) {
-            $errors[] = array(
-                '_key' => 'error',
-                '_children' => array(
-                    array(
-                        '_type' => 'cdata',
-                        '_value' => $errorMessage,
-                    )
-                )
-            );
-        }
-
-        return self::xmlEncodeForOutput(array('errors' => $errors));
-    }
-
-    public function renderMessage($message)
-    {
-        return self::xmlEncodeForOutput(array(
-            'response' => array(
-                'status' => 'ok',
-                'message' => $message,
-            )
-        ));
-    }
-
-    public function renderView(
-        $viewName,
-        array $params = array(),
-        $templateName = '',
-        XenForo_ControllerResponse_View $subView = null
-    ) {
-        $viewOutput = $this->renderViewObject($viewName, 'Xml', $params, $templateName);
-
-        if (is_array($viewOutput)) {
-            return self::xmlEncodeForOutput($viewOutput);
-        } else {
-            if ($viewOutput === null) {
-                return self::xmlEncodeForOutput($this->getDefaultOutputArray($viewName, $params, $templateName));
-            } else {
-                return $viewOutput;
-            }
-        }
-    }
-
-    public function getDefaultOutputArray($viewName, $params, $templateName)
-    {
-        return $params;
-    }
-
-    protected static function _xmlEncodeNode(DOMDocument $document, DOMElement $parentNode, array $input)
-    {
-        foreach ($input as $key => $value) {
-            $children = false;
-
-            $nodeKey = $key;
-            if (is_numeric($nodeKey)) {
-                // numeric key is not accepted
-                // so we have to process it further
-                $parentNodeKey = $parentNode->tagName;
-                if (substr($parentNodeKey, -1) == 's' AND preg_match('/^[a-z]+$/', $parentNodeKey)) {
-                    // try to guess a good key using parent key
-                    $nodeKey = substr($parentNodeKey, 0, -1);
-                } else {
-                    // unable to guess it, use a generic key...
-                    $nodeKey = 'key_' . $key;
-                }
-            }
-
-            $nodeValue = $value;
-
-            if (is_object($value)) {
-                // force the object to string
-                // and use it as a value with a type of CData
-                $value = array(
-                    $key => array(
-                        '_type' => 'cdata',
-                        '_value' => '' . $value,
-                    )
-                );
-            }
-
-            if (is_array($value)) {
-                // this value contains many other values
-                // so it should be a parent
-                $children = $value;
-
-                // a custom key can be specified with numeric-based array
-                if (!empty($value['_key'])) {
-                    $nodeKey = $value['_key'];
-                }
-
-                // normally, children will be detected as all the elements
-                // of a array. However, a specific set of children can be
-                // specified using _children like this. Refer renderError()
-                // to understand how to use this
-                if (!empty($value['_children'])) {
-                    $children = $value['_children'];
-                }
-
-                // an array can still be recognized as a single value
-                // if it has _value like below.
-                if (!empty($value['_value'])) {
-                    $children = false;
-                    $nodeValue = $value['_value'];
-                }
-            }
-
-            if (is_array($children)) {
-                $nodeObj = $document->createElement($nodeKey);
-
-                // recursively process children elements
-                self::_xmlEncodeNode($document, $nodeObj, $children);
-
-                $parentNode->appendChild($nodeObj);
-            } else {
-                $nodeType = 'value';
-
-                // there are several type of value, it can be specified
-                // using _type. Supported types:
-                // cdata
-                if (is_array($value) AND !empty($value['_type'])) {
-                    $nodeType = strtolower($value['_type']);
-                }
-
-                switch ($nodeType) {
-                    case 'cdata':
-                        $parentNode->appendChild($document->createCDATASection($nodeValue));
-                        break;
-                    default:
-                        $parentNode->appendChild($document->createElement($nodeKey, htmlentities($nodeValue)));
-                        break;
-                }
-            }
-        }
-    }
-
-    public static function xmlEncodeForOutput($input, $addDefaultParams = true)
-    {
-        if ($addDefaultParams) {
-            self::_addDefaultParams($input);
-        }
-
-        $document = new DOMDocument('1.0', 'utf-8');
-        $document->formatOutput = true;
-
-        $rootNode = $document->createElement('xenforo');
-
-        self::_xmlEncodeNode($document, $rootNode, $input);
-
-        $document->appendChild($rootNode);
-
-        return $document->saveXML();
-    }
-
-    protected static function _addDefaultParams(array &$params = array())
-    {
-        bdApi_Data_Helper_Core::addDefaultResponse($params);
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Account.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Account.php
deleted file mode 100755
index 523e30ba..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Account.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Account extends XFCP_bdApi_XenForo_ControllerPublic_Account
-{
-    public function actionApi()
-    {
-        $visitor = XenForo_Visitor::getInstance();
-
-        /* @var $tokenModel bdApi_Model_Token */
-        $tokenModel = $this->getModelFromCache('bdApi_Model_Token');
-        /* @var $userScopeModel bdApi_Model_UserScope */
-        $userScopeModel = $this->getModelFromCache('bdApi_Model_UserScope');
-
-        $clients = $this->_bdApi_getClientModel()->getClients(
-            array('user_id' => XenForo_Visitor::getUserId()),
-            array()
-        );
-        $tokens = $tokenModel->getTokens(array('user_id' => XenForo_Visitor::getUserId()));
-        $userScopes = $userScopeModel->getUserScopesForAllClients(XenForo_Visitor::getUserId());
-
-        $userScopesByClientIds = array();
-        foreach ($userScopes as $userScope) {
-            if (!isset($userScopesByClientIds[$userScope['client_id']])) {
-                $userScopesByClientIds[$userScope['client_id']] = array(
-                    'last_issue_date' => 0,
-                    'user_scopes' => array(),
-                    'client' => $userScope,
-                );
-            }
-
-            $userScopesByClientIds[$userScope['client_id']]['last_issue_date'] = max(
-                $userScopesByClientIds[$userScope['client_id']]['last_issue_date'],
-                $userScope['accept_date']
-            );
-            $userScopesByClientIds[$userScope['client_id']]['user_scopes'][$userScope['scope']] = $userScope;
-        }
-
-        foreach ($tokens as $token) {
-            if (empty($userScopesByClientIds[$token['client_id']])) {
-                continue;
-            }
-
-            $userScopesByClientIds[$token['client_id']]['last_issue_date'] = max(
-                $userScopesByClientIds[$token['client_id']]['last_issue_date'],
-                $token['issue_date']
-            );
-        }
-
-        $viewParams = array(
-            'clients' => $clients,
-            'userScopesByClientIds' => $userScopesByClientIds,
-
-            'permClientNew' => $visitor->hasPermission('general', 'bdApi_clientNew'),
-        );
-
-        return $this->_getWrapper(
-            'account',
-            'api',
-            $this->responseView('bdApi_ViewPublic_Account_Api_Index', 'bdapi_account_api', $viewParams)
-        );
-    }
-
-    public function actionApiClientAdd()
-    {
-        $visitor = XenForo_Visitor::getInstance();
-        if (!$visitor->hasPermission('general', 'bdApi_clientNew')) {
-            return $this->responseNoPermission();
-        }
-
-        $viewParams = array(
-            'client' => array(),
-        );
-
-        return $this->_getWrapper(
-            'account',
-            'api',
-            $this->responseView(
-                'bdApi_ViewPublic_Account_Api_Client_Edit',
-                'bdapi_account_api_client_edit',
-                $viewParams
-            )
-        );
-    }
-
-    public function actionApiClientEdit()
-    {
-        $client = $this->_bdApi_getClientOrError();
-
-        $viewParams = array(
-            'client' => $client,
-        );
-
-        return $this->_getWrapper(
-            'account',
-            'api',
-            $this->responseView(
-                'bdApi_ViewPublic_Account_Api_Client_Edit',
-                'bdapi_account_api_client_edit',
-                $viewParams
-            )
-        );
-    }
-
-    public function actionApiClientSave()
-    {
-        $this->_assertPostOnly();
-
-        $client = null;
-        $options = array();
-        try {
-            $client = $this->_bdApi_getClientOrError();
-            $options = $client['options'];
-        } catch (Exception $e) {
-            // ignore
-        }
-
-        $dwInput = $this->_input->filter(array(
-            'name' => XenForo_Input::STRING,
-            'description' => XenForo_Input::STRING,
-            'redirect_uri' => XenForo_Input::STRING,
-        ));
-
-        $optionsInput = new XenForo_Input($this->_input->filterSingle('options', XenForo_Input::ARRAY_SIMPLE));
-        $newOptions = array_merge($options, $optionsInput->filter(array(
-            'whitelisted_domains' => XenForo_Input::STRING,
-            'public_key' => XenForo_Input::STRING,
-        )));
-
-        $dw = XenForo_DataWriter::create('bdApi_DataWriter_Client');
-        if (!empty($client)) {
-            $dw->setExistingData($client, true);
-        } else {
-            $dw->set('client_id', $this->_bdApi_getClientModel()->generateClientId());
-            $dw->set('client_secret', $this->_bdApi_getClientModel()->generateClientSecret());
-            $dw->set('user_id', XenForo_Visitor::getUserId());
-        }
-
-        $dw->bulkSet($dwInput);
-        $dw->set('options', $newOptions);
-
-        $dw->save();
-
-        return $this->responseRedirect(
-            XenForo_ControllerResponse_Redirect::RESOURCE_CREATED,
-            XenForo_Link::buildPublicLink('account/api')
-        );
-    }
-
-    public function actionApiClientDelete()
-    {
-        $client = $this->_bdApi_getClientOrError();
-
-        if ($this->_request->isPost()) {
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_Client');
-            $dw->setExistingData($client, true);
-            $dw->delete();
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED,
-                XenForo_Link::buildPublicLink('account/api')
-            );
-        } else {
-            $viewParams = array('client' => $client);
-
-            return $this->_getWrapper(
-                'account',
-                'api',
-                $this->responseView(
-                    'bdApi_ViewPublic_Account_Api_Client_Delete',
-                    'bdapi_account_api_client_delete',
-                    $viewParams
-                )
-            );
-        }
-    }
-
-    public function actionApiClientGenkey()
-    {
-        $client = $this->_bdApi_getClientOrError();
-
-        $viewParams = array('client' => $client);
-
-        if ($this->_request->isPost()) {
-            /** @var bdApi_Model_OAuth2 $oauth2Model */
-            $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-            list($privKey, $pubKey) = $oauth2Model->generateKeyPair();
-
-            /** @var bdApi_DataWriter_Client $dw */
-            $dw = XenForo_DataWriter::create('bdApi_DataWriter_Client');
-            $dw->setExistingData($client, true);
-            $dw->set('options', array_merge($client['options'], array('public_key' => $pubKey)));
-            $dw->save();
-
-            $viewParams['privKey'] = $privKey;
-            $viewParams['pubKey'] = $pubKey;
-
-            return $this->_getWrapper(
-                'account',
-                'api',
-                $this->responseView(
-                    'bdApi_ViewPublic_Account_Api_Client_GenkeyResult',
-                    'bdapi_account_api_client_genkey_result',
-                    $viewParams
-                )
-            );
-        } else {
-            return $this->_getWrapper(
-                'account',
-                'api',
-                $this->responseView(
-                    'bdApi_ViewPublic_Account_Api_Client_Genkey',
-                    'bdapi_account_api_client_genkey',
-                    $viewParams
-                )
-            );
-        }
-    }
-
-    public function actionApiUpdateScope()
-    {
-        $visitor = XenForo_Visitor::getInstance();
-
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        $client = $this->_bdApi_getClientOrError(false);
-
-        $userScopes = $oauth2Model->getUserScopeModel()->getUserScopes($client['client_id'], $visitor['user_id']);
-        if (empty($userScopes)) {
-            return $this->responseNoPermission();
-        }
-
-        if ($this->isConfirmedPost()) {
-            $isRevoke = $this->_input->filterSingle('revoke', XenForo_Input::STRING);
-            $isRevoke = !empty($isRevoke);
-
-            XenForo_Db::beginTransaction();
-
-            try {
-                $scopes = $this->_input->filterSingle('scopes', XenForo_Input::STRING, array('array' => true));
-                if (empty($scopes)) {
-                    // no scopes are selected, that equals revoking
-                    $isRevoke = true;
-                }
-                $userScopesChanged = false;
-
-                foreach ($userScopes as $userScope) {
-                    if ($isRevoke OR !in_array($userScope['scope'], $scopes, true)) {
-                        // remove the accepted user scope
-                        $oauth2Model->getUserScopeModel()->deleteUserScope(
-                            $client['client_id'],
-                            $visitor['user_id'],
-                            $userScope['scope']
-                        );
-                        $userScopesChanged = true;
-                    }
-                }
-
-                if ($userScopesChanged) {
-                    // invalidate all existing tokens
-                    $oauth2Model->getAuthCodeModel()->deleteAuthCodes($client['client_id'], $visitor['user_id']);
-                    $oauth2Model->getRefreshTokenModel()->deleteRefreshTokens(
-                        $client['client_id'],
-                        $visitor['user_id']
-                    );
-                    $oauth2Model->getTokenModel()->deleteTokens($client['client_id'], $visitor['user_id']);
-                }
-
-                if ($isRevoke) {
-                    // unsubscribe for user and notification
-                    $oauth2Model->getSubscriptionModel()->deleteSubscriptions(
-                        $client['client_id'],
-                        bdApi_Model_Subscription::TYPE_USER,
-                        $visitor['user_id']
-                    );
-                    $oauth2Model->getSubscriptionModel()->deleteSubscriptions(
-                        $client['client_id'],
-                        bdApi_Model_Subscription::TYPE_NOTIFICATION,
-                        $visitor['user_id']
-                    );
-
-                    // remove external authentication
-                    /* @var $userExternalModel XenForo_Model_UserExternal */
-                    $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-                    $userExternalModel->deleteExternalAuthAssociationForUser(
-                        'api_' . $client['client_id'],
-                        $visitor['user_id']
-                    );
-                }
-
-                XenForo_Db::commit();
-            } catch (Exception $e) {
-                XenForo_Db::rollback();
-                throw $e;
-            }
-
-            return $this->responseRedirect(
-                XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED,
-                XenForo_Link::buildPublicLink('account/api')
-            );
-        } else {
-            $viewParams = array(
-                'client' => $client,
-                'userScopes' => $userScopes,
-            );
-
-            return $this->_getWrapper(
-                'account',
-                'api',
-                $this->responseView(
-                    'bdApi_ViewPublic_Account_Api_UpdateScope',
-                    'bdapi_account_api_update_scope',
-                    $viewParams
-                )
-            );
-        }
-    }
-
-    public function actionAuthorize()
-    {
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        $authorizeParams = $this->_input->filter($oauth2Model->getAuthorizeParamsInputFilter());
-
-        if ($this->_request->isPost()) {
-            // allow user to deny some certain scopes
-            // only when this is a POST request, this should keep us safe from some vectors
-            // of attack
-            $scopesIncluded = $this->_input->filterSingle('scopes_included', XenForo_Input::UINT);
-            $scopes = $this->_input->filterSingle('scopes', XenForo_Input::ARRAY_SIMPLE);
-            if (!empty($scopesIncluded)) {
-                $authorizeParams['scope'] = bdApi_Template_Helper_Core::getInstance()->scopeJoin($scopes);
-            }
-        }
-
-        $client = null;
-        $clientIsAuto = false;
-        if (empty($authorizeParams['client_id'])) {
-            // try to get the first client of user if available
-            $visitorClients = $this->_bdApi_getClientModel()->getClients(array(
-                'user_id' => XenForo_Visitor::getUserId()
-            ), array(
-                'limit' => 1,
-            ));
-            if (!empty($visitorClients)) {
-                $randClientId = array_rand($visitorClients, 1);
-                $client = $visitorClients[$randClientId];
-                $clientIsAuto = true;
-                $authorizeParams['client_id'] = $client['client_id'];
-
-                // auto assign at least the READ scope
-                if (empty($authorizeParams['scope'])) {
-                    $authorizeParams['scope'] = bdApi_Model_OAuth2::SCOPE_READ;
-                }
-
-                // reset the redirect uri to prevent security issue
-                $authorizeParams['redirect_uri'] = '';
-
-                // force to use implicit authentication flow2
-                $authorizeParams['response_type'] = 'token';
-            }
-        } else {
-            $client = $oauth2Model->getClientModel()->getClientById($authorizeParams['client_id']);
-        }
-
-        if (empty($client)) {
-            if (XenForo_Visitor::getInstance()->hasPermission('general', 'bdApi_clientNew')) {
-                return $this->responseError(new XenForo_Phrase(
-                    'bdapi_authorize_no_client_create_one_question',
-                    array('link' => XenForo_Link::buildPublicLink('account/api/client-add'))
-                ), 404);
-            }
-
-            return $this->responseError(new XenForo_Phrase(
-                'bdapi_authorize_error_client_x_not_found',
-                array('client' => $authorizeParams['client_id'])
-            ), 404);
-        }
-
-        // sondh@2013-03-19
-        // this is a non-standard implementation: bypass confirmation dialog if the
-        // client has appropriate option set
-        $bypassConfirmation = false;
-        if ($oauth2Model->getClientModel()->canAutoAuthorize($client, $authorizeParams['scope'])) {
-            $bypassConfirmation = true;
-        }
-
-        // sondh@2015-09-28
-        // bypass confirmation if user logged in to authorize
-        // this is secured by checking our encrypted time-expiring hash
-        $hashInput = $this->_input->filter(array(
-            'hash' => XenForo_Input::STRING,
-            'timestamp' => XenForo_Input::UINT,
-        ));
-        if (!empty($hashInput['hash'])
-            && !empty($hashInput['timestamp'])
-        ) {
-            try {
-                if (bdApi_Crypt::decryptTypeOne($hashInput['hash'], $hashInput['timestamp'])) {
-                    $bypassConfirmation = true;
-                }
-            } catch (XenForo_Exception $e) {
-                if (XenForo_Application::debugMode()) {
-                    $this->_response->setHeader('X-Api-Exception', $e->getMessage());
-                }
-            }
-        }
-
-        // sondh@2014-09-26
-        // bypass confirmation if all requested scopes have been granted at some point
-        // in old version of this add-on, it checked for scope from active tokens
-        // from now on, we look for all scopes (no expiration) for better user experience
-        // if a token expires, it should not invalidate all user's choices
-        $userScopes = $oauth2Model->getUserScopeModel()->getUserScopes(
-            $client['client_id'],
-            XenForo_Visitor::getUserId()
-        );
-        $paramScopes = bdApi_Template_Helper_Core::getInstance()->scopeSplit($authorizeParams['scope']);
-        $paramScopesNew = array();
-        foreach ($paramScopes as $paramScope) {
-            if (!isset($userScopes[$paramScope])) {
-                $paramScopesNew[] = $paramScope;
-            }
-        }
-        if (empty($paramScopesNew)) {
-            $bypassConfirmation = true;
-        } else {
-            $authorizeParams['scope'] = bdApi_Template_Helper_Core::getInstance()->scopeJoin($paramScopesNew);
-        }
-
-        // sondh@2015-09-28
-        // disable bypassing confirmation for testing purpose
-        if ($clientIsAuto) {
-            $bypassConfirmation = false;
-        }
-
-        $response = $oauth2Model->getServer()->actionOauthAuthorize1($this, $authorizeParams);
-        if (is_object($response) && $response instanceof XenForo_ControllerResponse_Abstract) {
-            return $response;
-        }
-
-        if ($this->_request->isPost() || $bypassConfirmation) {
-            $accept = $this->_input->filterSingle('accept', XenForo_Input::STRING);
-            $accepted = !!$accept;
-
-            if ($bypassConfirmation) {
-                // sondh@2013-03-19
-                // of course if the dialog was bypassed, $accepted should be true
-                $accepted = true;
-            }
-
-            if ($accepted) {
-                // sondh@2014-09-26
-                // get all up to date user scopes and include in the new token
-                // that means client only need to ask for a scope once and they will always have
-                // that scope in future authorizations, even if they ask for less scope!
-                // making it easy for client dev, they don't need to track whether they requested
-                // a scope before. Just check the most recent token for that information.
-                $paramScopes = bdApi_Template_Helper_Core::getInstance()->scopeSplit($authorizeParams['scope']);
-                foreach ($userScopes as $userScope => $userScopeInfo) {
-                    if (!in_array($userScope, $paramScopes, true)) {
-                        $paramScopes[] = $userScope;
-                    }
-                }
-                $paramScopes = array_unique($paramScopes);
-                asort($paramScopes);
-                $authorizeParams['scope'] = bdApi_Template_Helper_Core::getInstance()->scopeJoin($paramScopes);
-            }
-
-            return $oauth2Model->getServer()->actionOauthAuthorize2(
-                $this,
-                $authorizeParams,
-                $accepted,
-                XenForo_Visitor::getUserId()
-            );
-        } else {
-            $viewParams = array(
-                'client' => $client,
-                'authorizeParams' => $authorizeParams,
-                'clientIsAuto' => $clientIsAuto,
-            );
-
-            return $this->_getWrapper(
-                'account',
-                'api',
-                $this->responseView('bdApi_ViewPublic_Account_Authorize', 'bdapi_account_authorize', $viewParams)
-            );
-        }
-    }
-
-    public function actionApiData()
-    {
-        return $this->responseReroute('XenForo_ControllerPublic_Misc', 'api-data');
-    }
-
-    protected function _preDispatch($action)
-    {
-        try {
-            parent::_preDispatch($action);
-        } catch (XenForo_ControllerResponse_Exception $e) {
-            if ($action === 'Authorize') {
-                // this is our action and an exception is thrown
-                // check to see if it is a registrationRequired error
-                $controllerResponse = $e->getControllerResponse();
-                if ($controllerResponse instanceof XenForo_ControllerResponse_Reroute
-                    && $controllerResponse->controllerName == 'XenForo_ControllerPublic_Error'
-                    && $controllerResponse->action == 'registrationRequired'
-                ) {
-                    // so it is...
-                    $requestPaths = XenForo_Application::get('requestPaths');
-                    $session = XenForo_Application::getSession();
-                    $session->set('bdApi_authorizePending', $requestPaths['fullUri']);
-
-                    $controllerResponse->action = 'authorizeGuest';
-                }
-            }
-
-            throw $e;
-        }
-    }
-
-    protected function _bdApi_getClientOrError($verifyCanEdit = true)
-    {
-        $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        if (empty($clientId)) {
-            throw $this->getNoPermissionResponseException();
-        }
-
-        $client = $this->_bdApi_getClientModel()->getClientById($clientId);
-        if (empty($client)) {
-            throw $this->getNoPermissionResponseException();
-        }
-
-        if ($verifyCanEdit AND $client['user_id'] != XenForo_Visitor::getUserId()) {
-            throw $this->getNoPermissionResponseException();
-        }
-
-        return $client;
-    }
-
-    /**
-     * @return bdApi_Model_Client
-     */
-    protected function _bdApi_getClientModel()
-    {
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
-        return $this->getModelFromCache('bdApi_Model_Client');
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Error.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Error.php
deleted file mode 100755
index bcd84067..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Error.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Error extends XFCP_bdApi_XenForo_ControllerPublic_Error
-{
-    public function actionAuthorizeGuest()
-    {
-        $requestPaths = XenForo_Application::get('requestPaths');
-        $social = $this->_input->filterSingle('social', XenForo_Input::STRING);
-        switch ($social) {
-            case 'facebook':
-                $facebookLink = XenForo_Link::buildPublicLink('full:register/facebook', null, array(
-                    'reg' => 1,
-                    'redirect' => $requestPaths['fullUri'],
-                ));
-                return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $facebookLink);
-            case 'twitter':
-                $twitterLink = XenForo_Link::buildPublicLink('full:register/twitter', null, array(
-                    'reg' => 1,
-                    'redirect' => $requestPaths['fullUri'],
-                ));
-                return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $twitterLink);
-        }
-
-        /* @var $oauth2Model bdApi_Model_OAuth2 */
-        $oauth2Model = $this->getModelFromCache('bdApi_Model_OAuth2');
-
-        /* @var $clientModel bdApi_Model_Client */
-        $clientModel = $oauth2Model->getClientModel();
-
-        $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        $client = $clientModel->getClientById($clientId);
-        if (empty($client)) {
-            return $this->responseError(new XenForo_Phrase(
-                'bdapi_authorize_error_client_x_not_found',
-                array('client' => $clientId)
-            ), 404);
-        }
-
-        $authorizeParams = $this->_input->filter($oauth2Model->getAuthorizeParamsInputFilter());
-        $redirectParams = $authorizeParams;
-        $redirectParams['timestamp'] = time() + bdApi_Option::get('authorizeBypassSecs');
-        $redirectParams['hash'] = bdApi_Crypt::encryptTypeOne(
-            serialize($authorizeParams),
-            $redirectParams['timestamp']
-        );
-        $redirect = XenForo_Link::buildPublicLink('account/authorize', null, $redirectParams);
-
-        $viewParams = array(
-            'client' => $client,
-            'authorizeParams' => $authorizeParams,
-
-            'social' => $social,
-            'redirect' => $redirect,
-        );
-
-        $view = $this->responseView('bdApi_ViewPublic_Account_Authorize', 'bdapi_error_authorize_guest', $viewParams);
-        $view->responseCode = 403;
-
-        return $view;
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Login.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Login.php
deleted file mode 100644
index 1a0b86db..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Login.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Login extends XFCP_bdApi_XenForo_ControllerPublic_Login
-{
-    public function actionApi()
-    {
-        $input = $this->_input->filter(array(
-            'redirect' => XenForo_Input::STRING,
-            'timestamp' => XenForo_Input::UINT,
-            'user_id' => XenForo_Input::STRING,
-        ));
-
-        $userId = 0;
-        if (!empty($input['user_id'])
-            && !empty($input['timestamp'])
-        ) {
-            try {
-                $userId = intval(bdApi_Crypt::decryptTypeOne($input['user_id'], $input['timestamp']));
-            } catch (XenForo_Exception $e) {
-                if (XenForo_Application::debugMode()) {
-                    $this->_response->setHeader('X-Api-Exception', $e->getMessage());
-                }
-            }
-        }
-
-        if ($userId > 0) {
-            $this->_response->setHeader('X-Api-Login-User', $userId);
-
-            $this->_getUserModel()->setUserRememberCookie($userId);
-
-            XenForo_Model_Ip::log($userId, 'user', $userId, 'login_api');
-
-            $this->_getUserModel()->deleteSessionActivity(0, $this->_request->getClientIp(false));
-            $session = XenForo_Application::get('session');
-            $session->changeUserId($userId);
-            XenForo_Visitor::setup($userId);
-        }
-
-        if (empty($input['redirect'])) {
-            $input['redirect'] = $this->getDynamicRedirectIfNot(XenForo_Link::buildPublicLink('login'));
-        }
-        return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $input['redirect']);
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Logout.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Logout.php
deleted file mode 100644
index 3ae261c4..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Logout.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Logout extends XFCP_bdApi_XenForo_ControllerPublic_Logout
-{
-    protected $_bdApi_redirect = null;
-
-    public function actionIndex()
-    {
-        $userId = XenForo_Visitor::getUserId();
-
-        $response = parent::actionIndex();
-
-        if ($this->_bdApi_redirect !== null
-            && $response instanceof XenForo_ControllerResponse_Redirect
-            && $response->redirectTarget === $this->_bdApi_redirect
-        ) {
-            $this->_response->setHeader('X-Api-Logout-User', $userId);
-        }
-
-        return $response;
-    }
-
-
-    public function getDynamicRedirect($fallbackUrl = false, $useReferrer = true)
-    {
-        $input = $this->_input->filter(array(
-            'redirect' => XenForo_Input::STRING,
-            'timestamp' => XenForo_Input::UINT,
-            'md5' => XenForo_Input::STRING,
-        ));
-
-        if (!empty($input['md5'])
-            && !empty($input['timestamp'])
-            && !empty($input['redirect'])
-        ) {
-            $md5 = '';
-            try {
-                $md5 = bdApi_Crypt::decryptTypeOne($input['md5'], $input['timestamp']);
-            } catch (XenForo_Exception $e) {
-                if (XenForo_Application::debugMode()) {
-                    $this->_response->setHeader('X-Api-Exception', $e->getMessage());
-                }
-            }
-
-            if (!empty($md5)
-                && $md5 === md5($input['redirect'])
-            ) {
-                $this->_bdApi_redirect = $input['redirect'];
-                return $input['redirect'];
-            }
-        }
-
-        return parent::getDynamicRedirect($fallbackUrl, $useReferrer);
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Misc.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Misc.php
deleted file mode 100644
index 21489719..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Misc.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Misc extends XFCP_bdApi_XenForo_ControllerPublic_Misc
-{
-    public function actionApiData()
-    {
-        /* @var $clientModel bdApi_Model_Client */
-        $clientModel = $this->getModelFromCache('bdApi_Model_Client');
-        /* @var $userScopeModel bdApi_Model_UserScope */
-        $userScopeModel = $this->getModelFromCache('bdApi_Model_UserScope');
-
-        $callback = $this->_input->filterSingle('callback', XenForo_Input::STRING);
-        $cmd = $this->_input->filterSingle('cmd', XenForo_Input::STRING);
-        $clientId = $this->_input->filterSingle('client_id', XenForo_Input::STRING);
-        $data = array();
-        $data[$cmd] = 0;
-
-        $client = $clientModel->getClientById($clientId);
-        $visitorObj = XenForo_Visitor::getInstance();
-        $visitorArray = $visitorObj->toArray();
-
-        if (!empty($client) AND $visitorArray['user_id'] > 0) {
-            switch ($cmd) {
-                case 'authorized':
-                    $scope = $this->_input->filterSingle('scope', XenForo_Input::STRING);
-                    $requestedScopes = bdApi_Template_Helper_Core::getInstance()->scopeSplit($scope);
-                    if (empty($requestedScopes)) {
-                        // no scope requested, check for scope `read`
-                        $requestedScopes[] = bdApi_Model_OAuth2::SCOPE_READ;
-                    }
-                    $requestedScopesAccepted = array();
-
-                    if ($data[$cmd] === 0 AND $clientModel->canAutoAuthorize($client, $scope)) {
-                        // this client has auto authorize setting for the requested scope
-                        // response with authorized = 1
-                        // note: we don't have (and don't need) an access token for now
-                        // but in case the client application request authorization, it
-                        // will be granted automatically anyway
-                        $requestedScopesAccepted = $requestedScopes;
-                        $data[$cmd] = 1;
-                    }
-
-                    if ($data[$cmd] === 0) {
-                        // start looking for accepted scopes
-                        $userScopes = $userScopeModel->getUserScopes($client['client_id'], $visitorArray['user_id']);
-
-                        foreach ($requestedScopes as $scope) {
-                            foreach ($userScopes as $userScope) {
-                                if ($userScope['scope'] === $scope) {
-                                    $requestedScopesAccepted[] = $scope;
-                                }
-                            }
-                        }
-
-                        if (count($requestedScopes) === count($requestedScopesAccepted)) {
-                            $data[$cmd] = 1;
-                        }
-                    }
-
-                    if ($data[$cmd] === 1) {
-                        if (!empty($scope)) {
-                            // some actual scopes were requested, return user data according to those scopes
-                            $session = new bdApi_Session();
-                            $session->fakeStart($client, $visitorObj, $requestedScopesAccepted);
-
-                            $visitorPrepared = bdApi_Data_Helper_Core::filter(
-                                $visitorArray,
-                                $this->_getFilterPublicKeysForVisitorData()
-                            );
-                            $data = array_merge($visitorPrepared, $data);
-                        } else {
-                            // just checking for connection status, return user_id only
-                            $data['user_id'] = $visitorArray['user_id'];
-                        }
-                    }
-
-                    // switch ($cmd)
-                    break;
-            }
-        }
-
-        $clientModel->signApiData($client, $data);
-
-        $viewParams = array(
-            'callback' => $callback,
-            'cmd' => $cmd,
-            'client_id' => $clientId,
-            'data' => $data,
-        );
-
-        $this->_routeMatch->setResponseType('raw');
-
-        return $this->responseView('bdApi_ViewPublic_Misc_Api_Data', '', $viewParams);
-    }
-
-    protected function _getFilterPublicKeysForVisitorData()
-    {
-        return array(
-            'user_id' => 'user_id',
-            'username' => 'username',
-            'alerts_unread' => 'user_unread_notification_count',
-            'conversations_unread' => 'user_unread_conversation_count',
-        );
-    }
-
-    protected function _checkCsrf($action)
-    {
-        if ($action === 'ApiData') {
-            return;
-        }
-
-        parent::_checkCsrf($action);
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/ControllerPublic/Register.php b/xenforo/library/bdApi/XenForo/ControllerPublic/Register.php
deleted file mode 100755
index 1adf36cb..00000000
--- a/xenforo/library/bdApi/XenForo/ControllerPublic/Register.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-class bdApi_XenForo_ControllerPublic_Register_Base extends XFCP_bdApi_XenForo_ControllerPublic_Register
-{
-    private $_authorizePending = false;
-
-    public function actionFacebook()
-    {
-        // trying to workaround this bug http://xenforo.com/community/threads/71307/
-        $redirect = XenForo_Application::getSession()->get('fbRedirect');
-        if (empty($redirect)) {
-            // since 1.3.0 Gold
-            $redirect = XenForo_Application::getSession()->get('loginRedirect');
-        }
-
-        $response = parent::actionFacebook();
-
-        if (XenForo_Application::$versionId <= 1030070 AND $response instanceof XenForo_ControllerResponse_Redirect) {
-            if ($response->redirectType == XenForo_ControllerResponse_Redirect::SUCCESS AND !empty($redirect)) {
-                $response->redirectTarget = $redirect;
-            }
-        }
-
-        return $response;
-    }
-
-    protected function _preDispatch($action)
-    {
-        $session = XenForo_Application::getSession();
-        $this->_authorizePending = $session->get('bdApi_authorizePending');
-
-        parent::_preDispatch($action);
-    }
-
-    protected function _bdApi_responseView($viewName, $templateName, array $params, array $containerParams)
-    {
-        if ($viewName == 'XenForo_ViewPublic_Register_Process' AND $templateName == 'register_process') {
-            // this means registration succeeded
-            // built-in or Facebook (or even our own [bd] API Consumer)
-            if (!empty($this->_authorizePending)) {
-                // but we have an authorize request pending...
-                // redirect to that instead
-                // TODO: drop the usage of Xenforo_Controller::responseRedirect? A bit dangerous
-                return $this->responseRedirect(
-                    XenForo_ControllerResponse_Redirect::RESOURCE_CREATED,
-                    $this->_authorizePending
-                );
-            }
-        }
-
-        return parent::responseView($viewName, $templateName, $params, $containerParams);
-    }
-}
-
-if (XenForo_Application::$versionId >= 1020000) {
-    class bdApi_XenForo_ControllerPublic_Register extends bdApi_XenForo_ControllerPublic_Register_Base
-    {
-        public function responseView(
-            $viewName = '',
-            $templateName = '',
-            array $params = array(),
-            array $containerParams = array()
-        ) {
-            return $this->_bdApi_responseView($viewName, $templateName, $params, $containerParams);
-        }
-    }
-
-} else {
-    class bdApi_XenForo_ControllerPublic_Register extends bdApi_XenForo_ControllerPublic_Register_Base
-    {
-        public function responseView(
-            $viewName,
-            $templateName = 'DEFAULT',
-            array $params = array(),
-            array $containerParams = array()
-        ) {
-            return $this->_bdApi_responseView($viewName, $templateName, $params, $containerParams);
-        }
-    }
-
-}
diff --git a/xenforo/library/bdApi/XenForo/DataWriter/Alert.php b/xenforo/library/bdApi/XenForo/DataWriter/Alert.php
deleted file mode 100644
index 0bc22be8..00000000
--- a/xenforo/library/bdApi/XenForo/DataWriter/Alert.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class bdApi_XenForo_DataWriter_Alert extends XFCP_bdApi_XenForo_DataWriter_Alert
-{
-    protected function _postSave()
-    {
-        if ($this->isInsert()
-            && bdApi_Option::getSubscription(bdApi_Model_Subscription::TYPE_NOTIFICATION)
-        ) {
-            /* @var $subscriptionModel bdApi_Model_Subscription */
-            $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-            $alertedUserId = $this->get('alerted_user_id');
-
-            if ($alertedUserId > 0) {
-                /* @var $alertModel bdApi_XenForo_Model_Alert */
-                $alertModel = $this->getModelFromCache('XenForo_Model_Alert');
-                $option = $alertModel->bdApi_getUserNotificationOption($this->get('alerted_user_id'));
-            } else {
-                $option = $subscriptionModel->getClientSubscriptionsData();
-            }
-
-            if (!empty($option)) {
-                $subscriptionModel->ping(
-                    $option,
-                    'insert',
-                    bdApi_Model_Subscription::TYPE_NOTIFICATION,
-                    $this->get('alert_id')
-                );
-            }
-        }
-
-        parent::_postSave();
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/DataWriter/Discussion/Thread.php b/xenforo/library/bdApi/XenForo/DataWriter/Discussion/Thread.php
deleted file mode 100644
index 0995e593..00000000
--- a/xenforo/library/bdApi/XenForo/DataWriter/Discussion/Thread.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class bdApi_XenForo_DataWriter_Discussion_Thread_Base extends XFCP_bdApi_XenForo_DataWriter_Discussion_Thread
-{
-    protected function _bdApi_discussionPostDelete()
-    {
-        /* @var $subscriptionModel bdApi_Model_Subscription */
-        $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-        $subscriptionModel->deleteSubscriptionsForTopic(
-            bdApi_Model_Subscription::TYPE_THREAD_POST,
-            $this->get('thread_id')
-        );
-    }
-}
-
-if (XenForo_Application::$versionId >= 1020000) {
-    class bdApi_XenForo_DataWriter_Discussion_Thread extends bdApi_XenForo_DataWriter_Discussion_Thread_Base
-    {
-        protected function _discussionPostDelete()
-        {
-            $this->_bdApi_discussionPostDelete();
-
-            parent::_discussionPostDelete();
-        }
-    }
-
-} else {
-    class bdApi_XenForo_DataWriter_Discussion_Thread extends bdApi_XenForo_DataWriter_Discussion_Thread_Base
-    {
-        protected function _discussionPostDelete(array $messages)
-        {
-            $this->_bdApi_discussionPostDelete();
-
-            /** @noinspection PhpMethodParametersCountMismatchInspection */
-            parent::_discussionPostDelete($messages);
-        }
-    }
-
-}
diff --git a/xenforo/library/bdApi/XenForo/DataWriter/DiscussionMessage/Post.php b/xenforo/library/bdApi/XenForo/DataWriter/DiscussionMessage/Post.php
deleted file mode 100755
index 249d9228..00000000
--- a/xenforo/library/bdApi/XenForo/DataWriter/DiscussionMessage/Post.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-class bdApi_XenForo_DataWriter_DiscussionMessage_Post extends XFCP_bdApi_XenForo_DataWriter_DiscussionMessage_Post
-{
-    protected $_trackPostOrigin = '';
-
-    public function bdApi_setOrigin($clientId)
-    {
-        if (empty($this->_trackPostOrigin)) {
-            return false;
-        }
-
-        return $this->set($this->_trackPostOrigin, $clientId);
-    }
-
-    protected function _getFields()
-    {
-        $fields = parent::_getFields();
-
-        $this->_trackPostOrigin = bdApi_Option::get('trackPostOrigin');
-        if (!empty($this->_trackPostOrigin)) {
-            $fields['xf_post'][$this->_trackPostOrigin] = array(
-                'type' => XenForo_DataWriter::TYPE_STRING,
-                'maxLength' => 255,
-                'default' => '',
-            );
-        }
-
-        return $fields;
-    }
-
-    protected function _messagePostSave()
-    {
-        if ($this->isInsert()) {
-            if ($this->get('message_state') == 'visible') {
-                $this->_bdApi_pingThreadPost('insert');
-            }
-        } elseif ($this->isChanged('message_state')) {
-            if ($this->get('message_state') == 'visible') {
-                $this->_bdApi_pingThreadPost('insert');
-            } elseif ($this->getExisting('message_state') == 'visible') {
-                $this->_bdApi_pingThreadPost('delete');
-            }
-        } else {
-            $this->_bdApi_pingThreadPost('update');
-        }
-
-        parent::_messagePostSave();
-    }
-
-    protected function _messagePostDelete()
-    {
-        if ($this->getExisting('message_state') == 'visible') {
-            $this->_bdApi_pingThreadPost('delete');
-        }
-
-        parent::_messagePostDelete();
-    }
-
-    protected function _bdApi_pingThreadPost($action)
-    {
-        if (!bdApi_Option::getSubscription(bdApi_Model_Subscription::TYPE_THREAD_POST)) {
-            // subscription for thread post has been disabled
-            return false;
-        }
-
-        $thread = $this->getDiscussionData();
-        $subColumn = bdApi_Option::getConfig('subscriptionColumnThreadPost');
-        if (!empty($thread[$subColumn])) {
-            $threadOption = @unserialize($thread[$subColumn]);
-
-            if (!empty($threadOption)) {
-                /* @var $subscriptionModel bdApi_Model_Subscription */
-                $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-                $subscriptionModel->ping(
-                    $threadOption,
-                    $action,
-                    bdApi_Model_Subscription::TYPE_THREAD_POST,
-                    $this->get('post_id')
-                );
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/DataWriter/User.php b/xenforo/library/bdApi/XenForo/DataWriter/User.php
deleted file mode 100644
index 0eaf526e..00000000
--- a/xenforo/library/bdApi/XenForo/DataWriter/User.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-class bdApi_XenForo_DataWriter_User extends XFCP_bdApi_XenForo_DataWriter_User
-{
-    protected function _getFields()
-    {
-        $fields = parent::_getFields();
-
-        $fields['xf_user_option'][bdApi_Option::getConfig('subscriptionColumnUser')] = array('type' => XenForo_DataWriter::TYPE_SERIALIZED);
-
-        return $fields;
-    }
-
-    protected function _postDelete()
-    {
-        $this->_bdApi_pingUser('delete');
-
-        /* @var $subscriptionModel bdApi_Model_Subscription */
-        $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-        $subscriptionModel->deleteSubscriptionsForTopic(
-            bdApi_Model_Subscription::TYPE_NOTIFICATION,
-            $this->get('user_id')
-        );
-        $subscriptionModel->deleteSubscriptionsForTopic(bdApi_Model_Subscription::TYPE_USER, $this->get('user_id'));
-
-        parent::_postDelete();
-    }
-
-    protected function _postSave()
-    {
-        $optionLogChanges = true;
-        $changeLogIgnoreFields = array();
-        if (XenForo_Application::$versionId >= 1030000) {
-            // user changes log is available since XenForo 1.3.0+
-            // we will use its configuration when possible
-            $optionLogChanges = $this->getOption(self::OPTION_LOG_CHANGES);
-            $changeLogIgnoreFields = self::$changeLogIgnoreFields;
-        }
-
-        if ($this->isInsert()) {
-            $this->_bdApi_pingUser('insert');
-        }
-
-        if ($this->isUpdate() AND $optionLogChanges) {
-            if ($changes = $this->getNewData()) {
-                $changedFields = array();
-
-                foreach ($changes AS $table => $fields) {
-                    foreach ($fields AS $field => $newValue) {
-                        if (!in_array($field, $changeLogIgnoreFields, true)) {
-                            $changedFields[$field] = $this->get($field);
-                        }
-                    }
-                }
-
-                if (!empty($changedFields)) {
-                    $this->_bdApi_pingUser('update');
-                }
-            }
-        }
-
-        parent::_postSave();
-    }
-
-    protected function _bdApi_pingUser($action)
-    {
-        if (!bdApi_Option::getSubscription(bdApi_Model_Subscription::TYPE_USER)) {
-            // subscription for user has been disabled
-            return false;
-        }
-
-        if ($action === 'insert') {
-            $user0Option = XenForo_Application::getSimpleCacheData(bdApi_Model_Subscription::TYPE_USER_0_SIMPLE_CACHE);
-            if (!empty($user0Option)) {
-                /* @var $subscriptionModel bdApi_Model_Subscription */
-                $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-                $subscriptionModel->ping(
-                    $user0Option,
-                    $action,
-                    bdApi_Model_Subscription::TYPE_USER,
-                    $this->get('user_id')
-                );
-            }
-        }
-
-        $userOption = $this->get(bdApi_Option::getConfig('subscriptionColumnUser'));
-        if (!empty($userOption)) {
-            $userOption = @unserialize($userOption);
-
-            if (!empty($userOption)) {
-                /* @var $subscriptionModel bdApi_Model_Subscription */
-                $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-                $subscriptionModel->ping(
-                    $userOption,
-                    $action,
-                    bdApi_Model_Subscription::TYPE_USER,
-                    $this->get('user_id')
-                );
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/Model/Alert.php b/xenforo/library/bdApi/XenForo/Model/Alert.php
deleted file mode 100755
index 0845d712..00000000
--- a/xenforo/library/bdApi/XenForo/Model/Alert.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-class bdApi_XenForo_Model_Alert extends XFCP_bdApi_XenForo_Model_Alert
-{
-    public function resetUnreadAlertsCounter($userId)
-    {
-        if (bdApi_Option::getSubscription(bdApi_Model_Subscription::TYPE_NOTIFICATION)) {
-            // subscription for alert is enabled
-            $userOption = $this->bdApi_getUserNotificationOption($userId);
-            if (!empty($userOption)) {
-                /* @var $subscriptionModel bdApi_Model_Subscription */
-                $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-                $subscriptionModel->ping($userOption, 'read', bdApi_Model_Subscription::TYPE_NOTIFICATION, 0);
-            }
-        }
-
-        parent::resetUnreadAlertsCounter($userId);
-    }
-
-    public function bdApi_getAlertsByIds($alertIds)
-    {
-        return $this->fetchAllKeyed('
-				SELECT
-					alert.*,
-					user.gender, user.avatar_date, user.gravatar, user.username
-				FROM xf_user_alert AS alert
-				INNER JOIN xf_user AS user ON (user.user_id = alert.user_id)
-				WHERE alert.view_date = 0
-					AND alert.alert_id IN (' . $this->_getDb()->quote($alertIds) . ')
-				ORDER BY event_date DESC
-		', 'alert_id');
-    }
-
-    public function bdApi_prepareContentForAlerts($alerts, $viewingUser)
-    {
-        $alerts = $this->_getContentForAlerts($alerts, $viewingUser['user_id'], $viewingUser);
-        $alerts = $this->_getViewableAlerts($alerts, $viewingUser);
-
-        $alerts = $this->prepareAlerts($alerts, $viewingUser);
-
-        return $alerts;
-    }
-
-    public function bdApi_getAlertHandlers()
-    {
-        return $this->_handlerCache;
-    }
-
-    public function bdApi_getUserNotificationOption($userId)
-    {
-        if (XenForo_Application::isRegistered('bdapi_user_notification')) {
-            $userOptions = XenForo_Application::get('bdapi_user_notification');
-        } else {
-            $userOptions = array();
-        }
-
-        if (empty($userOptions) OR !isset($userOptions[$userId])) {
-            $subColumn = bdApi_Option::getConfig('subscriptionColumnUserNotification');
-            if ($userId == XenForo_Visitor::getUserId()) {
-                $userOptions[$userId] = XenForo_Visitor::getInstance()->get($subColumn);
-            } else {
-                $userOptions[$userId] = $this->_getDb()->fetchOne('
-					SELECT `' . $subColumn . '`
-					FROM `xf_user_option`
-					WHERE user_id = ?
-				', $userId);
-            }
-
-            XenForo_Application::set('bdapi_user_notification', $userOptions);
-        }
-
-        $userOption = $userOptions[$userId];
-
-        if (!empty($userOption)) {
-            $userOption = @unserialize($userOption);
-        }
-
-        if (empty($userOption)) {
-            $userOption = array();
-        }
-
-        return $userOption;
-    }
-
-    public function getAlertOptOuts(array $user = null, $useDenormalized = true)
-    {
-        $subColumn = bdApi_Option::getConfig('subscriptionColumnUserNotification');
-        if (!empty($user['user_id']) AND isset($user[$subColumn])) {
-            if (XenForo_Application::isRegistered('bdapi_user_notification')) {
-                $userOptions = XenForo_Application::get('bdapi_user_notification');
-            } else {
-                $userOptions = array();
-            }
-
-            $userOptions[$user['user_id']] = $user[$subColumn];
-
-            XenForo_Application::set('bdapi_user_notification', $userOptions);
-        }
-
-        return parent::getAlertOptOuts($user, $useDenormalized);
-    }
-
-    public function prepareApiDataForAlerts(array $alerts)
-    {
-        $data = array();
-
-        foreach ($alerts as $key => $alert) {
-            $data[] = $this->prepareApiDataForAlert($alert);
-        }
-
-        return $data;
-    }
-
-    public function prepareApiDataForAlert(array $alert)
-    {
-        $publicKeys = array(
-            // xf_user_alert
-            'alert_id' => 'notification_id',
-            'event_date' => 'notification_create_date',
-            'user_id' => 'creator_user_id',
-            'username' => 'creator_username',
-
-            // XenForo_Model_Alert::prepareAlert
-            'unviewed' => 'notification_is_unread',
-        );
-
-        $data = bdApi_Data_Helper_Core::filter($alert, $publicKeys);
-
-        if (!empty($alert['user'])) {
-            $data['creator_user_id'] = $alert['user']['user_id'];
-            $data['creator_username'] = $alert['user']['username'];
-        }
-
-        if (!empty($alert['content_type'])
-            && !empty($alert['content_id'])
-            && !empty($alert['action'])
-        ) {
-            $data['notification_type'] = sprintf(
-                '%s_%d_%s',
-                $alert['content_type'],
-                $alert['content_id'],
-                $alert['action']
-            );
-        }
-
-        $data['links'] = array(
-            'content' => bdApi_Data_Helper_Core::safeBuildApiLink(
-                'notifications/content',
-                null,
-                array('notification_id' => $alert['alert_id'])
-            ),
-        );
-
-        if (!empty($alert['user'])) {
-            $data['links']['creator_avatar'] = XenForo_Template_Helper_Core::callHelper(
-                'avatar',
-                array($alert['user'], 'm', false, true)
-            );
-        }
-
-        return $data;
-    }
-}
diff --git a/xenforo/library/bdApi/XenForo/Model/Conversation.php b/xenforo/library/bdApi/XenForo/Model/Conversation.php
deleted file mode 100755
index e650edfa..00000000
--- a/xenforo/library/bdApi/XenForo/Model/Conversation.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-class bdApi_XenForo_Model_Conversation extends XFCP_bdApi_XenForo_Model_Conversation
-{
-    public function insertConversationAlert(
-        array $conversation,
-        array $alertUser,
-        $action,
-        array $triggerUser = null,
-        array $extraData = null,
-        array &$messageInfo = null
-    ) {
-        parent::insertConversationAlert(
-            $conversation,
-            $alertUser,
-            $action,
-            $triggerUser,
-            $extraData,
-            $messageInfo
-        );
-
-        if (!bdApi_Option::getSubscription(bdApi_Model_Subscription::TYPE_NOTIFICATION)
-            || !bdApi_Option::get('userNotificationConversation')
-        ) {
-            return;
-        }
-
-        if (!$triggerUser) {
-            $triggerUser = array(
-                'user_id' => $conversation['last_message_user_id'],
-                'username' => $conversation['last_message_username']
-            );
-        }
-
-        if ($triggerUser['user_id'] == $alertUser['user_id']) {
-            return;
-        }
-
-        if (empty($extraData)) {
-            $extraData = array();
-        }
-        $extraData['object_data'] = array(
-            'notification_id' => 0,
-            'notification_html' => '',
-        );
-        $extraData['object_data']['message'] = array(
-            'conversation_id' => $conversation['conversation_id'],
-            'title' => $conversation['title'],
-            'message' => XenForo_Template_Helper_Core::callHelper('snippet', array(
-                $messageInfo['message'],
-                140,
-                array(
-                    'stripQuote' => true,
-                )
-            )),
-        );
-        if (isset($extraData['message_id'])) {
-            $extraData['object_data']['message']['message_id'] = $extraData['message_id'];
-        } else {
-            $extraData['object_data']['message']['message_id'] = $conversation['first_message_id'];
-        }
-
-        $fakeAlert = array(
-            'alert_id' => 0,
-            'alerted_user_id' => $alertUser['user_id'],
-            'user_id' => $triggerUser['user_id'],
-            'username' => $triggerUser['username'],
-            'content_type' => 'conversation',
-            'content_id' => $conversation['conversation_id'],
-            'action' => $action,
-            'event_date' => XenForo_Application::$time,
-            'view_date' => 0,
-            'extra_data' => serialize($extraData),
-        );
-
-        if ($fakeAlert['alerted_user_id'] > 0) {
-            /* @var $alertModel bdApi_XenForo_Model_Alert */
-            $alertModel = $this->getModelFromCache('XenForo_Model_Alert');
-            $option = $alertModel->bdApi_getUserNotificationOption($fakeAlert['alerted_user_id']);
-        }
-
-        if (!empty($option)) {
-            if ($fakeAlert['user_id'] == XenForo_Visitor::getUserId()) {
-                $fakeAlert = array_merge($fakeAlert, XenForo_Visitor::getInstance()->toArray());
-            } else {
-                /** @var XenForo_Model_User $userModel */
-                $userModel = $this->getModelFromCache('XenForo_Model_User');
-                $user = $userModel->getUserById($fakeAlert['user_id']);
-                $fakeAlert = array_merge($fakeAlert, $user);
-            }
-
-            /* @var $subscriptionModel bdApi_Model_Subscription */
-            $subscriptionModel = $this->getModelFromCache('bdApi_Model_Subscription');
-            $subscriptionModel->ping($option, 'insert', bdApi_Model_Subscription::TYPE_NOTIFICATION, $fakeAlert);
-        }
-
-        return;
-    }
-}
diff --git a/xenforo/library/bdApi/Zend/Controller/Request/Http.php b/xenforo/library/bdApi/Zend/Controller/Request/Http.php
deleted file mode 100755
index ffa5480e..00000000
--- a/xenforo/library/bdApi/Zend/Controller/Request/Http.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class bdApi_Zend_Controller_Request_Http extends Zend_Controller_Request_Http
-{
-    protected $_method = 'GET';
-    protected $_paramSources = array();
-
-    public function setMethod($method)
-    {
-        if (in_array($method, array(
-            'DELETE',
-            'GET',
-            'POST',
-            'PUT',
-        ))) {
-            $this->_method = $method;
-            return true;
-        }
-
-        return false;
-    }
-
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-}
diff --git a/xenforo/library/bdApi/addon-bdApi.xml b/xenforo/library/bdApi/addon-bdApi.xml
deleted file mode 100755
index e854f469..00000000
--- a/xenforo/library/bdApi/addon-bdApi.xml
+++ /dev/null
@@ -1,1699 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="bdApi" title="[bd] API" version_string="1.6.1" version_id="1060170" url="" install_callback_class="bdApi_Installer" install_callback_method="install" uninstall_callback_class="bdApi_Installer" uninstall_callback_method="uninstall">
-  <admin_navigation>
-    <navigation navigation_id="bdApi" parent_navigation_id="tools" display_order="9999" link="api-clients" admin_permission_id="bdApi" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_auth_codes" parent_navigation_id="bdApi" display_order="3000" link="api-auth-codes" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_clients" parent_navigation_id="bdApi" display_order="1000" link="api-clients" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_logs" parent_navigation_id="bdApi" display_order="9999" link="api-logs" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_refresh_tokens" parent_navigation_id="bdApi" display_order="4000" link="api-refresh-tokens" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_subscriptions" parent_navigation_id="bdApi" display_order="5000" link="api-subscriptions" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-    <navigation navigation_id="bdApi_tokens" parent_navigation_id="bdApi" display_order="2000" link="api-tokens" admin_permission_id="" debug_only="0" hide_no_children="0"/>
-  </admin_navigation>
-  <admin_permissions>
-    <admin_permission admin_permission_id="bdApi" display_order="9999"/>
-  </admin_permissions>
-  <admin_style_properties/>
-  <admin_templates>
-    <template title="bdapi.css"><![CDATA[.bdApi_Log.serious h4 a em
-{
-	font-weight: bold;
-}
-
-.bdApi_Log.error
-{
-	background: #ff0000;
-}
-	.FilterList .listItem.bdApi_Log.error:hover h4
-	{
-		background: transparent;
-	}
-	.bdApi_Log.error h4 a em
-	{
-		color: white;
-	}
-	.bdApi_Log.error h4 a em strong
-	{
-		color: yellow;
-	}]]></template>
-    <template title="bdapi_auth_code_delete"><![CDATA[<xen:title>{xen:phrase bdapi_auth_code_confirm_deletion}: {$authCode.auth_code_text}</xen:title>
-<xen:h1>{xen:phrase bdapi_auth_code_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-auth-codes/edit', $authCode}">{$authCode.auth_code_text}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-auth-codes/delete', $authCode}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_auth_code_please_confirm}:</p>
-	<strong><a href="{xen:adminlink 'api-auth-codes/edit', $authCode}">{$authCode.auth_code_text}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_auth_code_delete}" />
-	
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_auth_code_list"><![CDATA[<xen:title>{xen:phrase bdapi_auth_codes}</xen:title>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:if is="{$client}">
-	<xen:navigation>
-		<xen:breadcrumb href="{xen:adminlink api-clients/edit, $client}">{$client.name}</xen:breadcrumb>
-	</xen:navigation>
-</xen:if>
-
-<xen:form action="{xen:adminlink 'api-auth-codes'}" class="section">
-	<xen:if is="{$authCodes}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_auth_codes}
-		</h2>
-
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_auth_code_list_items" />
-		</ol>
-
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $allAuthCode}</span>', 'total={xen:count $allAuthCode}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_auth_code_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-auth-codes, '', '_params={$pageNavParams}'}]]></template>
-    <template title="bdapi_auth_code_list_items"><![CDATA[<xen:foreach loop="$authCodes" value="$authCode">
-	<xen:listitem
-		id="{$authCode.auth_code_id}"
-		delete="{xen:adminlink 'api-auth-codes/delete', $authCode}">
-		<xen:label>{$authCode.auth_code_text}</xen:label>
-		<xen:snippet>
-			{xen:if '!{$client}', '{$authCode.client_name}->'}{$authCode.username}
-			({$authCode.scope}, {xen:datetime $authCode.issue_date})
-		</xen:snippet>
-	</xen:listitem>
-</xen:foreach>
-<xen:if is="{$filterView} AND {$total} > {$perPage}">
-	<li class="listNote">{xen:phrase more_records_matching_filter_more_specific}</li>
-</xen:if>]]></template>
-    <template title="bdapi_client_content_delete"><![CDATA[<xen:title>{xen:phrase bdapi_client_content_confirm_deletion}: {$clientContent.title}</xen:title>
-<xen:h1>{xen:phrase bdapi_client_content_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-client-contents', '', 'client_id={$clientContent.client_id}'}">{$clientContent.name}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-client-contents/delete', $clientContent}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_client_content_please_confirm}:</p>
-	<strong><a href="{$clientContent.link}" target="_blank">{$clientContent.title}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_client_content_delete}" />
-
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_client_content_delete_all"><![CDATA[<xen:title>{xen:phrase bdapi_client_content_confirm_deletion}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_client_content_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-client-contents', '', 'client_id={$clientContent.client_id}'}">{$client.name}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-client-contents/delete-all','',
-				  'client_id={$client.client_id}'}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_client_content_please_confirm_delete_all}:</p>
-	<strong>{$client.name}</strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_client_content_delete}" />
-
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_client_content_list"><![CDATA[<xen:title>{xen:phrase bdapi_client_contents}</xen:title>
-
-<xen:if is="{$client}">
-	<xen:navigation>
-		<xen:breadcrumb href="{xen:adminlink 'api-clients/edit', $client}">{$client.name}</xen:breadcrumb>
-	</xen:navigation>
-
-	<xen:topctrl>
-		<a href="{xen:adminlink 'api-client-contents/delete-all', '', 'client_id={$client.client_id}'}"
-		   class="button OverlayTrigger">{xen:phrase bdapi_delete_all_client_content}</a>
-	</xen:topctrl>
-</xen:if>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:form action="{xen:adminlink 'api-client-contents'}" class="section">
-	<xen:if is="{$clientContents}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_client_contents}
-		</h2>
-
-		<ol class="FilterList Scrollable">
-			<xen:include template="bdapi_client_content_list_items" />
-		</ol>
-
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $clientContents}</span>', 'total={xen:count $clientContents}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_client_content_no_results}</div>
-	</xen:if>
-</xen:form>]]></template>
-    <template title="bdapi_client_content_list_items"><![CDATA[<xen:foreach loop="$clientContents" value="$clientContent">
-	<xen:listitem
-		id="{$clientContent.client_content_id}"
-		href="{$clientContent.link}" target="_blank"
-		delete="{xen:adminlink 'api-client-contents/delete', $clientContent}">
-		<xen:label>{$clientContent.title}</xen:label>
-		<xen:snippet>{$clientContent.body}</xen:snippet>
-	</xen:listitem>
-</xen:foreach>]]></template>
-    <template title="bdapi_client_delete"><![CDATA[<xen:title>{xen:phrase bdapi_client_confirm_deletion}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_client_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-clients/edit', $client}">{$client.name}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-clients/delete', $client}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_client_please_confirm}:</p>
-	<strong><a href="{xen:adminlink 'api-clients/edit', $client}">{$client.name}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_client_delete}" />
-	
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_client_edit"><![CDATA[<xen:title>{xen:if '{$client.client_id}', '{xen:phrase bdapi_client_edit}', '{xen:phrase bdapi_client_add}'}</xen:title>
-
-<xen:form action="{xen:adminlink 'api-clients/save'}" class="AutoValidator" data-redirect="yes">
-	
-	<xen:textboxunit label="{xen:phrase bdapi_name}:" name="name" value="{$client.name}" data-liveTitleTemplate="{xen:if {$client.client_id},
-		'{xen:phrase bdapi_client_edit}: <em>%s</em>',
-		'{xen:phrase bdapi_client_add}: <em>%s</em>'}" />
-	<xen:textboxunit label="{xen:phrase bdapi_description}:" name="description" value="{$client.description}" rows="3"/>
-	
-	<xen:textboxunit label="{xen:phrase bdapi_client_key}:" name="client_id" value="{$client.client_id}" />
-	<xen:textboxunit label="{xen:phrase bdapi_client_secret}:" name="client_secret" value="{$client.client_secret}" />
-	<xen:textboxunit label="{xen:phrase bdapi_redirect_uri}:" name="redirect_uri" value="{$client.redirect_uri}" />
-	<xen:textboxunit label="{xen:phrase bdapi_whitelisted_domains}:" hint="{xen:phrase optional}" name="options[whitelisted_domains]" value="{$client.options.whitelisted_domains}" rows="3"/>
-	<xen:textboxunit label="{xen:phrase bdapi_public_key}:" hint="{xen:phrase optional}" name="options[public_key]" value="{$client.options.public_key}" rows="3"/>
-	
-	<xen:checkboxunit label="{xen:phrase options}" explain="{xen:phrase bdapi_client_options_explain}">
-		<xen:option label="{xen:phrase bdapi_client_option_auto_authorize_read}"
-			name="options[auto_authorize][read]" value="1"
-			selected="{$client.options.auto_authorize.read}"
-			/>
-		<xen:option label="{xen:phrase bdapi_client_option_auto_authorize_post}"
-			name="options[auto_authorize][post]" value="1"
-			selected="{$client.options.auto_authorize.post}"
-			/>
-		<xen:option label="{xen:phrase bdapi_client_option_auto_authorize_usercp}"
-			name="options[auto_authorize][usercp]" value="1"
-			selected="{$client.options.auto_authorize.usercp}"
-			/>
-		<xen:option label="{xen:phrase bdapi_client_option_auto_authorize_conversate}"
-			name="options[auto_authorize][conversate]" value="1"
-			selected="{$client.options.auto_authorize.conversate}"
-			/>
-		<xen:option label="{xen:phrase bdapi_client_option_auto_authorize_admincp}"
-			name="options[auto_authorize][admincp]" value="1"
-			selected="{$client.options.auto_authorize.admincp}"
-			/>
-	</xen:checkboxunit>
-
-	<xen:checkboxunit label="" explain="{xen:phrase bdapi_client_allow_search_indexing_explain}">
-		<xen:option label="{xen:phrase bdapi_client_allow_search_indexing}"
-			name="options[allow_search_indexing]" value="1"
-			selected="{$client.options.allow_search_indexing}"
-			/>
-		<xen:option label="{xen:phrase bdapi_client_allow_user_0_subscription}"
-			name="options[allow_user_0_subscription]" value="1"
-			selected="{$client.options.allow_user_0_subscription}"
-			/>
-	</xen:checkboxunit>
-
-	<xen:hook name="admin_bdapi_client_edit" />
-
-	<xen:submitunit save="{xen:phrase bdapi_client_save}">
-		<input type="button" name="delete" value="{xen:phrase bdapi_client_delete}"
-			accesskey="d" class="button OverlayTrigger"
-			data-href="{xen:adminlink 'api-clients/delete', $client}"
-			{xen:if '!{$client.client_id}', 'style="display: none"'}
-		/>
-	</xen:submitunit>
-	
-	<input type="hidden" name="existing_client_id" value="{$client.client_id}" />
-</xen:form>]]></template>
-    <template title="bdapi_client_list"><![CDATA[<xen:title>{xen:phrase bdapi_clients}</xen:title>
-
-<xen:topctrl>
-	<a href="{xen:adminlink 'api-clients/add'}" class="button" accesskey="a">+ {xen:phrase bdapi_client_add}</a>
-</xen:topctrl>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:form action="{xen:adminlink 'api-clients'}" class="section">
-	<xen:if is="{$clients}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_clients}
-		</h2>
-	
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_client_list_items" />
-		</ol>
-	
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $allClient}</span>', 'total={xen:count $allClient}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_client_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-clients}]]></template>
-    <template title="bdapi_client_list_items"><![CDATA[<xen:foreach loop="$clients" value="$client">
-	<xen:listitem
-		id="{$client.client_id}"
-		href="{xen:adminlink 'api-clients/edit', $client}"
-		label="{$client.name}"
-		snippet="{$client.redirect_uri}"
-		delete="{xen:adminlink 'api-clients/delete', $client}">
-		<xen:popup title="{xen:phrase view}" ctrlclass="toolsCtrl">
-			<xen:link href="{xen:adminlink 'api-tokens', '', 'client_id={$client.client_id}'}">{xen:phrase bdapi_tokens}</xen:link>
-			<xen:link href="{xen:adminlink 'api-auth-codes', '', 'client_id={$client.client_id}'}">{xen:phrase bdapi_auth_codes}</xen:link>
-			<xen:link href="{xen:adminlink 'api-refresh-tokens', '', 'client_id={$client.client_id}'}">{xen:phrase bdapi_refresh_tokens}</xen:link>
-			<xen:link href="{xen:adminlink 'api-subscriptions', '', 'client_id={$client.client_id}'}">{xen:phrase bdapi_subscriptions}</xen:link>
-			<xen:link href="{xen:adminlink 'api-client-contents', '', 'client_id={$client.client_id}'}">{xen:phrase bdapi_client_contents}</xen:link>
-		</xen:popup>
-	</xen:listitem>
-</xen:foreach>
-<xen:if is="{$filterMore}">
-	<li class="listNote">{xen:phrase more_records_matching_filter_more_specific}</li>
-</xen:if>]]></template>
-    <template title="bdapi_column_option_onoff"><![CDATA[<xen:checkboxunit hint="{$preparedOption.hint}">
-	<xen:label>{$_preparedOption.title}</xen:label>
-	<xen:option name="{$fieldPrefix}[{$preparedOption.option_id}]" selected="{$preparedOption.option_value}">
-		<xen:label>{$preparedOption.title}</xen:label>
-		<xen:hint>
-			{xen:raw $preparedOption.explain}
-			{xen:phrase bdapi_column_option_onoff_query,
-				'table={$preparedOption._bdApiTable}',
-				'column={$preparedOption._bdApiColumn}'}
-		</xen:hint>
-	</xen:option>
-	<xen:html>
-		<input type="hidden" name="{$listedFieldName}" value="{$preparedOption.option_id}" />
-		{xen:raw $editLink}
-	</xen:html>
-</xen:checkboxunit>
-
-<xen:edithint template="option_list_option_onoff" />]]></template>
-    <template title="bdapi_log_detail"><![CDATA[<xen:title>{$log.request_method} {$log.request_uri}</xen:title>
-
-<div class="section">
-	<div class="overlayScroll">
-		<table width="100%">
-		<tr>
-			<th class="subHeading">
-				<xen:if is="{$log.client_id}">
-					{xen:phrase bdapi_client}:
-					
-					<xen:if is="{$client}">
-						<a href="{$client.redirect_uri}" target="_blank">{$client.name}</a>
-					<xen:else />
-						{$log.client_id}
-					</xen:if>
-				<xen:else />
-					{xen:phrase bdapi_log_no_client}
-				</xen:if>
-			</th>
-		</tr>
-		<tr>
-			<td class="primaryContent">
-				<span class="dimmed">
-					<xen:if is="{$user}">
-						{xen:phrase user}: {$user.username}
-					</xen:if>
-				</span>
-				<div class="muted">{$log.ip_address}, <xen:datetime time="{$log.request_date}" /></div>
-			</td>
-		</tr>
-		<tr>
-			<th class="subHeading">{xen:phrase bdapi_request}</th>
-		</tr>
-		<tr>
-			<td class="primaryContent"><pre>{xen:helper dump, $log.request_data}</pre></td>
-		</tr>
-		<tr>
-			<th class="subHeading">{xen:phrase bdapi_response} ({$log.response_code})</th>
-		</tr>
-		<tr>
-			<td class="primaryContent"><pre>{xen:helper dump, $log.response_output}</pre></td>
-		</tr>
-		</table>
-	</div>
-	<div class="sectionFooter overlayOnly">
-		<a class="button primary OverlayCloser">{xen:phrase close}</a>
-	</div>
-</div>]]></template>
-    <template title="bdapi_log_list"><![CDATA[<xen:title>{xen:phrase bdapi_logs}</xen:title>
-
-<xen:require css="bdapi.css" />
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:form action="{xen:adminlink 'api-logs'}" class="section bdApi_Logs">
-	<xen:if is="{$logs}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_logs}
-		</h2>
-	
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_log_list_items" />
-		</ol>
-	
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:number {xen:count $logs}}</span>', 'total={xen:number $total}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_log_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-logs}]]></template>
-    <template title="bdapi_log_list_items"><![CDATA[<xen:foreach loop="$logs" value="$log">
-	<xen:listitem
-		id="{$log.log_id}"
-		href="{xen:adminlink 'api-logs/detail', $log}"
-		label="{$log.request_method} {$log.request_uri} ({$log.ip_address})" 
-		snippet="{xen:if '{$log.client_id}', '{$log.client_id}'}"
-		linkclass="OverlayTrigger"
-		class="bdApi_Log{xen:if '{$log.request_method} != "get"', ' serious'}{xen:if '{$log.response_code} >= 400', ' error'}" />
-</xen:foreach>
-<xen:if is="{$filterMore}">
-	<li class="listNote">{xen:phrase more_records_matching_filter_more_specific}</li>
-</xen:if>]]></template>
-    <template title="bdapi_refresh_token_delete"><![CDATA[<xen:title>{xen:phrase bdapi_refresh_token_confirm_deletion}: {$refreshToken.refresh_token_text}</xen:title>
-<xen:h1>{xen:phrase bdapi_refresh_token_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-refresh-tokens/edit', $refreshToken}">{$refreshToken.refresh_token_text}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-refresh-tokens/delete', $refreshToken}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_refresh_token_please_confirm}:</p>
-	<strong><a href="{xen:adminlink 'api-refresh-tokens/edit', $refreshToken}">{$refreshToken.refresh_token_text}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_refresh_token_delete}" />
-	
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_refresh_token_list"><![CDATA[<xen:title>{xen:phrase bdapi_refresh_tokens}</xen:title>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:if is="{$client}">
-	<xen:navigation>
-		<xen:breadcrumb href="{xen:adminlink api-clients/edit, $client}">{$client.name}</xen:breadcrumb>
-	</xen:navigation>
-</xen:if>
-
-<xen:form action="{xen:adminlink 'api-refresh-tokens'}" class="section">
-	<xen:if is="{$refreshTokens}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_refresh_tokens}
-		</h2>
-	
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_refresh_token_list_items" />
-		</ol>
-	
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $allRefreshToken}</span>', 'total={xen:count $allRefreshToken}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_refresh_token_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-refresh-tokens, '', '_params={$pageNavParams}'}]]></template>
-    <template title="bdapi_refresh_token_list_items"><![CDATA[<xen:foreach loop="$refreshTokens" value="$refreshToken">
-	<xen:listitem
-		id="{$refreshToken.refresh_token_id}"
-		delete="{xen:adminlink 'api-refresh-tokens/delete', $refreshToken}">
-		<xen:label>{$refreshToken.refresh_token_text}</xen:label>
-		<xen:snippet>
-			{xen:if '!{$client}', '{$refreshToken.client_name}->'}{$refreshToken.username}
-			({$refreshToken.scope}, {xen:datetime $refreshToken.issue_date})
-		</xen:snippet>
-	</xen:listitem>
-</xen:foreach>
-<xen:if is="{$filterView} AND {$total} > {$perPage}">
-	<li class="listNote">{xen:phrase more_records_matching_filter_more_specific}</li>
-</xen:if>]]></template>
-    <template title="bdapi_subscription_delete"><![CDATA[<xen:title>{xen:phrase bdapi_subscription_confirm_deletion}: {$subscription.client_id}</xen:title>
-<xen:h1>{xen:phrase bdapi_subscription_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-subscriptions/edit', $subscription}">{$subscription.client_id}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-subscriptions/delete', $subscription}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_subscription_please_confirm}:</p>
-	<strong><a href="{xen:adminlink 'api-subscriptions/edit', $subscription}">{$subscription.client_id}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_subscription_delete}" />
-
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_subscription_details"><![CDATA[<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink api-subscriptions}">{xen:phrase admin_navigation_bdApi_subscriptions}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:title>{xen:phrase bdapi_subscription_details} #{$subscription.subscription_id}</xen:title>
-
-<xen:form action="{xen:adminlink 'api-subscriptions'}">
-
-	<xen:controlunit label="{xen:phrase bdapi_client}:">{$subscription.client_id}</xen:controlunit>
-
-	<xen:controlunit label="{xen:phrase bdapi_topic}:">{$subscription.topic}</xen:controlunit>
-
-	<xen:if is="{$subscription.expire_date} > 0">
-		<xen:controlunit label="{xen:phrase bdapi_expire_date}:"><xen:datetime time="{$subscription.expire_date}" /></xen:controlunit>
-	</xen:if>
-
-</xen:form>]]></template>
-    <template title="bdapi_subscription_list"><![CDATA[<xen:title>{xen:phrase bdapi_subscriptions}</xen:title>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:if is="{$client}">
-	<xen:navigation>
-		<xen:breadcrumb href="{xen:adminlink api-clients/edit, $client}">{$client.name}</xen:breadcrumb>
-	</xen:navigation>
-</xen:if>
-
-<xen:form action="{xen:adminlink 'api-subscriptions'}" class="section">
-	<xen:if is="{$subscriptions}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_subscriptions}
-		</h2>
-
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_subscription_list_items" />
-		</ol>
-
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $subscriptions}</span>', 'total={xen:count $subscriptions}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_subscription_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-subscriptions, '', '_params={$pageNavParams}'}]]></template>
-    <template title="bdapi_subscription_list_items"><![CDATA[<xen:foreach loop="$subscriptions" value="$subscription">
-	<xen:listitem
-		id="{$subscription.subscription_id}"
-		href="{xen:adminlink 'api-subscriptions/details', $subscription}"
-		delete="{xen:adminlink 'api-subscriptions/delete', $subscription}">
-		<xen:label>{$subscription.topic}</xen:label>
-		<xen:snippet>{xen:if '!{$client}', '{$subscription.client_name}->'}{$subscription.callback}</xen:snippet>
-	</xen:listitem>
-</xen:foreach>]]></template>
-    <template title="bdapi_token_add"><![CDATA[<xen:title>{xen:phrase bdapi_token_add}</xen:title>
-
-<xen:form action="{xen:adminlink 'api-tokens/add'}" class="section AutoValidator" data-redirect="yes">
-
-	<xen:selectunit label="{xen:phrase bdapi_client}:" name="client_id">
-		<xen:options source="{$clients}" />
-	</xen:selectunit>
-
-	<xen:textboxunit label="{xen:phrase user_name}:" name="username" inputclass="AutoComplete AcSingle" />
-
-	<xen:checkboxunit label="{xen:phrase bdapi_scope}:" name="scopes">
-		<xen:foreach loop="$scopes" value="$scope">
-			<xen:option value="{$scope}">{xen:helper api_scopeGetText, $scope}</xen:option>
-		</xen:foreach>
-	</xen:checkboxunit>
-
-	<xen:spinboxunit label="{xen:phrase bdapi_ttl}:" name="ttl" value="3600" />
-
-	<xen:submitunit save="{xen:phrase bdapi_client_add}" />
-
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_token_delete"><![CDATA[<xen:title>{xen:phrase bdapi_token_confirm_deletion}: {$token.token_text}</xen:title>
-<xen:h1>{xen:phrase bdapi_token_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:adminlink 'api-tokens/edit', $token}">{$token.token_text}</xen:breadcrumb>
-</xen:navigation>
-
-<xen:require css="delete_confirmation.css" />
-
-<xen:form action="{xen:adminlink 'api-tokens/delete', $token}" class="deleteConfirmForm formOverlay">
-
-	<p>{xen:phrase bdapi_token_please_confirm}:</p>
-	<strong><a href="{xen:adminlink 'api-tokens/edit', $token}">{$token.token_text}</a></strong>
-
-	<xen:submitunit save="{xen:phrase bdapi_token_delete}" />
-	
-	<input type="hidden" name="_xfConfirm" value="1" />
-</xen:form>]]></template>
-    <template title="bdapi_token_list"><![CDATA[<xen:title>{xen:phrase bdapi_tokens}</xen:title>
-
-<xen:require css="filter_list.css" />
-<xen:require js="js/xenforo/filter_list.js" />
-
-<xen:if is="{$client}">
-	<xen:navigation>
-		<xen:breadcrumb href="{xen:adminlink api-clients/edit, $client}">{$client.name}</xen:breadcrumb>
-	</xen:navigation>
-</xen:if>
-
-<xen:topctrl>
-	<a href="{xen:adminlink 'api-tokens/add'}" class="button" accesskey="a">+ {xen:phrase bdapi_token_add}</a>
-</xen:topctrl>
-
-<xen:form action="{xen:adminlink 'api-tokens'}" class="section">
-	<xen:if is="{$tokens}">
-		<h2 class="subHeading">
-			<xen:include template="filter_list_controls" />
-			{xen:phrase bdapi_tokens}
-		</h2>
-	
-		<ol class="FilterList Scrollable" data-ajaxFilter="true">
-			<xen:include template="bdapi_token_list_items" />
-		</ol>
-	
-		<p class="sectionFooter">{xen:phrase showing_x_of_y_items, 'count=<span class="FilterListCount">{xen:count $allToken}</span>', 'total={xen:count $allToken}'}</p>
-	<xen:else />
-		<div class="noResults">{xen:phrase bdapi_token_no_results}</div>
-	</xen:if>
-</xen:form>
-
-{xen:adminpagenav $perPage, $total, $page, api-tokens, '', '_params={$pageNavParams}'}]]></template>
-    <template title="bdapi_token_list_items"><![CDATA[<xen:foreach loop="$tokens" value="$token">
-	<xen:listitem
-		id="{$token.token_id}"
-		delete="{xen:adminlink 'api-tokens/delete', $token}">
-		<xen:label>{$token.token_text}</xen:label>
-		<xen:snippet>
-			{xen:if '!{$client}', '{$token.client_name}->'}{xen:if '{$token.username}', $token.username, 'user#{$token.user_id}'}
-			({$token.scope}, {xen:datetime $token.issue_date})
-		</xen:snippet>
-	</xen:listitem>
-</xen:foreach>
-<xen:if is="{$filterView} AND {$total} > {$perPage}">
-	<li class="listNote">{xen:phrase more_records_matching_filter_more_specific}</li>
-</xen:if>]]></template>
-  </admin_templates>
-  <admin_template_modifications/>
-  <code_events>
-    <event event_id="api_setup_routes"><![CDATA[<p>Called after all default API routes have been registered.</p>
-
-Arguments:
-<ol>
-<li><code>array &$routes</code> - an array of reoutes.</li>
-</ol>]]></event>
-  </code_events>
-  <code_event_listeners>
-    <listener event_id="file_health_check" execute_order="5" callback_class="bdApi_Listener" callback_method="file_health_check" active="1" hint="" description=""/>
-    <listener event_id="front_controller_pre_route" execute_order="10" callback_class="bdApi_Listener" callback_method="front_controller_pre_route" active="1" hint="" description=""/>
-    <listener event_id="init_dependencies" execute_order="5" callback_class="bdApi_Listener" callback_method="init_dependencies" active="1" hint="" description=""/>
-    <listener event_id="load_class_controller" execute_order="5" callback_class="bdApi_Listener" callback_method="load_class" active="1" hint="" description=""/>
-    <listener event_id="load_class_datawriter" execute_order="5" callback_class="bdApi_Listener" callback_method="load_class" active="1" hint="" description=""/>
-    <listener event_id="load_class_model" execute_order="5" callback_class="bdApi_Listener" callback_method="load_class" active="1" hint="" description=""/>
-    <listener event_id="template_create" execute_order="5" callback_class="bdApi_Listener" callback_method="template_create" active="1" hint="" description=""/>
-    <listener event_id="template_hook" execute_order="5" callback_class="bdApi_Listener" callback_method="template_hook" active="1" hint="" description=""/>
-  </code_event_listeners>
-  <cron>
-    <entry entry_id="bdApi_cleanUpExpired" cron_class="bdApi_CronEntry_CleanUp" cron_method="pruneExpired" active="1"><![CDATA[{"day_type":"dom","dom":["-1"],"hours":["6"],"minutes":["29"]}]]></entry>
-  </cron>
-  <email_templates/>
-  <email_template_modifications/>
-  <optiongroups>
-    <group group_id="bdApi" display_order="9999" debug_only="0"/>
-    <option option_id="bdApi_authCodeTTL" edit_format="spinbox" data_type="positive_integer" can_backup="1">
-      <default_value>30</default_value>
-      <edit_format_params>min=5
-step=30</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="100"/>
-    </option>
-    <option option_id="bdApi_cors" edit_format="onoff" data_type="unsigned_integer" can_backup="1">
-      <default_value>0</default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="10"/>
-    </option>
-    <option option_id="bdApi_logRetentionDays" edit_format="spinbox" data_type="unsigned_integer" can_backup="1">
-      <default_value>90</default_value>
-      <edit_format_params>min=0
-step=30</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="1000"/>
-    </option>
-    <option option_id="bdApi_paramLimitDefault" edit_format="spinbox" data_type="positive_integer" can_backup="1">
-      <default_value>20</default_value>
-      <edit_format_params>min=1
-step=10</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="500"/>
-    </option>
-    <option option_id="bdApi_paramLimitMax" edit_format="spinbox" data_type="unsigned_integer" can_backup="1">
-      <default_value>100</default_value>
-      <edit_format_params>min=0
-step=100</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="510"/>
-    </option>
-    <option option_id="bdApi_paramPageMax" edit_format="spinbox" data_type="unsigned_numeric" can_backup="1">
-      <default_value>0</default_value>
-      <edit_format_params>min=0</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="550"/>
-    </option>
-    <option option_id="bdApi_refreshTokenTTLDays" edit_format="spinbox" data_type="positive_integer" can_backup="1">
-      <default_value>14</default_value>
-      <edit_format_params>min=1
-step=14</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="120"/>
-    </option>
-    <option option_id="bdApi_restrictAccess" edit_format="onoff" data_type="unsigned_integer" can_backup="1">
-      <default_value></default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="10"/>
-    </option>
-    <option option_id="bdApi_subscriptionThreadPost" edit_format="callback" data_type="unsigned_integer" can_backup="1" validation_class="bdApi_Data_ColumnOption" validation_method="verifyOnOff">
-      <default_value>0</default_value>
-      <edit_format_params>bdApi_Data_ColumnOption::renderOnOff</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="25"/>
-    </option>
-    <option option_id="bdApi_subscriptionUser" edit_format="callback" data_type="unsigned_integer" can_backup="1" validation_class="bdApi_Data_ColumnOption" validation_method="verifyOnOff">
-      <default_value>0</default_value>
-      <edit_format_params>bdApi_Data_ColumnOption::renderOnOff</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="20"/>
-    </option>
-    <option option_id="bdApi_subscriptionUserNotification" edit_format="callback" data_type="unsigned_integer" can_backup="1" validation_class="bdApi_Data_ColumnOption" validation_method="verifyOnOff">
-      <default_value>0</default_value>
-      <edit_format_params>bdApi_Data_ColumnOption::renderOnOff</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="21"/>
-    </option>
-    <option option_id="bdApi_tokenTTL" edit_format="spinbox" data_type="positive_integer" can_backup="1">
-      <default_value>3600</default_value>
-      <edit_format_params>min=600
-step=3600</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="110"/>
-    </option>
-    <option option_id="bdApi_trackPostOrigin" edit_format="textbox" data_type="string" can_backup="1" validation_class="bdApi_Data_ColumnOption" validation_method="verifyXfPost">
-      <default_value></default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="30"/>
-    </option>
-    <option option_id="bdApi_trackSession" edit_format="onoff" data_type="unsigned_integer" can_backup="1">
-      <default_value>1</default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="30"/>
-    </option>
-    <option option_id="bdApi_userNotificationConversation" edit_format="onoff" data_type="unsigned_integer" can_backup="1">
-      <default_value>1</default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApi" display_order="22"/>
-    </option>
-  </optiongroups>
-  <permissions>
-    <permission_groups/>
-    <permissions>
-      <permission permission_group_id="general" permission_id="bdApi_clientNew" permission_type="flag" default_value="unset" interface_group_id="generalPermissions" display_order="9999"/>
-    </permissions>
-    <interface_groups/>
-  </permissions>
-  <phrases>
-    <phrase title="admin_navigation_bdApi" version_id="1" version_string="0.1"><![CDATA[[bd] API]]></phrase>
-    <phrase title="admin_navigation_bdApi_auth_codes" version_id="1" version_string="0.1"><![CDATA[Authentication Codes]]></phrase>
-    <phrase title="admin_navigation_bdApi_clients" version_id="1" version_string="0.1"><![CDATA[Clients]]></phrase>
-    <phrase title="admin_navigation_bdApi_logs" version_id="23" version_string="0.9.8a"><![CDATA[Logs]]></phrase>
-    <phrase title="admin_navigation_bdApi_refresh_tokens" version_id="1" version_string="0.1"><![CDATA[Refresh Tokens]]></phrase>
-    <phrase title="admin_navigation_bdApi_subscriptions" version_id="50" version_string="1.2.1b"><![CDATA[PubSubHubbub]]></phrase>
-    <phrase title="admin_navigation_bdApi_tokens" version_id="1" version_string="0.1"><![CDATA[Tokens]]></phrase>
-    <phrase title="admin_permission_bdApi" version_id="1" version_string="0.1"><![CDATA[[bd] API: Manage the API]]></phrase>
-    <phrase title="bdapi_authorize_access" version_id="1" version_string="0.1"><![CDATA[Authorize Access]]></phrase>
-    <phrase title="bdapi_authorize_error_client_x_not_found" version_id="1" version_string="0.1"><![CDATA[Client {client} could not be found.]]></phrase>
-    <phrase title="bdapi_authorize_error_invalid_or_expired_access_token" version_id="1" version_string="0.1"><![CDATA[Invalid or expired access token.]]></phrase>
-    <phrase title="bdapi_authorize_error_scope_x_not_granted" version_id="1" version_string="0.1"><![CDATA[Scope {scope} has not been granted.]]></phrase>
-    <phrase title="bdapi_authorize_no_client_create_one_question" version_id="77" version_string="1.4.5"><![CDATA[Client could not be found. You can create one <a href="{link}">here</a> and try again.]]></phrase>
-    <phrase title="bdapi_auth_codes" version_id="54" version_string="1.3.1b"><![CDATA[Authentication Codes]]></phrase>
-    <phrase title="bdapi_auth_code_confirm_deletion" version_id="1" version_string="0.1"><![CDATA[Confirm Deletion of Authentication Code]]></phrase>
-    <phrase title="bdapi_auth_code_delete" version_id="1" version_string="0.1"><![CDATA[Delete Authentication Code]]></phrase>
-    <phrase title="bdapi_auth_code_not_found" version_id="1" version_string="0.1"><![CDATA[The requested Authentication Code could not be found]]></phrase>
-    <phrase title="bdapi_auth_code_no_results" version_id="1" version_string="0.1"><![CDATA[No authentication codes to display...]]></phrase>
-    <phrase title="bdapi_auth_code_please_confirm" version_id="4" version_string="0.9-dev"><![CDATA[Please confirm that you want to delete the following authentication code]]></phrase>
-    <phrase title="bdapi_client" version_id="1" version_string="0.1"><![CDATA[Client]]></phrase>
-    <phrase title="bdapi_clients" version_id="4" version_string="0.9-dev"><![CDATA[API Clients]]></phrase>
-    <phrase title="bdapi_client_add" version_id="1" version_string="0.1"><![CDATA[Add New Client]]></phrase>
-    <phrase title="bdapi_client_allow_search_indexing" version_id="77" version_string="1.4.5"><![CDATA[Can index search contents]]></phrase>
-    <phrase title="bdapi_client_allow_search_indexing_explain" version_id="77" version_string="1.4.5"><![CDATA[Client with this option enabled will be able to POST /search/indexing to put custom contents into XenForo search index.]]></phrase>
-    <phrase title="bdapi_client_allow_user_0_subscription" version_id="1050100" version_string="1.5.1"><![CDATA[Can subscribe for new user pings]]></phrase>
-    <phrase title="bdapi_client_confirm_deletion" version_id="1" version_string="0.1"><![CDATA[Confirm Deletion of Client]]></phrase>
-    <phrase title="bdapi_client_contents" version_id="77" version_string="1.4.5"><![CDATA[Client Contents]]></phrase>
-    <phrase title="bdapi_client_content_confirm_deletion" version_id="77" version_string="1.4.5"><![CDATA[Confirm Deletion of Client Content]]></phrase>
-    <phrase title="bdapi_client_content_delete" version_id="77" version_string="1.4.5"><![CDATA[Delete Client Content]]></phrase>
-    <phrase title="bdapi_client_content_not_found" version_id="77" version_string="1.4.5"><![CDATA[The requested client content could not be found]]></phrase>
-    <phrase title="bdapi_client_content_no_results" version_id="77" version_string="1.4.5"><![CDATA[No client content could be found...]]></phrase>
-    <phrase title="bdapi_client_content_please_confirm" version_id="77" version_string="1.4.5"><![CDATA[Please confirm that you want to delete the following client content]]></phrase>
-    <phrase title="bdapi_client_content_please_confirm_delete_all" version_id="77" version_string="1.4.5"><![CDATA[Please confirm that you want to delete the all contents of this client:]]></phrase>
-    <phrase title="bdapi_client_delete" version_id="1" version_string="0.1"><![CDATA[Delete Client]]></phrase>
-    <phrase title="bdapi_client_edit" version_id="1" version_string="0.1"><![CDATA[Edit Client]]></phrase>
-    <phrase title="bdapi_client_ids_must_be_unique" version_id="4" version_string="0.9-dev"><![CDATA[API keys must be unique. The specified key is already in use.]]></phrase>
-    <phrase title="bdapi_client_id_must_be_az09" version_id="50" version_string="1.2.1b"><![CDATA[API key must consist of lowercase alphanumeric characters (letters or numbers) only.]]></phrase>
-    <phrase title="bdapi_client_key" version_id="4" version_string="0.9-dev"><![CDATA[API Key]]></phrase>
-    <phrase title="bdapi_client_not_found" version_id="1" version_string="0.1"><![CDATA[The requested Client could not be found]]></phrase>
-    <phrase title="bdapi_client_no_results" version_id="1" version_string="0.1"><![CDATA[No clients to display...]]></phrase>
-    <phrase title="bdapi_client_options_explain" version_id="9" version_string="0.9-dev"><![CDATA["Automatically authorize *-scope" options are dangerous because the system will bypass user confirmation dialog and will grant the client the requested scope. Please make sure to apply enough security measure to protect the key and secret for client with these kind of options enabled.<br />]]></phrase>
-    <phrase title="bdapi_client_option_auto_authorize_admincp" version_id="9" version_string="0.9-dev"><![CDATA[Automatically authorize ADMINCP-scope]]></phrase>
-    <phrase title="bdapi_client_option_auto_authorize_conversate" version_id="9" version_string="0.9-dev"><![CDATA[Automatically authorize CONVERSATE-scope]]></phrase>
-    <phrase title="bdapi_client_option_auto_authorize_post" version_id="9" version_string="0.9-dev"><![CDATA[Automatically authorize POST-scope]]></phrase>
-    <phrase title="bdapi_client_option_auto_authorize_read" version_id="9" version_string="0.9-dev"><![CDATA[Automatically authorize READ-scope]]></phrase>
-    <phrase title="bdapi_client_option_auto_authorize_usercp" version_id="9" version_string="0.9-dev"><![CDATA[Automatically authorize USERCP-scope]]></phrase>
-    <phrase title="bdapi_client_please_confirm" version_id="4" version_string="0.9-dev"><![CDATA[Please confirm that you want to delete the following client]]></phrase>
-    <phrase title="bdapi_client_save" version_id="1" version_string="0.1"><![CDATA[Save Client]]></phrase>
-    <phrase title="bdapi_client_secret" version_id="4" version_string="0.9-dev"><![CDATA[API Secret]]></phrase>
-    <phrase title="bdapi_column_option_onoff_query" version_id="1060000" version_string="1.6.0"><![CDATA[A query is required: "ALTER TABLE `{table}` ADD COLUMN `{column}` MEDIUMBLOB".]]></phrase>
-    <phrase title="bdapi_column_x_table_y_not_found_for_field_z" version_id="1060000" version_string="1.6.0"><![CDATA[Database column `{table}`.`{column}` could not be found for option {field}.]]></phrase>
-    <phrase title="bdapi_delete_all_client_content" version_id="77" version_string="1.4.5"><![CDATA[Delete All]]></phrase>
-    <phrase title="bdapi_description" version_id="1" version_string="0.1"><![CDATA[Description]]></phrase>
-    <phrase title="bdapi_expire_date" version_id="1" version_string="0.1"><![CDATA[Expire Date]]></phrase>
-    <phrase title="bdapi_home" version_id="4" version_string="0.9-dev"><![CDATA[API Access]]></phrase>
-    <phrase title="bdapi_invalid_facebook_token" version_id="62" version_string="1.4.2-BETA"><![CDATA[Cannot verify Facebook token.]]></phrase>
-    <phrase title="bdapi_invalid_google_token" version_id="62" version_string="1.4.2-BETA"><![CDATA[Cannot verify Google token.]]></phrase>
-    <phrase title="bdapi_invalid_twitter_token" version_id="62" version_string="1.4.2-BETA"><![CDATA[Cannot verify Twitter authentication information.]]></phrase>
-    <phrase title="bdapi_key_pair_generate" version_id="67" version_string="1.4.3-BETA"><![CDATA[Generate]]></phrase>
-    <phrase title="bdapi_key_pair_generation" version_id="67" version_string="1.4.3-BETA"><![CDATA[Key Pair Generation]]></phrase>
-    <phrase title="bdapi_key_pair_generation_explain" version_id="67" version_string="1.4.3-BETA"><![CDATA[You are about to have a key pair generated by the system. Upon completion please save the private key securely, you will not be able to obtain it ever again (if the private key is lost, you will have to generate another key pair). The public key will be applied automatically to your client]]></phrase>
-    <phrase title="bdapi_last_issue_date" version_id="53" version_string="1.3.1"><![CDATA[Last Used]]></phrase>
-    <phrase title="bdapi_login_to_authorize_x" version_id="77" version_string="1.4.5"><![CDATA[By logging in, you will grant access to the listed client with the following permissions]]></phrase>
-    <phrase title="bdapi_login_to_authorize_x_google" version_id="50" version_string="1.2.1b"><![CDATA[Click "{login_with_google}" to continue with {client}.]]></phrase>
-    <phrase title="bdapi_logs" version_id="23" version_string="0.9.8a"><![CDATA[Logs]]></phrase>
-    <phrase title="bdapi_log_not_found" version_id="23" version_string="0.9.8a"><![CDATA[The requested Log could not be found]]></phrase>
-    <phrase title="bdapi_log_no_client" version_id="23" version_string="0.9.8a"><![CDATA[Public Request (no client)]]></phrase>
-    <phrase title="bdapi_log_no_results" version_id="23" version_string="0.9.8a"><![CDATA[No logs to display...]]></phrase>
-    <phrase title="bdapi_name" version_id="4" version_string="0.9-dev"><![CDATA[Client Name]]></phrase>
-    <phrase title="bdapi_navigation_element_not_found" version_id="65" version_string="1.4.3-BETA"><![CDATA[The requested navigation element could not be found.]]></phrase>
-    <phrase title="bdapi_no_facebook_association_found" version_id="62" version_string="1.4.2-BETA"><![CDATA[No user has been registered with this Facebook account.]]></phrase>
-    <phrase title="bdapi_no_google_association_found" version_id="62" version_string="1.4.2-BETA"><![CDATA[No user has been registered with this Google account.]]></phrase>
-    <phrase title="bdapi_no_twitter_association_found" version_id="62" version_string="1.4.2-BETA"><![CDATA[No user has been registered with this Twitter account.]]></phrase>
-    <phrase title="bdapi_only_accepts_post_requests" version_id="75" version_string="1.4.4c"><![CDATA[This entry point only accepts POST requests.]]></phrase>
-    <phrase title="bdapi_please_confirm_to_authorize_access" version_id="77" version_string="1.4.5"><![CDATA[Please confirm to grant access to the listed client with the following permissions]]></phrase>
-    <phrase title="bdapi_please_confirm_to_authorize_access_auto" version_id="77" version_string="1.4.5"><![CDATA[You are trying to authorize with no `client_id` therefore a random client of yours is being used. For security reason, the implicit grant flow is used and no other flows are available. Please confirm to continue.]]></phrase>
-    <phrase title="bdapi_post_slash_users_requires_client_id" version_id="26" version_string="1.0.1"><![CDATA[POST /users requires `client_id`.
-]]></phrase>
-    <phrase title="bdapi_private_key" version_id="67" version_string="1.4.3-BETA"><![CDATA[Private Key]]></phrase>
-    <phrase title="bdapi_private_key_please_save" version_id="67" version_string="1.4.3-BETA"><![CDATA[Please save the Private Key securely, this is the only time it will be shown to you. If you lose it, you will have to generate a new key pair.]]></phrase>
-    <phrase title="bdapi_public_key" version_id="67" version_string="1.4.3-BETA"><![CDATA[Public Key]]></phrase>
-    <phrase title="bdapi_public_key_explain" version_id="67" version_string="1.4.3-BETA"><![CDATA[For JWT Bearer grant type, you can use a public / private key pair to authenticate the client.]]></phrase>
-    <phrase title="bdapi_public_key_generate_click_here" version_id="67" version_string="1.4.3-BETA"><![CDATA[You can either generate the key pair yourself or <a href="{link}" class="OverlayTrigger">click here</a> to have them prepared for you.]]></phrase>
-    <phrase title="bdapi_public_key_must_be_valid" version_id="67" version_string="1.4.3-BETA"><![CDATA[Public Key, if presents, must be valid.]]></phrase>
-    <phrase title="bdapi_public_key_updated_client" version_id="67" version_string="1.4.3-BETA"><![CDATA[The client has already been updated to use this Public Key.]]></phrase>
-    <phrase title="bdapi_redirect_uri" version_id="1" version_string="0.1"><![CDATA[Redirect Uri]]></phrase>
-    <phrase title="bdapi_redirect_uri_must_be_valid" version_id="4" version_string="0.9-dev"><![CDATA[Redirect URI must be valid.]]></phrase>
-    <phrase title="bdapi_refresh_tokens" version_id="54" version_string="1.3.1b"><![CDATA[Refresh Tokens]]></phrase>
-    <phrase title="bdapi_refresh_token_confirm_deletion" version_id="1" version_string="0.1"><![CDATA[Confirm Deletion of Refresh Token]]></phrase>
-    <phrase title="bdapi_refresh_token_delete" version_id="1" version_string="0.1"><![CDATA[Delete Refresh Token]]></phrase>
-    <phrase title="bdapi_refresh_token_not_found" version_id="1" version_string="0.1"><![CDATA[The requested Refresh Token could not be found]]></phrase>
-    <phrase title="bdapi_refresh_token_no_results" version_id="1" version_string="0.1"><![CDATA[No refresh tokens to display...]]></phrase>
-    <phrase title="bdapi_refresh_token_please_confirm" version_id="4" version_string="0.9-dev"><![CDATA[Please confirm that you want to delete the following refresh token]]></phrase>
-    <phrase title="bdapi_request" version_id="23" version_string="0.9.8a"><![CDATA[Request]]></phrase>
-    <phrase title="bdapi_requested_scopes" version_id="1" version_string="0.1"><![CDATA[Requested Permissions]]></phrase>
-    <phrase title="bdapi_request_must_authorize_to_encrypt" version_id="25" version_string="1.0"><![CDATA[Request must be authorized to encrypt data.]]></phrase>
-    <phrase title="bdapi_requires_upload_x" version_id="20" version_string="0.9.5"><![CDATA[This request requires file upload `{field}`.]]></phrase>
-    <phrase title="bdapi_response" version_id="23" version_string="0.9.8a"><![CDATA[Response]]></phrase>
-    <phrase title="bdapi_revoke" version_id="53" version_string="1.3.1"><![CDATA[Revoke Access]]></phrase>
-    <phrase title="bdapi_scope" version_id="1" version_string="0.1"><![CDATA[Scope]]></phrase>
-    <phrase title="bdapi_scope_manage_account_settings" global_cache="1" version_id="1" version_string="0.1"><![CDATA[Change your account settings]]></phrase>
-    <phrase title="bdapi_scope_manage_system" global_cache="1" version_id="4" version_string="0.9-dev"><![CDATA[Manage system-wide settings]]></phrase>
-    <phrase title="bdapi_scope_participate_in_conversations" global_cache="1" version_id="3" version_string="0.2.1"><![CDATA[Read and start/reply to your conversations]]></phrase>
-    <phrase title="bdapi_scope_post" global_cache="1" version_id="1" version_string="0.1"><![CDATA[Post contents (threads, posts) on behalf of you]]></phrase>
-    <phrase title="bdapi_scope_read" global_cache="1" version_id="1" version_string="0.1"><![CDATA[Read information (forums, threads, posts) with your account's permissions]]></phrase>
-    <phrase title="bdapi_slash_batch_requires_json" version_id="19" version_string="0.9.4"><![CDATA[/batch requires valid JSON for jobs input.]]></phrase>
-    <phrase title="bdapi_slash_conversation_messages_attachments_requires_ids" version_id="50" version_string="1.2.1b"><![CDATA[/conversation-messages/attachments requires `conversation_id` for new message or `message_id` for existing message.]]></phrase>
-    <phrase title="bdapi_slash_conversation_messages_requires_conversation_id" version_id="38" version_string="1.0.13"><![CDATA[/conversation-messages requires `conversation_id`.]]></phrase>
-    <phrase title="bdapi_slash_oauth_token_admin_requires_user_id" version_id="63" version_string="1.4.3-BETA"><![CDATA[/oauth/token/admin requires `user_id`.]]></phrase>
-    <phrase title="bdapi_slash_poll_vote_requires_response_id" version_id="78" version_string="1.4.6"><![CDATA[/poll/vote requires `response_id`]]></phrase>
-    <phrase title="bdapi_slash_posts_attachments_requires_ids" version_id="20" version_string="0.9.5"><![CDATA[/posts/attachments requires `thread_id` for new post or `post_id` for existing post.]]></phrase>
-    <phrase title="bdapi_slash_posts_order_x_no_thread_id" version_id="1050100" version_string="1.5.1"><![CDATA[/posts?order={order} cannot be used with `thread_id`.]]></phrase>
-    <phrase title="bdapi_slash_posts_order_x_requires_thread_id" version_id="1050100" version_string="1.5.1"><![CDATA[/posts?order={order} requires `thread_id`.]]></phrase>
-    <phrase title="bdapi_slash_post_requires_post_body" version_id="1060002" version_string="1.6.0"><![CDATA[/posts requires `post_body`.]]></phrase>
-    <phrase title="bdapi_slash_search_requires_q" version_id="20" version_string="0.9.5"><![CDATA[/search requires `q`.]]></phrase>
-    <phrase title="bdapi_slash_search_tagged_requires_tag" version_id="1050100" version_string="1.5.1"><![CDATA[/search/tagged requires `tag` or `tags`.]]></phrase>
-    <phrase title="bdapi_slash_threads_attachments_requires_forum_id" version_id="20" version_string="0.9.5"><![CDATA[/threads/attachments requires `forum_id`.]]></phrase>
-    <phrase title="bdapi_slash_threads_creator_user_id_requires_forum_id" version_id="1060002" version_string="1.6.0"><![CDATA[/threads?creator_user_id requires exactly one `forum_id`.]]></phrase>
-    <phrase title="bdapi_slash_threads_order_x_requires_forum_id" version_id="1050100" version_string="1.5.1"><![CDATA[/threads?order={order} requires exactly one `forum_id`.]]></phrase>
-    <phrase title="bdapi_slash_threads_thread_prefix_id_requires_forum_id" version_id="1060001" version_string="1.6.0"><![CDATA[/threads?thread_prefix_id requires exactly one `forum_id`.]]></phrase>
-    <phrase title="bdapi_slash_threads_thread_tag_id_requires_forum_id" version_id="1060002" version_string="1.6.0"><![CDATA[/threads?thread_tag_id requires exactly one `forum_id`.]]></phrase>
-    <phrase title="bdapi_slash_tools_login_requires_redirect_uri" version_id="45" version_string="1.1.6"><![CDATA[/tools/login requires `redirect_uri`.]]></phrase>
-    <phrase title="bdapi_slash_users_denied_dob" version_id="79" version_string="1.4.6b"><![CDATA[You cannot change Date of Birth.]]></phrase>
-    <phrase title="bdapi_slash_users_denied_username" version_id="79" version_string="1.4.6b"><![CDATA[You cannot change `username`.]]></phrase>
-    <phrase title="bdapi_slash_users_denied_user_group" version_id="79" version_string="1.4.6b"><![CDATA[You cannot change User Group.]]></phrase>
-    <phrase title="bdapi_slash_users_denied_user_title" version_id="80" version_string="1.4.6c"><![CDATA[You cannot change `user_title`.]]></phrase>
-    <phrase title="bdapi_slash_users_requires_password_old" version_id="79" version_string="1.4.6b"><![CDATA[PUT /users/:userId requires a valid `password_old`. Usage of `password_algo` is also highly recommended.]]></phrase>
-    <phrase title="bdapi_slash_x_report_requires_message" version_id="75" version_string="1.4.4c"><![CDATA[/{route}/report requires `message`.]]></phrase>
-    <phrase title="bdapi_subscriptions" version_id="50" version_string="1.2.1b"><![CDATA[Subscriptions]]></phrase>
-    <phrase title="bdapi_subscription_callback_is_required" version_id="50" version_string="1.2.1b"><![CDATA[`hub.callback` is required.]]></phrase>
-    <phrase title="bdapi_subscription_cannot_verify_intent_of_subscriber" version_id="50" version_string="1.2.1b"><![CDATA[Cannot verify intent of subscriber.]]></phrase>
-    <phrase title="bdapi_subscription_confirm_deletion" version_id="50" version_string="1.2.1b"><![CDATA[Confirm Deletion of Subscription]]></phrase>
-    <phrase title="bdapi_subscription_delete" version_id="50" version_string="1.2.1b"><![CDATA[Delete Subscription]]></phrase>
-    <phrase title="bdapi_subscription_details" version_id="50" version_string="1.2.1b"><![CDATA[Subscription Details]]></phrase>
-    <phrase title="bdapi_subscription_mode_must_valid" version_id="50" version_string="1.2.1b"><![CDATA[`hub.mode` must be either "subscribe" or "unsubscribe".]]></phrase>
-    <phrase title="bdapi_subscription_not_found" version_id="50" version_string="1.2.1b"><![CDATA[The requested subscription could not be found]]></phrase>
-    <phrase title="bdapi_subscription_no_results" version_id="50" version_string="1.2.1b"><![CDATA[No subscription could be found...]]></phrase>
-    <phrase title="bdapi_subscription_please_confirm" version_id="50" version_string="1.2.1b"><![CDATA[Please confirm that you want to delete the following subscription]]></phrase>
-    <phrase title="bdapi_subscription_topic_not_recognized" version_id="50" version_string="1.2.1b"><![CDATA[`hub.topic` could not be recognized.]]></phrase>
-    <phrase title="bdapi_tokens" version_id="4" version_string="0.9-dev"><![CDATA[API Access Tokens]]></phrase>
-    <phrase title="bdapi_token_add" version_id="1" version_string="0.1"><![CDATA[Add New Token]]></phrase>
-    <phrase title="bdapi_token_confirm_deletion" version_id="4" version_string="0.9-dev"><![CDATA[Confirm Revocation of Token]]></phrase>
-    <phrase title="bdapi_token_delete" version_id="1" version_string="0.1"><![CDATA[Delete Token]]></phrase>
-    <phrase title="bdapi_token_not_found" version_id="1" version_string="0.1"><![CDATA[The requested Token could not be found]]></phrase>
-    <phrase title="bdapi_token_no_results" version_id="1" version_string="0.1"><![CDATA[No tokens to display...]]></phrase>
-    <phrase title="bdapi_token_please_confirm" version_id="4" version_string="0.9-dev"><![CDATA[Please confirm that you want to revoke the following token]]></phrase>
-    <phrase title="bdapi_topic" version_id="50" version_string="1.2.1b"><![CDATA[Topic]]></phrase>
-    <phrase title="bdapi_ttl" version_id="11" version_string="0.9-dev"><![CDATA[Time To Live]]></phrase>
-    <phrase title="bdapi_update_scope" version_id="53" version_string="1.3.1"><![CDATA[Update Permissions]]></phrase>
-    <phrase title="bdapi_update_scope_explain" version_id="53" version_string="1.3.1"><![CDATA[You can review and/or change {name}'s permissions below. Click {revoke} to completely remove {name} access to your account.]]></phrase>
-    <phrase title="bdapi_using_client" version_id="74" version_string="1.4.4b"><![CDATA[Using]]></phrase>
-    <phrase title="bdapi_whitelisted_domains" version_id="59" version_string="1.3.3d"><![CDATA[White-listed Domains]]></phrase>
-    <phrase title="bdapi_whitelisted_domains_explain" version_id="59" version_string="1.3.3d"><![CDATA[In addition to Redirect Uri, the system will also allow redirection to these domains. Each domain must be in a new line and may have wildcard, for example: "*.domain.com". To enable redirection to all domains, use "*" although it is not recommended for security reason.]]></phrase>
-    <phrase title="bdapi_you_will_be_redirected_x" version_id="24" version_string="0.9.9"><![CDATA[You will be redirected back to <a href="{redirectUri}">{clientName}</a>.]]></phrase>
-    <phrase title="cron_entry_bdApi_cleanUpExpired" version_id="4" version_string="0.9-dev"><![CDATA[[bd] API: Clean Up Expired Data]]></phrase>
-    <phrase title="option_bdApi_authCodeTTL" version_id="50" version_string="1.2.1b"><![CDATA[Authentication Code TTL]]></phrase>
-    <phrase title="option_bdApi_authCodeTTL_explain" version_id="50" version_string="1.2.1b"><![CDATA[Enter the number of seconds before authentication code expires itself.]]></phrase>
-    <phrase title="option_bdApi_cors" version_id="60" version_string="1.4.0-BETA"><![CDATA[Enable CORS]]></phrase>
-    <phrase title="option_bdApi_cors_explain" version_id="60" version_string="1.4.0-BETA"><![CDATA[Cross-Origin Resource Sharing (CORS) is a specification that enables truly open access across domain-boundaries. Enable this option to add the CORS headers to API responses. For more information regarding CORS, <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS" target="_blank" tabindex="-1">see here</a>.]]></phrase>
-    <phrase title="option_bdApi_logRetentionDays" version_id="50" version_string="1.2.1b"><![CDATA[Log Retention]]></phrase>
-    <phrase title="option_bdApi_logRetentionDays_explain" version_id="50" version_string="1.2.1b"><![CDATA[Enter the number of days to keep API log entries. If you don't want to log anything, enter 0 (zero).]]></phrase>
-    <phrase title="option_bdApi_paramLimitDefault" version_id="1050100" version_string="1.5.1"><![CDATA[Default `limit`]]></phrase>
-    <phrase title="option_bdApi_paramLimitDefault_explain" version_id="1050100" version_string="1.5.1"><![CDATA[Enter the default value for a request `limit` parameter.]]></phrase>
-    <phrase title="option_bdApi_paramLimitMax" version_id="1050100" version_string="1.5.1"><![CDATA[Maximum `limit`]]></phrase>
-    <phrase title="option_bdApi_paramLimitMax_explain" version_id="1050100" version_string="1.5.1"><![CDATA[Enter the maximum value for a request `limit` parameter. Enter 0 to have no limit.]]></phrase>
-    <phrase title="option_bdApi_paramPageMax" version_id="1050100" version_string="1.5.1"><![CDATA[Maximum `page`]]></phrase>
-    <phrase title="option_bdApi_paramPageMax_explain" version_id="1050100" version_string="1.5.1"><![CDATA[Enter the maximum value for a request `page` parameter. Enter 0 to have no limit]]></phrase>
-    <phrase title="option_bdApi_refreshTokenTTLDays" version_id="50" version_string="1.2.1b"><![CDATA[Refresh Token TTL]]></phrase>
-    <phrase title="option_bdApi_refreshTokenTTLDays_explain" version_id="50" version_string="1.2.1b"><![CDATA[Enter the number of days before refresh token expires itself.]]></phrase>
-    <phrase title="option_bdApi_restrictAccess" version_id="53" version_string="1.3.1"><![CDATA[Restrict Access]]></phrase>
-    <phrase title="option_bdApi_restrictAccess_explain" version_id="53" version_string="1.3.1"><![CDATA[Enable this option to deny access to the API if no authentication is provided. Guest access it still possible with <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#one-time-token" target="_blank" tabindex="-1">One Time Token</a>.]]></phrase>
-    <phrase title="option_bdApi_subscriptionThreadPost" version_id="53" version_string="1.3.1"><![CDATA[Accept Subscription for Thread Post]]></phrase>
-    <phrase title="option_bdApi_subscriptionThreadPost_explain" version_id="1060000" version_string="1.6.0"><![CDATA[Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for thread post changes.]]></phrase>
-    <phrase title="option_bdApi_subscriptionUser" version_id="53" version_string="1.3.1"><![CDATA[Accept Subscription for User]]></phrase>
-    <phrase title="option_bdApi_subscriptionUserNotification" version_id="82" version_string="1.4.6e"><![CDATA[Accept Subscription for User Alert]]></phrase>
-    <phrase title="option_bdApi_subscriptionUserNotification_explain" version_id="1060000" version_string="1.6.0"><![CDATA[Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for user alerts.]]></phrase>
-    <phrase title="option_bdApi_subscriptionUser_explain" version_id="1060000" version_string="1.6.0"><![CDATA[Enable this option to allow clients to <a href="https://github.com/xfrocks/bdApi/blob/master/docs/api.markdown#subscriptions" target="_blank" tabindex="-1">subscribe</a> for user changes.]]></phrase>
-    <phrase title="option_bdApi_tokenTTL" version_id="50" version_string="1.2.1b"><![CDATA[Token TTL]]></phrase>
-    <phrase title="option_bdApi_tokenTTL_explain" version_id="50" version_string="1.2.1b"><![CDATA[Enter the number of seconds before authentication code expires itself.]]></phrase>
-    <phrase title="option_bdApi_trackPostOrigin" version_id="1060000" version_string="1.6.0"><![CDATA[Keep Track of Post Origin]]></phrase>
-    <phrase title="option_bdApi_trackPostOrigin_explain" version_id="1060000" version_string="1.6.0"><![CDATA[Enter a field in `xf_post` table to store the API Key of the client that created the post. You have to create the field with a query like this: "ALTER TABLE `xf_post` ADD COLUMN `bdapi_origin` VARCHAR(255)".]]></phrase>
-    <phrase title="option_bdApi_trackSession" version_id="74" version_string="1.4.4b"><![CDATA[Update User Activity]]></phrase>
-    <phrase title="option_bdApi_trackSession_explain" version_id="74" version_string="1.4.4b"><![CDATA[Enable this option to keep track of logged in user session if accessed via api entry points. Disabling this feature may result in improved server performance but will cause missing information for user last activities.]]></phrase>
-    <phrase title="option_bdApi_userNotificationConversation" version_id="82" version_string="1.4.6e"><![CDATA[...also notify about conversation]]></phrase>
-    <phrase title="option_bdApi_userNotificationConversation_explain" version_id="82" version_string="1.4.6e"><![CDATA[Enable this option to notify clients, who subscribed for user alerts, about conversation messages.]]></phrase>
-    <phrase title="option_group_bdApi" version_id="50" version_string="1.2.1b"><![CDATA[[bd] API]]></phrase>
-    <phrase title="option_group_bdApi_description" version_id="50" version_string="1.2.1b"><![CDATA[]]></phrase>
-    <phrase title="permission_general_bdApi_clientNew" version_id="4" version_string="0.9-dev"><![CDATA[[bd] API: Create Client]]></phrase>
-    <phrase title="style_property_bdApi_linkAccountWrapper_description_master" version_id="67" version_string="1.4.3-BETA"><![CDATA[]]></phrase>
-    <phrase title="style_property_bdApi_linkAccountWrapper_master" version_id="67" version_string="1.4.3-BETA"><![CDATA[Show link in account sidebar]]></phrase>
-    <phrase title="style_property_bdApi_linkNavVisitor_description_master" version_id="67" version_string="1.4.3-BETA"><![CDATA[]]></phrase>
-    <phrase title="style_property_bdApi_linkNavVisitor_master" version_id="67" version_string="1.4.3-BETA"><![CDATA[Show link in visitor menu (navbar)]]></phrase>
-    <phrase title="style_property_group_bdApi_master" version_id="67" version_string="1.4.3-BETA"><![CDATA[[bd] API]]></phrase>
-    <phrase title="style_property_group_bdApi_master_desc" version_id="67" version_string="1.4.3-BETA"><![CDATA[]]></phrase>
-  </phrases>
-  <route_prefixes>
-    <route_type type="admin">
-      <prefix original_prefix="api-auth-codes" class="bdApi_Route_PrefixAdmin_AuthCode" build_link="data_only"/>
-      <prefix original_prefix="api-client-contents" class="bdApi_Route_PrefixAdmin_ClientContent" build_link="data_only"/>
-      <prefix original_prefix="api-clients" class="bdApi_Route_PrefixAdmin_Client" build_link="data_only"/>
-      <prefix original_prefix="api-logs" class="bdApi_Route_PrefixAdmin_Log" build_link="data_only"/>
-      <prefix original_prefix="api-refresh-tokens" class="bdApi_Route_PrefixAdmin_RefreshToken" build_link="data_only"/>
-      <prefix original_prefix="api-subscriptions" class="bdApi_Route_PrefixAdmin_Subscription" build_link="data_only"/>
-      <prefix original_prefix="api-tokens" class="bdApi_Route_PrefixAdmin_Token" build_link="data_only"/>
-    </route_type>
-  </route_prefixes>
-  <style_properties>
-    <property property_name="bdApi_linkNavVisitor" property_type="scalar" definition="1" group_name="bdApi" title="Show link in visitor menu (navbar)" description="" css_components="" scalar_type="boolean" scalar_parameters="" display_order="10" sub_group="links"><![CDATA[1]]></property>
-    <property property_name="bdApi_linkAccountWrapper" property_type="scalar" definition="1" group_name="bdApi" title="Show link in account sidebar" description="" css_components="" scalar_type="boolean" scalar_parameters="" display_order="20" sub_group="links"><![CDATA[1]]></property>
-    <group group_name="bdApi" display_order="9999">
-      <title>[bd] API</title>
-      <description></description>
-    </group>
-  </style_properties>
-  <templates>
-    <template title="bdapi.css" version_id="53" version_string="1.3.1"><![CDATA[/* clients */
-.bdApi_Client_List
-{
-	position: relative;
-	zoom: 1;
-}
-
-/** column style and width **/
-
-.bdApi_Client_List .sectionHeaders,
-.bdApi_Client_Item
-{
-	display: table;
-	table-layout: fixed;
-	width: 100%;
-	word-wrap: normal;
-}
-
-	.bdApi_Client_List .sectionHeaders dt,
-	.bdApi_Client_List .sectionHeaders dd,
-	.bdApi_Client_Item .listBlock
-	{
-		display: table-cell;
-		vertical-align: middle;
-	}
-
-	.bdApi_Client_Item .cellContents
-	{
-		padding: 5px;
-		overflow: hidden;
-		zoom: 1;
-		position: relative;
-	}
-	
-		.bdApi_Client_List .bdApi_Client_Name
-		{
-			width: auto;
-		}
-		
-		.bdApi_Client_List .bdApi_Client_Key
-		{
-			width: 150px;
-		}
-
-		.bdApi_Client_List .bdApi_Client_Secret
-		{
-			width: 150px;
-		}
-
-		.bdApi_Client_List .bdApi_Client_Control
-		{
-			width: 150px;
-		}
-
-/* column headers */
-
-.bdApi_Client_List .sectionHeaders
-{	
-	{xen:property subHeading}
-	
-	padding: 0;
-}
-		
-	.bdApi_Client_List .sectionHeaders a
-	{
-		display: block;
-		color: {xen:property subHeading.color};
-		outline: none;
-	}
-	
-	.bdApi_Client_List .sectionHeaders a:hover
-	{
-		text-decoration: none;
-	}
-			
-	.bdApi_Client_List .sectionHeaders dd a[href]:hover
-	{
-		{xen:property subHeadingHover}
-	}
-	
-		.bdApi_Client_List .sectionHeaders a span
-		{
-			{xen:property subHeading.padding}
-			display: block;
-		}
-		
-/** IE <8 **/
-.bdApi_Client_List .sectionHeaders,
-.bdApi_Client_Item                    { *display: block; _vertical-align: bottom; }
-.bdApi_Client_List .sectionHeaders dt,
-.bdApi_Client_List .sectionHeaders dd,
-.bdApi_Client_Item .listBlock         { *display: block; *float: left; }
-.bdApi_Client_Item .listBlock         { _height: 52px; *min-height: 52px; } /* todo: should be calculation */
-.bdApi_Client_List .bdApi_Client_Name { *width: 39.98%; }
-.bdApi_Client_List .bdApi_Client_Key  { *width: 19.98%; }
-.bdApi_Client_List .bdApi_Client_Secret{ *width: 19.98%; }
-.bdApi_Client_List .bdApi_Client_Control{ *width: 19.98%; }
-.bdApi_Client_List .sectionHeaders dt,
-.bdApi_Client_List .sectionHeaders dd { *padding: 5px 0; }
-.bdApi_Client_List .sectionHeaders a,
-.bdApi_Client_List .sectionHeaders a span { *display: inline !important; *float: none !important; }
-
-.bdApi_Client_Items
-{
-}
-
-.bdApi_Client_Item
-{
-	{xen:property primaryContent.background}
-	
-	{xen:property primaryContent.border}
-}
-
-		/* sections, section widths */
-	
-		.bdApi_Client_Item .bdApi_Client_Name,		
-		.bdApi_Client_Item .bdApi_Client_Secret
-		{
-		}
-		
-		.bdApi_Client_Item .bdApi_Client_Key,
-		.bdApi_Client_Item .bdApi_Client_Control
-		{
-			{xen:property secondaryContent.background}
-		}
-
-/* tokens */
-.bdApi_UserScope_List
-{
-	position: relative;
-	zoom: 1;
-}
-
-/** column style and width **/
-
-.bdApi_UserScope_List .sectionHeaders,
-.bdApi_UserScope_Item
-{
-	display: table;
-	table-layout: fixed;
-	width: 100%;
-	word-wrap: normal;
-}
-
-	.bdApi_UserScope_List .sectionHeaders dt,
-	.bdApi_UserScope_List .sectionHeaders dd,
-	.bdApi_UserScope_Item .listBlock
-	{
-		display: table-cell;
-		vertical-align: middle;
-	}
-
-	.bdApi_UserScope_Item .cellContents,
-	.bdApi_UserScope_NoItem
-	{
-		padding: 5px;
-		overflow: hidden;
-		zoom: 1;
-		position: relative;
-	}
-	
-		.bdApi_UserScope_List .bdApi_UserScope_Client
-		{
-			width: auto;
-		}
-		
-		.bdApi_UserScope_List .bdApi_UserScope_LastIssueDate
-		{
-			width: 150px;
-		}
-
-		.bdApi_UserScope_List .bdApi_UserScope_Control
-		{
-			width: 150px;
-		}
-
-/* column headers */
-
-.bdApi_UserScope_List .sectionHeaders
-{	
-	{xen:property subHeading}
-	
-	padding: 0;
-}
-		
-	.bdApi_UserScope_List .sectionHeaders a
-	{
-		display: block;
-		color: {xen:property subHeading.color};
-		outline: none;
-	}
-	
-	.bdApi_UserScope_List .sectionHeaders a:hover
-	{
-		text-decoration: none;
-	}
-			
-	.bdApi_UserScope_List .sectionHeaders dd a[href]:hover
-	{
-		{xen:property subHeadingHover}
-	}
-	
-		.bdApi_UserScope_List .sectionHeaders a span
-		{
-			{xen:property subHeading.padding}
-			display: block;
-		}
-		
-/** IE <8 **/
-.bdApi_UserScope_List .sectionHeaders,
-.bdApi_UserScope_Item                    { *display: block; _vertical-align: bottom; }
-.bdApi_UserScope_List .sectionHeaders dt,
-.bdApi_UserScope_List .sectionHeaders dd,
-.bdApi_UserScope_Item .listBlock         { *display: block; *float: left; }
-.bdApi_UserScope_Item .listBlock         { _height: 52px; *min-height: 52px; } /* todo: should be calculation */
-.bdApi_UserScope_List .bdApi_UserScope_Client{ *width: 59.98%; }
-.bdApi_UserScope_List .bdApi_UserScope_LastIssueDate { *width: 19.98%; }
-.bdApi_UserScope_List .bdApi_UserScope_Control { *width: 19.98%; }
-.bdApi_UserScope_List .sectionHeaders dt,
-.bdApi_UserScope_List .sectionHeaders dd { *padding: 5px 0; }
-.bdApi_UserScope_List .sectionHeaders a,
-.bdApi_UserScope_List .sectionHeaders a span { *display: inline !important; *float: none !important; }
-
-.bdApi_UserScope_Items
-{
-}
-
-.bdApi_UserScope_Item
-{
-	{xen:property primaryContent.background}
-	
-	{xen:property primaryContent.border}
-}
-
-		/* sections, section widths */
-	
-		.bdApi_UserScope_List .bdApi_UserScope_Client,
-		.bdApi_UserScope_List .bdApi_UserScope_Control
-		{
-		}
-		
-		.bdApi_UserScope_Item .bdApi_UserScope_LastIssueDate
-		{
-			{xen:property secondaryContent.background}
-		}
-]]></template>
-    <template title="bdapi_account_api" version_id="53" version_string="1.3.1"><![CDATA[<xen:require css="bdapi.css" />
-
-<xen:include template="bdapi_account_api_clients" />
-
-<xen:include template="bdapi_account_api_user_scopes" />
-
-<xen:title>{xen:phrase bdapi_home}</xen:title>]]></template>
-    <template title="bdapi_account_api_clients" version_id="59" version_string="1.3.3d"><![CDATA[<xen:require css="bdapi.css" />
-
-<xen:title>{xen:phrase bdapi_clients}</xen:title>
-
-<xen:if is="{$permClientNew}">
-	<xen:topctrl>
-		<a href="{xen:link account/api/client-add}" class="callToAction"><span>{xen:phrase bdapi_client_add}</span></a>
-	</xen:topctrl>
-</xen:if>
-
-<xen:if hascontent="true">
-	<h3>{xen:phrase bdapi_clients}</h3>
-	
-	<div class="bdApi_Client_List section">
-		<dl class="sectionHeaders">
-			<dt class="bdApi_Client_Name"><a><span>{xen:phrase bdapi_name}</span></a></dt>
-			<dd class="bdApi_Client_Key"><a><span>{xen:phrase bdapi_client_key}</span></a></dd>
-			<dd class="bdApi_Client_Secret"><a><span>{xen:phrase bdapi_client_secret}</span></a></dd>
-			<dd class="bdApi_Client_Control"><a><span>{xen:phrase controls}</span></a></dd>
-		</dl>
-		<ol class="bdApi_Client_Items">
-			<xen:contentcheck>
-				<xen:foreach loop="$clients" value="$client">
-					<li class="bdApi_Client_Item">
-						<div class="bdApi_Client_Name listBlock">
-							<div class="cellContents">
-								<a name="client-{$client.client_id}">{$client.name}</a>
-								<p class="muted">{$client.description} (<a href="{$client.redirect_uri}" rel="nofollow" target="_blank">{$client.redirect_uri}</a>)</p>
-							</div>
-						</div>
-						<div class="bdApi_Client_Key listBlock">
-							<div class="cellContents">
-								{$client.client_id}
-							</div>
-						</div>
-						<div class="bdApi_Client_Secret listBlock">
-							<div class="cellContents">
-								{$client.client_secret}
-							</div>
-						</div>
-						<div class="bdApi_Client_Control listBlock">
-							<div class="cellContents">
-								<a href="{xen:link 'account/api/client-edit', '', 'client_id={$client.client_id}'}" class="OverlayTrigger">{xen:phrase edit}</a>
-								<a href="{xen:link 'account/api/client-delete', '', 'client_id={$client.client_id}'}" class="OverlayTrigger">{xen:phrase delete}</a>
-							</div>
-						</div>
-					</li>
-				</xen:foreach>
-			</xen:contentcheck>
-		</ol>
-	</div>
-</xen:if>]]></template>
-    <template title="bdapi_account_api_client_delete" version_id="4" version_string="0.9-dev"><![CDATA[<xen:title>{xen:phrase bdapi_client_confirm_deletion}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_client_confirm_deletion}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:link 'account/api'}">{xen:phrase bdapi_home}</xen:breadcrumb>
-</xen:navigation>
-
-<form method="post" class="xenForm formOverlay"
-	action="{xen:link 'account/api/client-delete', '', 'client_id={$client.client_id}'}">
-
-	<p>
-		{xen:phrase bdapi_client_please_confirm}:
-		{$client.name}
-		(<a href="{$client.redirect_uri}" rel="nofollow" target="_blank">{$client.redirect_uri}</a>)
-	</p>
-
-	<dl class="ctrlUnit submitUnit">
-		<dt></dt>
-		<dd><input type="submit" name="save" value="{xen:phrase delete}" accesskey="s" class="button primary" /></dd>
-	</dl>
-	
-	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-</form>]]></template>
-    <template title="bdapi_account_api_client_edit" version_id="67" version_string="1.4.3-BETA"><![CDATA[<xen:require css="bdapi.css" />
-
-<xen:if is="{$client.client_id}">
-	<xen:title>{xen:phrase bdapi_client_edit}: {$client.name}</xen:title>
-	<xen:h1>{$client.name}</xen:h1>
-<xen:else />
-	<xen:title>{xen:phrase bdapi_client_add}</xen:title>
-</xen:if>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:link 'account/api'}">{xen:phrase bdapi_home}</xen:breadcrumb>
-</xen:navigation>
-
-<form method="post" class="xenForm formOverlay AutoValidator"
-	action="{xen:link account/api/client-save}"
-	data-redirect="yes">
-
-	<dl class="ctrlUnit">
-		<dt><label for="ctrl_name">{xen:phrase bdapi_name}:</label></dt>
-		<dd>
-			<input id="ctrl_name" type="text" name="name" class="textCtrl" value="{$client.name}" />
-		</dd>
-	</dl>
-
-	<dl class="ctrlUnit">
-		<dt><label for="ctrl_description">{xen:phrase bdapi_description}:</label></dt>
-		<dd>
-			<textarea id="ctrl_description" name="description" class="textCtrl Elastic" rows="3">{$client.description}</textarea>
-		</dd>
-	</dl>
-
-	<dl class="ctrlUnit">
-		<dt><label for="ctrl_redirect_uri">{xen:phrase bdapi_redirect_uri}:</label></dt>
-		<dd>
-			<input id="ctrl_redirect_uri" type="text" name="redirect_uri" class="textCtrl" value="{$client.redirect_uri}" />
-		</dd>
-	</dl>
-
-	<xen:if is="{$client.client_id}">
-	<dl class="ctrlUnit">
-		<dt>
-			<label for="ctrl_whitelisted_domains">{xen:phrase bdapi_whitelisted_domains}:</label>
-			<dfn>{xen:phrase optional}</dfn>
-		</dt>
-		<dd>
-			<textarea id="ctrl_whitelisted_domains" name="options[whitelisted_domains]" class="textCtrl Elastic" rows="3">{$client.options.whitelisted_domains}</textarea>
-			<p class="explain">{xen:phrase bdapi_whitelisted_domains_explain}</p>
-		</dd>
-	</dl>
-
-	<dl class="ctrlUnit">
-		<dt>
-			<label for="ctrl_public_key">{xen:phrase bdapi_public_key}:</label>
-			<dfn>{xen:phrase optional}</dfn>
-		</dt>
-		<dd>
-			<textarea id="ctrl_public_key" name="options[public_key]" class="textCtrl Elastic" rows="3">{$client.options.public_key}</textarea>
-			<p class="explain">
-				{xen:phrase bdapi_public_key_explain}
-				<xen:if is="!{$client.options.public_key}">
-					{xen:phrase bdapi_public_key_generate_click_here,
-						'link={xen:link account/api/client-genkey, '', 'client_id={$client.client_id}'}'}
-				</xen:if>
-			</p>
-		</dd>
-	</dl>
-	</xen:if>
-
-	<dl class="ctrlUnit submitUnit">
-		<dt></dt>
-		<dd><input type="submit" name="save" value="{xen:phrase save}" accesskey="s" class="button primary" /></dd>
-	</dl>
-
-	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-	<input type="hidden" name="client_id" value="{$client.client_id}" />
-</form>]]></template>
-    <template title="bdapi_account_api_client_genkey" version_id="67" version_string="1.4.3-BETA"><![CDATA[<xen:title>{xen:phrase bdapi_key_pair_generation}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_key_pair_generation}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:link 'account/api'}">{xen:phrase bdapi_home}</xen:breadcrumb>
-	<xen:breadcrumb href="{xen:link 'account/api/client-edit', '', 'client_id={$client.client_id}'}">{$client.name}</xen:breadcrumb>
-</xen:navigation>
-
-<form method="post" class="xenForm formOverlay"
-	action="{xen:link 'account/api/client-genkey', '', 'client_id={$client.client_id}'}">
-
-	<p>
-		{xen:phrase bdapi_key_pair_generation_explain}:
-		{$client.name}
-		(<a href="{$client.redirect_uri}" rel="nofollow" target="_blank">{$client.redirect_uri}</a>)
-	</p>
-
-	<dl class="ctrlUnit submitUnit">
-		<dt></dt>
-		<dd><input type="submit" name="save" value="{xen:phrase bdapi_key_pair_generate}" accesskey="s" class="button primary" /></dd>
-	</dl>
-	
-	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-</form>]]></template>
-    <template title="bdapi_account_api_client_genkey_result" version_id="67" version_string="1.4.3-BETA"><![CDATA[<xen:title>{xen:phrase bdapi_key_pair_generation}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_key_pair_generation}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:link 'account/api'}">{xen:phrase bdapi_home}</xen:breadcrumb>
-	<xen:breadcrumb href="{xen:link 'account/api/client-edit', '', 'client_id={$client.client_id}'}">{$client.name}</xen:breadcrumb>
-</xen:navigation>
-
-<form class="xenForm formOverlay">
-	
-	<dl class="ctrlUnit">
-		<dt>
-			<label for="ctrl_private_key">{xen:phrase bdapi_private_key}:</label>
-		</dt>
-		<dd>
-			<textarea id="ctrl_private_key" class="textCtrl Elastic" rows="3">{$privKey}</textarea>
-			<p class="explain">{xen:phrase bdapi_private_key_please_save}</p>
-		</dd>
-	</dl>
-	
-	<dl class="ctrlUnit">
-		<dt>
-			<label for="ctrl_public_key">{xen:phrase bdapi_public_key}:</label>
-		</dt>
-		<dd>
-			<textarea id="ctrl_public_key" class="textCtrl Elastic" rows="3">{$pubKey}</textarea>
-			<p class="explain">{xen:phrase bdapi_public_key_updated_client}</p>
-		</dd>
-	</dl>
-	
-</form>]]></template>
-    <template title="bdapi_account_api_update_scope" version_id="56" version_string="1.3.3"><![CDATA[<xen:title>{xen:phrase bdapi_update_scope}: {$client.name}</xen:title>
-<xen:h1>{xen:phrase bdapi_update_scope}</xen:h1>
-
-<xen:navigation>
-	<xen:breadcrumb href="{xen:link 'account/api'}">{xen:phrase bdapi_home}</xen:breadcrumb>
-	<xen:breadcrumb href="{xen:link 'account/api'}#client-{$client.client_id}">{$client.name}</xen:breadcrumb>
-</xen:navigation>
-
-<form method="post" class="xenForm formOverlay"
-	action="{xen:link 'account/api/update-scope'}">
-
-	<p>{xen:phrase bdapi_update_scope_explain,
-		'name={xen:if '{$client.redirect_uri}', '<a href="{$client.redirect_uri}" target="_blank">{$client.name}</a>', $client.name}',
-		'revoke={xen:phrase bdapi_revoke}'}</p>
-
-	<dl class="ctrlUnit">
-		<dt>&nbsp;</dt>
-		<dd>
-			<ul>
-				<xen:foreach loop="$userScopes" key="$scope" value="$userScope">
-					<xen:set var="$scopeText">{xen:helper api_scopeGetText, $scope}</xen:set>
-					
-					<xen:if is="{$scopeText}">
-						<li><label>
-							<input type="checkbox" name="scopes[]" value="{$scope}" checked="checked" />
-							{xen:raw $scopeText}
-						</label></li>
-					</xen:if>
-				</xen:foreach>
-			</ul>
-		</dd>
-	</dl>
-
-	<dl class="ctrlUnit submitUnit">
-		<dt></dt>
-		<dd>
-			<input type="submit" name="save" value="{xen:phrase save}" accesskey="s" class="button primary" />
-			<input type="submit" name="revoke" value="{xen:phrase bdapi_revoke}" class="button" />
-		</dd>
-	</dl>
-	
-	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-	<input type="hidden" name="_xfConfirm" value="1" />
-	<input type="hidden" name="client_id" value="{$client.client_id}" />
-</form>
-
-]]></template>
-    <template title="bdapi_account_api_user_scopes" version_id="56" version_string="1.3.3"><![CDATA[<xen:require css="bdapi.css" />
-
-<xen:title>{xen:phrase bdapi_tokens}</xen:title>
-
-<h3>{xen:phrase bdapi_tokens}</h3>
-
-<div class="bdApi_UserScope_List section">
-	<dl class="sectionHeaders">
-		<dt class="bdApi_UserScope_Client"><a><span>{xen:phrase bdapi_name}</span></a></dt>
-		<dd class="bdApi_UserScope_LastIssueDate"><a><span>{xen:phrase bdapi_last_issue_date}</span></a></dd>
-		<dd class="bdApi_UserScope_Control"><a><span>{xen:phrase controls}</span></a></dd>
-	</dl>
-	<ol class="bdApi_UserScope_Items">
-		<xen:if is="{$userScopesByClientIds}">
-			<xen:foreach loop="$userScopesByClientIds" value="$clientScopes">
-				<li class="bdApi_UserScope_Item">
-					<div class="bdApi_UserScope_Client listBlock">
-						<div class="cellContents">
-							{$clientScopes.client.name}
-							<p class="muted">
-								{$clientScopes.client.description}
-								<xen:if is="{$clientScopes.client.redirect_uri}">(<a href="{$clientScopes.client.redirect_uri}" rel="nofollow" target="_blank">{$clientScopes.client.redirect_uri}</a>)</xen:if>
-							</p>
-							
-							<div class="baseHtml">
-								<ul>
-									<xen:foreach loop="$clientScopes.user_scopes" key="$scope" value="$userScope">
-										<li class="scope-{$scope}">{xen:helper api_scopeGetText, $scope}</li>
-									</xen:foreach>
-								</ul>
-							</div>
-						</div>
-					</div>
-					<div class="bdApi_UserScope_LastIssueDate listBlock">
-						<div class="cellContents">
-							{xen:datetime $clientScopes.last_issue_date}
-						</div>
-					</div>
-					<div class="bdApi_UserScope_Control listBlock">
-						<div class="cellContents">
-							<a href="{xen:link 'account/api/update-scope', '', 'client_id={$clientScopes.client.client_id}'}" class="OverlayTrigger">{xen:phrase bdapi_update_scope}</a>
-						</div>
-					</div>
-				</li>
-			</xen:foreach>
-		<xen:else />
-			<li class="bdApi_UserScope_NoItem">{xen:phrase bdapi_token_no_results}</li>
-		</xen:if>
-	</ol>
-</div>]]></template>
-    <template title="bdapi_account_authorize" version_id="77" version_string="1.4.5"><![CDATA[<xen:title>{xen:phrase bdapi_authorize_access}</xen:title>
-
-<form method="post" class="xenForm"
-	action="{xen:link
-		'account/authorize',
-		'',
-		'client_id={$authorizeParams.client_id}',
-		'response_type={$authorizeParams.response_type}',
-		'redirect_uri={$authorizeParams.redirect_uri}',
-		'state={$authorizeParams.state}',
-		'scope={$authorizeParams.scope}'
-	}">
-	
-	<xen:if is="{$clientIsAuto}">
-		<p>{xen:phrase bdapi_please_confirm_to_authorize_access_auto}</p>
-	<xen:else />
-		<p>{xen:phrase bdapi_please_confirm_to_authorize_access}:</p>
-	</xen:if>
-	
-	<dl class="ctrlUnit">
-		<dt>{xen:phrase bdapi_client}:</dt>
-		<dd>
-			{$client.name}
-			<p class="explain">{$client.description}</p>
-		</dd>
-	</dl>
-	
-	<dl class="ctrlUnit">
-		<dt>{xen:phrase bdapi_requested_scopes}:</dt>
-		<dd>
-			<ul>
-				<xen:foreach loop="$authorizeScopes" value="$scope">
-					<xen:set var="$scopeText">{xen:helper api_scopeGetText, $scope}</xen:set>
-					
-					<xen:if is="{$scopeText}">
-						<li><label>
-							<input type="checkbox" name="scopes[]" value="{$scope}" checked="checked" />
-							{xen:raw $scopeText}
-						</label></li>
-					</xen:if>
-				</xen:foreach>
-				
-				<input type="hidden" name="scopes_included" value="1" />
-			</ul>
-		</dd>
-	</dl>
-	
-	<p>{xen:phrase bdapi_you_will_be_redirected_x, 'redirectUri={xen:if '{$authorizeParams.redirect_uri}',
-		$authorizeParams.redirect_uri, $client.redirect_uri}', 'clientName={$client.name}'}</p>
-
-	<dl class="ctrlUnit submitUnit">
-		<dt></dt>
-		<dd>
-			<input type="submit" name="accept" value="{xen:phrase bdapi_authorize_access}" class="button primary" />
-			<input type="submit" name="cancel" value="{xen:phrase cancel}" class="button" />
-		</dd>
-	</dl>
-
-	<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-</form>]]></template>
-    <template title="bdapi_account_wrapper_sidebar" version_id="67" version_string="1.4.3-BETA"><![CDATA[<xen:if is="{xen:property bdApi_linkAccountWrapper}">
-	<li><a class="{xen:if "{$selectedKey} == 'account/api'", 'secondaryContent', 
-		'primaryContent'}" href="{xen:link account/api}">{xen:phrase bdapi_home}</a></li>
-</xen:if>]]></template>
-    <template title="bdapi_alert_ping_message" version_id="71" version_string="1.4.3c"><![CDATA[{xen:helper username, $user, 'subject'}: {$extra.message}]]></template>
-    <template title="bdapi_bb_code_tag_attach" version_id="1040706" version_string="1.4.7"><![CDATA[<xen:if is="!{$validAttachment}">
-
-	<a href="{xen:link attachments, $attachment}" target="_blank"><xen:comment>
-		</xen:comment>{xen:phrase view_attachment_x, 'name={$attachment.attachment_id}'}</a>
-
-<xen:elseif is="!{$attachment.thumbnailUrl}" />
-
-	<a href="{xen:helper api_buildLink, attachments/data, $attachment}" target="_blank"<xen:comment>
-		</xen:comment> data-permalink="{xen:link attachments, $attachment}"><xen:comment>
-		</xen:comment>{xen:phrase view_attachment_x, 'name={$attachment.filename}'}</a>
-
-<xen:elseif is="{$canView}" />
-
-	<img src="{xen:helper api_buildLink, attachments/data, $attachment}"<xen:comment>
-		</xen:comment> alt="{$attachment.filename}" data-permalink="{xen:link attachments, $attachment}" />
-
-<xen:else />
-
-	<a href="{xen:link attachments, $attachment}" target="_blank"><xen:comment>
-		</xen:comment><img src="{$attachment.thumbnailUrl}" alt="{$attachment.filename}" /></a>
-
-</xen:if>
-
-<xen:edithint template="bb_code_tag_attach" />]]></template>
-    <template title="bdapi_error_authorize_guest" version_id="77" version_string="1.4.5"><![CDATA[<xen:title>{xen:phrase bdapi_authorize_access}</xen:title>
-
-<xen:set var="$text">
-	<p>
-		<xen:if is="{$social} == 'google'">
-			{xen:phrase bdapi_login_to_authorize_x_google,
-				'login_with_google={xen:phrase login_with_google}',
-				'client={$client.name}'}
-		</xen:if>
-		{xen:phrase bdapi_login_to_authorize_x, 'client={$client.name}'}:
-	</p>
-
-	<dl class="ctrlUnit">
-		<dt>{xen:phrase bdapi_client}:</dt>
-		<dd>
-			{$client.name}
-			<p class="explain">{$client.description}</p>
-		</dd>
-	</dl>
-
-	<dl class="ctrlUnit">
-		<dt>{xen:phrase bdapi_requested_scopes}:</dt>
-		<dd>
-			<ul>
-				<xen:foreach loop="$authorizeScopes" value="$scope">
-					<xen:if hascontent="true">
-						<li><xen:contentcheck>{xen:helper api_scopeGetText, $scope}</xen:contentcheck></li>
-					</xen:if>
-				</xen:foreach>
-			</ul>
-		</dd>
-	</dl>
-
-</xen:set>
-
-
-<xen:include template="helper_login_form" />]]></template>
-    <template title="bdapi_navigation_visitor_tab" version_id="67" version_string="1.4.3-BETA"><![CDATA[<xen:if is="{xen:property bdApi_linkNavVisitor} && {xen:helper api_visitorHasPermission, clientNew}">
-	<li><a href="{xen:link account/api}">{xen:phrase bdapi_clients}</a></li>
-</xen:if>]]></template>
-    <template title="bdapi_search_result_client_content" version_id="77" version_string="1.4.5"><![CDATA[<li id="clientContent-{$clientContent.client_content_id}" class="searchResult clientContent primaryContent clientContent-{$clientContent.client_id}">
-
-	<div class="listBlock posterAvatar">
-		<xen:avatar user="$clientContent" size="s" img="true" />
-	</div>
-
-	<div class="listBlock main">
-		<div class="titleText">
-			<span class="contentType"><a href="{$clientContent.redirect_uri}" target="_blank">{$clientContent.name}</a></span>
-			<h3 class="title"><a href="{$clientContent.link}" target="_blank">{$clientContent.title}</a></h3>
-		</div>
-
-		<blockquote class="snippet">
-			<a href="{$clientContent.link}" target="_blank">{xen:helper snippet, $clientContent.body, 150, {xen:array 'term={$search.search_query}', 'emClass=highlight', 'stripHtml=1'}}</a>
-		</blockquote>	
-
-		<div class="meta">
-			<xen:datetime time="{$clientContent.date}" />
-		</div>
-	</div>
-</li>]]></template>
-  </templates>
-  <public_template_modifications>
-    <modification template="account_wrapper" modification_key="bdapi_account_wrapper_sidebar" description="Alter sidebar settings." execution_order="10" enabled="1" action="preg_replace">
-      <find><![CDATA[#(<xen:hook name="account_wrapper_sidebar_settings".+?)(</xen:hook>)#s]]></find>
-      <replace><![CDATA[$1
-
-<xen:include template="bdapi_account_wrapper_sidebar" />
-
-$2]]></replace>
-    </modification>
-    <modification template="navigation_visitor_tab" modification_key="bdapi_navigation_visitor_tab" description="Alter tab links1." execution_order="10" enabled="1" action="preg_replace">
-      <find><![CDATA[#(<xen:hook name="navigation_visitor_tab_links1".+?)(</xen:hook>)#s]]></find>
-      <replace><![CDATA[$1
-
-<xen:include template="bdapi_navigation_visitor_tab" />
-
-$2]]></replace>
-    </modification>
-  </public_template_modifications>
-  <bb_code_media_sites/>
-  <bb_codes/>
-</addon>
diff --git a/xenforo_consumer/.gitignore b/xenforo_consumer/.gitignore
deleted file mode 100644
index 8ab686ea..00000000
--- a/xenforo_consumer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Hello, World!
diff --git a/xenforo_consumer/js/bdApiConsumer/full/login.js b/xenforo_consumer/js/bdApiConsumer/full/login.js
deleted file mode 100644
index 3f790a37..00000000
--- a/xenforo_consumer/js/bdApiConsumer/full/login.js
+++ /dev/null
@@ -1,59 +0,0 @@
-//noinspection ThisExpressionReferencesGlobalObjectJS
-/** @param {jQuery} $ jQuery Object */
-!function ($, window, document) {
-
-    XenForo.bdApiConsumer_AutoLogin = function ($container) {
-        var providerCode = $container.data('code');
-        var clientId = $container.data('clientId');
-        var loginLink = $container.data('loginLink');
-        if (!providerCode || !clientId || !loginLink) {
-            return;
-        }
-
-        window[providerCode + 'Init'] = function () {
-            var SDK = window[providerCode + 'SDK'];
-            SDK.init({client_id: clientId});
-
-            SDK.isAuthorized('read', function (isAuthorized, apiData) {
-                if (isAuthorized) {
-                    var loginData = {
-                        redirect: window.location.href,
-                        provider: providerCode,
-                        external_user_id: apiData['user_id']
-                    };
-                    for (var i in apiData) {
-                        if (apiData.hasOwnProperty(i)) {
-                            loginData['_api_data_' + i] = apiData[i];
-                        }
-                    }
-
-                    // try to auto login this user
-                    XenForo.ajax(
-                        loginLink, loginData,
-                        function (ajaxData) {
-                            if (ajaxData['_redirectTarget']) {
-                                if (ajaxData['_redirectMessage']) {
-                                    XenForo.alert(ajaxData['_redirectMessage'], '', 2000, function () {
-                                        document.location = ajaxData['_redirectTarget'];
-                                    });
-                                } else {
-                                    document.location = ajaxData['_redirectTarget'];
-                                }
-                            } else {
-                                if (ajaxData.message) {
-                                    XenForo.alert(ajaxData.message, '', 5000);
-                                }
-                            }
-                        },
-                        {error: null, global: false}
-                    );
-                }
-            });
-        }
-    };
-
-    // *********************************************************************
-
-    XenForo.register('script.bdApiConsumer_AutoLogin', 'XenForo.bdApiConsumer_AutoLogin');
-
-}(jQuery, this, document);
\ No newline at end of file
diff --git a/xenforo_consumer/library/bdApiConsumer/AlertHandler/Provider.php b/xenforo_consumer/library/bdApiConsumer/AlertHandler/Provider.php
deleted file mode 100755
index a70c893f..00000000
--- a/xenforo_consumer/library/bdApiConsumer/AlertHandler/Provider.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class bdApiConsumer_AlertHandler_Provider extends XenForo_AlertHandler_Abstract
-{
-    public function getContentByIds(array $contentIds, $model, $userId, array $viewingUser)
-    {
-        $contents = array();
-
-        foreach ($contentIds as $contentId) {
-            $contents[$contentId] = array();
-        }
-
-        return $contents;
-    }
-
-    protected function _getDefaultTemplateTitle($contentType, $action)
-    {
-        return 'bdapi_consumer_alert_provider';
-    }
-
-    protected function _prepareAlertAfterAction(array $item, $content, array $viewingUser)
-    {
-        $provider = bdApiConsumer_Option::getProviderByCode($item['action']);
-        if (!empty($provider)
-            && !empty($item['extra']['notification']['notification_html'])
-        ) {
-            $item['notificationHtml'] = strip_tags($item['extra']['notification']['notification_html'], '<a>');
-            $item['notificationProvider'] = $provider;
-        }
-
-        return $item;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/ControllerPublic/Callback.php b/xenforo_consumer/library/bdApiConsumer/ControllerPublic/Callback.php
deleted file mode 100644
index 3bbcab20..00000000
--- a/xenforo_consumer/library/bdApiConsumer/ControllerPublic/Callback.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-class bdApiConsumer_ControllerPublic_Callback extends XenForo_ControllerPublic_Abstract
-{
-    public function actionIndex()
-    {
-        $method = $this->_request->getMethod();
-        if (empty($method)) {
-            throw new XenForo_Exception('Unable to determine request method');
-        }
-        if (strtoupper($method) === 'GET') {
-            return $this->responseReroute(__CLASS__, 'IntentVerification');
-        } elseif (strtoupper($method) !== 'POST') {
-            throw new XenForo_Exception('Unrecognized request method: ' . $method);
-        }
-
-        return $this->responseReroute(__CLASS__, 'PingPong');
-    }
-
-    public function actionIntentVerification()
-    {
-        $params = $this->_input->filter(array(
-            'client_id' => XenForo_Input::STRING,
-            'hub_topic' => XenForo_Input::STRING,
-            'hub_challenge' => XenForo_Input::STRING,
-        ));
-
-        if (empty($params['client_id'])) {
-            // unable to determine hub authorized client
-            header('HTTP/1.0 404 Not Found');
-            exit;
-        }
-        $providers = bdApiConsumer_Option::get('providers');
-        $foundProvider = null;
-        foreach ($providers as $provider) {
-            if (!empty($provider['client_id']) AND $provider['client_id'] == $params['client_id']) {
-                $foundProvider = $provider;
-                break;
-            }
-        }
-        if (empty($foundProvider)) {
-            // client not found
-            header('HTTP/1.0 401 Unauthorized');
-            exit;
-        }
-
-        // TODO: verify $params['hub_topic']?
-
-        echo $params['hub_challenge'];
-        exit;
-    }
-
-    public function actionPingPong()
-    {
-        $results = array();
-        $raw = file_get_contents('php://input');
-        $json = @json_decode($raw, true);
-        if (!is_array($json)) {
-            throw new XenForo_Exception('Unable to parse JSON: ' . $raw);
-        }
-
-        $providers = $providers = bdApiConsumer_Option::get('providers');
-        $providerPings = array();
-
-        foreach ($json as $ping) {
-            if (empty($ping['client_id'])) {
-                continue;
-            }
-            $foundProviderKey = null;
-            foreach ($providers as $providerKey => $provider) {
-                if (!empty($provider['client_id']) AND $provider['client_id'] == $ping['client_id']) {
-                    $foundProviderKey = $providerKey;
-                    break;
-                }
-            }
-            if (empty($foundProviderKey)) {
-                continue;
-            }
-
-            if (empty($ping['topic'])) {
-                continue;
-            }
-            $parts = explode('_', $ping['topic']);
-            $ping['topic_id'] = array_pop($parts);
-            $ping['topic_type'] = implode('_', $parts);
-
-            $providerPings[$foundProviderKey][$ping['topic_type']][$ping['topic_id']] = $ping;
-        }
-
-        foreach ($providerPings as $providerKey => &$manyTopics) {
-            foreach ($manyTopics as $topicType => &$topicPings) {
-                $result = null;
-
-                switch ($topicType) {
-                    case 'user':
-                        $this->_handleUserPings($providers[$providerKey], $topicPings);
-                        break;
-                    case 'user_notification':
-                        $this->_handleUserNotificationPings($providers[$providerKey], $topicPings);
-                        break;
-                }
-
-                foreach ($topicPings as $ping) {
-                    if (!empty($ping['result'])) {
-                        $results[] = array_intersect_key($ping, array(
-                            'result' => true,
-                            'topic' => true,
-                            'action' => true,
-                        ));
-                    } else {
-                        // TODO: unsubscribe
-                    }
-                }
-            }
-        }
-
-        echo json_encode($results);
-        exit;
-    }
-
-    protected function _handleUserPings(array $provider, array &$pings)
-    {
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $providerKeys = array();
-        foreach ($pings as &$ping) {
-            $providerKeys[] = $ping['object_data'];
-        }
-
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociationsForProviderUser($provider, $providerKeys);
-
-        foreach ($auths as $auth) {
-            $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $auth);
-            if (empty($accessToken)) {
-                continue;
-            }
-
-            $externalVisitor = bdApiConsumer_Helper_Api::getVisitor($provider, $accessToken, false);
-            if (empty($externalVisitor)) {
-                continue;
-            }
-
-            $userExternalModel->bdApiConsumer_updateExternalAuthAssociation($provider,
-                $auth['provider_key'], $auth['user_id'], array_merge($auth['extra_data'], $externalVisitor));
-
-            foreach ($pings as &$ping) {
-                if ($ping['object_data'] == $auth['provider_key']) {
-                    $ping['result'] = 'updated user data';
-                }
-            }
-        }
-    }
-
-    protected function _handleUserNotificationPings(array $provider, array &$pings)
-    {
-        $providerKeys = array();
-        foreach ($pings as &$pingRef) {
-            $providerKeys[] = $pingRef['topic_id'];
-        }
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociationsForProviderUser($provider, $providerKeys);
-
-        $userIds = array();
-        foreach ($auths as &$authRef) {
-            $provider = bdApiConsumer_Option::getProviderByCode($authRef['provider']);
-            if (empty($provider)) {
-                continue;
-            }
-
-            $authRef['_provider'] = $provider;
-
-            $userIds[] = $authRef['user_id'];
-        }
-
-        /** @var XenForo_Model_User $userModel */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        $users = $userModel->getUsersByIds($userIds, array('join' => XenForo_Model_User::FETCH_USER_OPTION));
-
-        /** @var bdApiConsumer_XenForo_Model_Alert $alertModel */
-        $alertModel = $this->getModelFromCache('XenForo_Model_Alert');
-
-        foreach ($pings as &$pingRef) {
-            $auth = null;
-            foreach ($auths as $_auth) {
-                if ($_auth['provider_key'] == $pingRef['topic_id']) {
-                    $auth = $_auth;
-                }
-            }
-            if (empty($auth)) {
-                continue;
-            }
-
-            $user = null;
-            if (!isset($users[$auth['user_id']])) {
-                continue;
-            }
-            $user = $users[$auth['user_id']];
-
-            if (!bdApiConsumer_Option::get('displayExternalNotifications')) {
-                $pingRef['result'] = 'system turned off';
-            } elseif ($pingRef['action'] == 'insert'
-                && !empty($pingRef['object_data']['notification_id'])
-            ) {
-                if (XenForo_Model_Alert::userReceivesAlert($user, 'bdapi_consumer', $auth['provider'])) {
-                    $alertModel->bdApiConsumer_alertUser($auth['_provider'], $user, $pingRef['object_data']);
-                    $pingRef['result'] = 'inserted alert';
-                } else {
-                    $pingRef['result'] = 'user opted out';
-                }
-            } elseif ($pingRef['action'] = 'read') {
-                $alertModel->bdApiConsumer_markAlertsRead($auth['_provider'], $user);
-                $pingRef['result'] = 'marked as read';
-            }
-        }
-    }
-
-    protected function _checkCsrf($action)
-    {
-        // no csrf check for this
-        return;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/DevHelper/Config.php b/xenforo_consumer/library/bdApiConsumer/DevHelper/Config.php
deleted file mode 100755
index a0c5b706..00000000
--- a/xenforo_consumer/library/bdApiConsumer/DevHelper/Config.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-class bdApiConsumer_DevHelper_Config extends DevHelper_Config_Base
-{
-    protected $_dataClasses = array();
-    protected $_dataPatches = array(
-        'xf_user_profile' => array(
-            'bdapiconsumer_unused' => array('name' => 'bdapiconsumer_unused', 'type' => 'string', 'length' => '255')
-        )
-    );
-    protected $_exportPath = '/Users/sondh/XenForo/bdApiConsumer/';
-    protected $_exportIncludes = array();
-
-    /**
-     * Return false to trigger the upgrade!
-     * common use methods:
-     *    public function addDataClass($name, $fields = array(), $primaryKey = false, $indeces = array())
-     *    public function addDataPatch($table, array $field)
-     *    public function setExportPath($path)
-     **/
-    protected function _upgrade()
-    {
-        return true; // remove this line to trigger update
-
-        /*
-        $this->addDataClass(
-            'name_here',
-            array( // fields
-                'field_here' => array(
-                    'type' => 'type_here',
-                    // 'length' => 'length_here',
-                    // 'required' => true,
-                    // 'allowedValues' => array('value_1', 'value_2'),
-                    // 'default' => 0,
-                    // 'autoIncrement' => true,
-                ),
-                // other fields go here
-            ),
-            'primary_key_field_here',
-            array( // indeces
-                array(
-                    'fields' => array('field_1', 'field_2'),
-                    'type' => 'NORMAL', // UNIQUE or FULLTEXT
-                ),
-            ),
-        );
-        */
-    }
-}
\ No newline at end of file
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/Api.php b/xenforo_consumer/library/bdApiConsumer/Helper/Api.php
deleted file mode 100755
index f59ee7d0..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/Api.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_Api
-{
-    const SCOPE = 'read post';
-
-    public static function getRequestUrl(array $provider, $redirectUri, array $extraParams = array())
-    {
-        $url = call_user_func_array('sprintf', array(
-            '%s/index.php?oauth/authorize/&client_id=%s&redirect_uri=%s&response_type=code&scope=%s',
-            rtrim($provider['root'], '/'),
-            rawurlencode($provider['client_id']),
-            rawurlencode($redirectUri),
-            rawurlencode(self::SCOPE),
-        ));
-
-        if (XenForo_Application::getConfig()->get(bdApiConsumer_Option::CONFIG_TRACK_AUTHORIZE_URL_STATE)
-            && !isset($extraParams['state'])
-        ) {
-            $extraParams['state'] = base64_encode(json_encode(array(
-                'time' => XenForo_Application::$time,
-                'ip' => XenForo_Helper_Ip::convertIpBinaryToString(XenForo_Application::getSession()->get('ip')),
-            )));
-        }
-
-        foreach ($extraParams as $key => $value) {
-            $url .= sprintf('&%s=%s', $key, rawurlencode($value));
-        }
-
-        return $url;
-    }
-
-    public static function getLoginLink(array $provider, $accessToken, $redirectUri)
-    {
-        return call_user_func_array('sprintf', array(
-            '%s/index.php?tools/login&oauth_token=%s&redirect_uri=%s',
-            rtrim($provider['root'], '/'),
-            rawurlencode($accessToken),
-            rawurlencode($redirectUri),
-        ));
-    }
-
-    public static function getLogoutLink(array $provider, $accessToken, $redirectUri)
-    {
-        return call_user_func_array('sprintf', array(
-            '%s/index.php?tools/logout&oauth_token=%s&redirect_uri=%s',
-            rtrim($provider['root'], '/'),
-            rawurlencode($accessToken),
-            rawurlencode($redirectUri),
-        ));
-    }
-
-    public static function getPublicLink(array $provider, $route)
-    {
-        $json = self::_post($provider, 'tools/link/', self::generateOneTimeToken($provider), 'link', array(
-            'type' => 'public',
-            'route' => $route,
-        ));
-
-        if (!empty($json['link'])) {
-            return $json['link'];
-        }
-
-        return false;
-    }
-
-    public static function getAccessTokenFromCode(array $provider, $code, $redirectUri)
-    {
-        return self::_post($provider, 'oauth/token/', '', 'access_token', array(
-            'grant_type' => 'authorization_code',
-            'client_id' => $provider['client_id'],
-            'client_secret' => $provider['client_secret'],
-            'code' => $code,
-            'redirect_uri' => $redirectUri,
-        ));
-    }
-
-    public static function getAccessTokenFromRefreshToken(array $provider, $refreshToken)
-    {
-        return self::_post($provider, 'oauth/token/', '', 'access_token', array(
-            'grant_type' => 'refresh_token',
-            'client_id' => $provider['client_id'],
-            'client_secret' => $provider['client_secret'],
-            'refresh_token' => $refreshToken,
-        ));
-    }
-
-    public static function getAccessTokenFromUsernamePassword(array $provider, $username, $password)
-    {
-        return self::_post($provider, 'oauth/token/', '', 'access_token', array(
-            'grant_type' => 'password',
-            'client_id' => $provider['client_id'],
-            'client_secret' => $provider['client_secret'],
-            'username' => $username,
-            'password' => $password,
-        ));
-    }
-
-    public static function generateOneTimeToken(array $provider, $userId = 0, $accessToken = '', $ttl = 10)
-    {
-        $timestamp = time() + $ttl;
-        $once = md5($userId . $timestamp . $accessToken . $provider['client_secret']);
-
-        return sprintf('%d,%d,%s,%s', $userId, $timestamp, $once, $provider['client_id']);
-    }
-
-    /**
-     * @param array $provider
-     * @param $accessToken
-     * @param bool|true $autoSubscribe
-     * @return array|false
-     */
-    public static function getVisitor(array $provider, $accessToken, $autoSubscribe = true)
-    {
-        $json = self::_get($provider, 'users/me/', $accessToken, 'user');
-
-        if (!empty($json['user'])) {
-            $json['_headerLinkHub'] = self::_getHeaderLinkHub($json['_headers']);
-
-            if ($autoSubscribe AND empty($parts['subscription_callback']) AND !empty($json['_headerLinkHub'])) {
-                self::postSubscription($provider, $accessToken, $json['_headerLinkHub']);
-            }
-
-            return $json['user'];
-        }
-
-        return false;
-    }
-
-    public static function getNotifications(array $provider, $accessToken)
-    {
-        $json = self::_get($provider, 'notifications/', $accessToken, 'notifications');
-
-        if (isset($json['notifications'])) {
-            $json['_headerLinkHub'] = self::_getHeaderLinkHub($json['_headers']);
-
-            return $json;
-        }
-
-        return false;
-    }
-
-    public static function postLoginSocial(array $provider)
-    {
-        return self::_post($provider, 'tools/login-social/', self::generateOneTimeToken($provider), 'social');
-    }
-
-    public static function postPasswordResetRequest(array $provider, $accessToken)
-    {
-        return self::_post($provider, 'tools/password-reset-request/', $accessToken, 'status');
-    }
-
-    public static function postSubscription(array $provider, $accessToken, $url)
-    {
-        $json = self::_post($provider, $url, $accessToken, false, array(
-            'hub.callback' => XenForo_Link::buildPublicLink('canonical:misc/api-consumer/callback'),
-            'hub.mode' => 'subscribe',
-        ));
-
-        return (!empty($json['_responseStatus']) AND $json['_responseStatus'] == 202);
-    }
-
-    public static function postNotificationsRead(array $provider, $accessToken)
-    {
-        $json = self::_post($provider, 'notifications/read/', $accessToken);
-
-        return (!empty($json['_responseStatus']) AND $json['_responseStatus'] == 200);
-    }
-
-    public static function verifyJsSdkSignature(array $provider, array $data, $prefix = '_api_data_')
-    {
-        $str = '';
-        $prefixLength = utf8_strlen($prefix);
-
-        $keys = array_keys($data);
-        asort($keys);
-        foreach ($keys as $key) {
-            if (utf8_substr($key, 0, $prefixLength) !== $prefix) {
-                // ignore keys that do not match our prefix
-                continue;
-            }
-
-            $keySubstr = substr($key, $prefixLength);
-            if ($keySubstr == 'signature') {
-                // do not put the signature into calculation
-                continue;
-            }
-
-            $str .= sprintf('%s=%s&', $keySubstr, $data[$key]);
-        }
-        $str .= $provider['client_secret'];
-
-        $signature = md5($str);
-
-        return isset($data[$prefix . 'signature']) AND ($signature === $data[$prefix . 'signature']);
-    }
-
-    protected static function _get(array $provider, $path, $accessToken = false, $expectedKey = false, array $params = array())
-    {
-        return self::_request('GET', $provider, $path, $accessToken, $expectedKey, $params);
-    }
-
-    protected static function _post(array $provider, $path, $accessToken = false, $expectedKey = false, array $params = array())
-    {
-        return self::_request('POST', $provider, $path, $accessToken, $expectedKey, $params);
-    }
-
-    protected static function _request($method, array $provider, $path, $accessToken = false, $expectedKey = false, array $params = array())
-    {
-        try {
-            if (Zend_Uri::check($path)) {
-                $uri = $path;
-            } else {
-                $uri = call_user_func_array('sprintf', array(
-                    '%s/index.php?%s',
-                    rtrim($provider['root'], '/'),
-                    $path,
-                ));
-            }
-            $client = XenForo_Helper_Http::getClient($uri);
-
-            if ($accessToken !== false AND !isset($params['oauth_token'])) {
-                $params['oauth_token'] = $accessToken;
-            }
-
-            if ($method === 'GET') {
-                $client->setParameterGet($params);
-            } else {
-                $client->setParameterPost($params);
-            }
-
-            $response = $client->request($method);
-
-            $body = $response->getBody();
-            $json = @json_decode($body, true);
-
-            if (!is_array($json)) {
-                $json = array('_body' => $body);
-            }
-
-            if ($expectedKey !== false) {
-                if (!isset($json[$expectedKey])) {
-                    if (XenForo_Application::debugMode()) {
-                        XenForo_Error::logError(sprintf('Key "%s" not found in %s `%s`: %s',
-                            $expectedKey, $method, $path, $body));
-                    }
-                    return false;
-                }
-            }
-
-            $json['_headers'] = $response->getHeaders();
-            $json['_responseStatus'] = $response->getStatus();
-
-            return $json;
-        } catch (Zend_Http_Client_Exception $e) {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Error::logException($e, false);
-            }
-            return false;
-        }
-    }
-
-    protected static function _getHeaderLinkHub(array $headers)
-    {
-        if (empty($headers['Link'])) {
-            return null;
-        }
-
-        foreach ($headers['Link'] as $headerLink) {
-            if (preg_match('/<(?<url>[^>]+)>; rel=hub/', $headerLink, $matches)) {
-                return $matches['url'];
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/AutoLogin.php b/xenforo_consumer/library/bdApiConsumer/Helper/AutoLogin.php
deleted file mode 100644
index be521aa8..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/AutoLogin.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_AutoLogin
-{
-    public static function updateResponseRedirect(XenForo_Controller $controller, XenForo_ControllerResponse_Redirect $controllerResponse)
-    {
-        $action = false;
-        $userId = 0;
-        if ($controller instanceof XenForo_ControllerPublic_Login) {
-            /** @var bdApiConsumer_XenForo_ControllerPublic_Login $controller */
-            if (XenForo_Visitor::getUserId() > 0
-                && XenForo_Visitor::getUserId() != $controller->bdApiConsumer_getBeforeLoginVisitorId()
-            ) {
-                // a successful login
-                $action = 'login';
-                $userId = XenForo_Visitor::getUserId();
-            }
-        } elseif ($controller instanceof XenForo_ControllerPublic_Logout) {
-            /** @var bdApiConsumer_XenForo_ControllerPublic_Logout $controller */
-            if (XenForo_Visitor::getUserId() == 0) {
-                // a successful logout
-                $action = 'logout';
-                $userId = $controller->bdApiConsumer_getBeforeLogoutVisitorId();
-            }
-        }
-
-        if ($action !== false
-            && $userId > 0
-        ) {
-            $redirectTarget = $controllerResponse->redirectTarget;
-            $originalTarget = $redirectTarget;
-
-            /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-            $userExternalModel = $controller->getModelFromCache('XenForo_Model_UserExternal');
-            $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations($userId);
-
-            if (!empty($auths)) {
-                foreach ($auths as $auth) {
-                    $provider = bdApiConsumer_Option::getProviderByCode($auth['provider']);
-                    if (empty($provider)) {
-                        continue;
-                    }
-
-                    $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $auth);
-                    if (empty($accessToken)) {
-                        continue;
-                    }
-
-                    $ott = bdApiConsumer_Helper_Api::generateOneTimeToken($provider, $auth['provider_key'], $accessToken);
-
-                    $redirectTarget = XenForo_Link::convertUriToAbsoluteUri($redirectTarget, true);
-
-                    switch ($action) {
-                        case 'login':
-                            $redirectTarget = bdApiConsumer_Helper_Api::getLoginLink($provider, $ott, $redirectTarget);
-                            break;
-                        case 'logout':
-                            $redirectTarget = bdApiConsumer_Helper_Api::getLogoutLink($provider, $ott, $redirectTarget);
-                            break;
-                    }
-                }
-            }
-
-            if ($redirectTarget !== $originalTarget) {
-                $controllerResponse->redirectTarget = $redirectTarget;
-            }
-        }
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/AutoRegister.php b/xenforo_consumer/library/bdApiConsumer/Helper/AutoRegister.php
deleted file mode 100644
index e2f392fb..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/AutoRegister.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_AutoRegister
-{
-    public static function suggestUserName($username, XenForo_Model_User $userModel)
-    {
-        if (preg_match('#[^0-9]([0-9]+)$#', $username, $matches, PREG_OFFSET_CAPTURE)) {
-            $i = $matches[1][0];
-            $origName = trim(substr($username, 0, $matches[1][1]));
-        } else {
-            $i = 2;
-            $origName = $username;
-        }
-
-        while ($userModel->getUserByName($username)) {
-            $username = $origName . ' ' . $i++;
-        }
-
-        return $username;
-    }
-
-    public static function createUser(
-        array $data,
-        array $provider,
-        array $externalToken,
-        array $externalVisitor,
-        XenForo_Model_UserExternal $userExternalModel)
-    {
-        $user = null;
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $options = XenForo_Application::get('options');
-
-        /** @var XenForo_DataWriter_User $writer */
-        $writer = XenForo_DataWriter::create('XenForo_DataWriter_User');
-        if ($options->registrationDefaults) {
-            $writer->bulkSet($options->registrationDefaults, array('ignoreInvalidFields' => true));
-        }
-
-        if (!isset($data['timezone']) AND isset($externalVisitor['user_timezone_offset'])) {
-            $tzOffset = $externalVisitor['user_timezone_offset'];
-            $tzName = timezone_name_from_abbr('', $tzOffset, 1);
-            if ($tzName !== false) {
-                $data['timezone'] = $tzName;
-            }
-        }
-
-        if (!empty($data['user_id'])) {
-            $writer->setImportMode(true);
-        }
-        $writer->bulkSet($data);
-        if (!empty($data['user_id'])) {
-            $writer->setImportMode(false);
-        }
-
-        $writer->set('email', $externalVisitor['user_email']);
-
-        if (!empty($externalVisitor['user_gender'])) {
-            $writer->set('gender', $externalVisitor['user_gender']);
-        }
-
-        if (!empty($externalVisitor['user_dob_day'])
-            && !empty($externalVisitor['user_dob_month'])
-            && !empty($externalVisitor['user_dob_year'])
-        ) {
-            $writer->set('dob_day', $externalVisitor['user_dob_day']);
-            $writer->set('dob_month', $externalVisitor['user_dob_month']);
-            $writer->set('dob_year', $externalVisitor['user_dob_year']);
-        }
-
-        if (!empty($externalVisitor['user_register_date'])) {
-            $writer->set('register_date', $externalVisitor['user_register_date']);
-        }
-
-        $userExternalModel->bdApiConsumer_syncUpOnRegistration($writer, $externalToken, $externalVisitor);
-
-        $auth = XenForo_Authentication_Abstract::create('XenForo_Authentication_NoPassword');
-        $writer->set('scheme_class', $auth->getClassName());
-        $writer->set('data', $auth->generate(''), 'xf_user_authenticate');
-
-        $writer->set('user_group_id', XenForo_Model_User::$defaultRegisteredGroupId);
-        $writer->set('language_id', XenForo_Visitor::getInstance()->get('language_id'));
-
-        $writer->advanceRegistrationUserState(false);
-
-        // TODO: option for extra user group
-
-        $writer->preSave();
-        if ($writer->hasErrors()) {
-            return $user;
-        }
-
-        try {
-            $writer->save();
-            $user = $writer->getMergedData();
-
-            $userExternalModel->bdApiConsumer_updateExternalAuthAssociation($provider, $externalVisitor['user_id'],
-                $user['user_id'], array_merge($externalVisitor, array('token' => $externalToken)));
-
-            XenForo_Model_Ip::log($user['user_id'], 'user', $user['user_id'], 'register_api_consumer');
-        } catch (XenForo_Exception $e) {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Error::logException($e, false);
-            }
-        }
-
-        return $user;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/Avatar.php b/xenforo_consumer/library/bdApiConsumer/Helper/Avatar.php
deleted file mode 100644
index f7f1e543..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/Avatar.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_Avatar
-{
-    protected static $_helperOriginal = null;
-
-    public static function setupHelper()
-    {
-        self::$_helperOriginal = XenForo_Template_Helper_Core::$helperCallbacks['avatar'];
-        if (self::$_helperOriginal[0] === 'self') {
-            self::$_helperOriginal[0] = 'XenForo_Template_Helper_Core';
-        }
-
-        XenForo_Template_Helper_Core::$helperCallbacks['avatar'] = array(
-            __CLASS__,
-            'helperAvatarUrl'
-        );
-
-        XenForo_Template_Helper_Core::$helperCallbacks['bdapiconsumer_avatarresize'] = array(
-            __CLASS__,
-            'helperAvatarResize'
-        );
-    }
-
-    public static function helperAvatarUrl($user, $size, $forceType = null, $canonical = false)
-    {
-        if (!empty($user['gravatar'])) {
-            $avatarUrl = self::parseGravatar($user['gravatar']);
-
-            if (!empty($avatarUrl)) {
-                return XenForo_Template_Helper_Core::callHelper('bdapiconsumer_avatarresize', array(
-                    $avatarUrl,
-                    $size
-                ));
-            }
-        }
-
-        return call_user_func(self::$_helperOriginal, $user, $size, $forceType, $canonical);
-    }
-
-    public static function helperAvatarResize($avatarUrl, $size)
-    {
-        if (defined('BDIMAGE_IS_WORKING')) {
-            // use [bd] Image to resize avatars
-            // TODO: read XenForo_Model_Avatar::$_sizes for this?
-            switch ($size) {
-                case 's':
-                    $size = 48;
-                    break;
-                case 'm':
-                    $size = 96;
-                    break;
-                case 'l':
-                default:
-                    if (!is_int($size)) {
-                        $size = 192;
-                    }
-            }
-
-            $avatarUrl = bdImage_Integration::buildThumbnailLink($avatarUrl, $size);
-        }
-
-        return $avatarUrl;
-    }
-
-    public static function getAvatarUrlFromAuthExtra(array $extra)
-    {
-        if (!empty($extra['links']['avatar_big'])) {
-            return $extra['links']['avatar_big'];
-        } elseif (!empty($extra['links']['avatar'])) {
-            return $extra['links']['avatar'];
-        }
-
-        return false;
-    }
-
-    public static function getGravatar($userId, $avatarUrl)
-    {
-        // try the first variant
-        $first = sprintf('%s@p.i', self::_encode($avatarUrl));
-        if (strlen($first) <= 120) {
-            // too long
-            return $first;
-        }
-
-        // try the second variant if the first failed
-        $second = sprintf('%d-%d@p.i', $userId, XenForo_Application::$time);
-        return $second;
-    }
-
-    public static function parseGravatar($gravatar)
-    {
-        if (!preg_match('#^(.+)@p\.i$#', $gravatar, $gravatarMatches)) {
-            return false;
-        }
-
-        $part = $gravatarMatches[1];
-
-        if (preg_match('#^(\d+)-(\d+)$#', $part, $partMatches)) {
-            // second variant
-            return XenForo_Link::buildPublicLink('canonical:members/external-avatar', array('user_id' => $partMatches[1])) . '?' . $partMatches[2];
-        }
-
-        // first variant
-        return self::_decode($part);
-    }
-
-    protected static function _encode($url)
-    {
-        return 'b64,' . base64_encode($url);
-    }
-
-    protected static function _decode($encoded)
-    {
-        if (strpos($encoded, 'b64,') === 0) {
-            return base64_decode(substr($encoded, 4));
-        }
-
-        return false;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/Provider.php b/xenforo_consumer/library/bdApiConsumer/Helper/Provider.php
deleted file mode 100644
index d9d7d481..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/Provider.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_Provider
-{
-    public static function getAccountSecurityLink(array $provider)
-    {
-        if (!isset($provider['links']['account/security'])) {
-            $provider['links']['account/security'] = bdApiConsumer_Helper_Api::getPublicLink($provider, 'account/security');
-
-            if (!empty($provider['links']['account/security'])) {
-                self::_updateProvider($provider);
-            }
-        }
-
-        return $provider['links']['account/security'];
-    }
-
-    public static function getLoginSocial(array $provider)
-    {
-        if (!isset($provider['login/social'])) {
-            $provider['login/social'] = bdApiConsumer_Helper_Api::postLoginSocial($provider);
-
-            if (!empty($provider['login/social'])) {
-                unset($provider['login/social']['_headers']);
-                unset($provider['login/social']['_responseStatus']);
-
-                self::_updateProvider($provider);
-            }
-        }
-
-        return $provider['login/social'];
-    }
-
-    protected static function _updateProvider(array $provider)
-    {
-        $providers = bdApiConsumer_Option::getProviders();
-        $providers[$provider['code']] = $provider;
-
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-        $dw->setExistingData('bdapi_consumer_providers');
-        $dw->set('option_value', $providers);
-        if (!$dw->save()) {
-            return false;
-        }
-
-        bdApiConsumer_Option::setProviders($providers);
-
-        return true;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Helper/Template.php b/xenforo_consumer/library/bdApiConsumer/Helper/Template.php
deleted file mode 100644
index 0289d2dc..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Helper/Template.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class bdApiConsumer_Helper_Template
-{
-    public static function getProviderSdkJs($provider, $prefix)
-    {
-        $root = $provider['root'];
-
-        if (XenForo_Application::$secure) {
-            $http = 'http://';
-            $https = 'https://';
-            if (strpos($root, $http) === 0) {
-                // we are running under https but the provider root is http
-                // switching to https for now
-                // TODO: option
-                $root = substr_replace($root, $https, 0, strlen($http));
-            }
-        }
-
-        return sprintf('%s/index.php?assets/sdk.js&prefix=%s', $root, $prefix);
-    }
-
-    public static function renderProviderInLoop($template)
-    {
-        $output = '';
-
-        $providers = bdApiConsumer_Option::getProviders();
-        foreach ($providers as $provider) {
-            $mapping = array();
-
-            foreach (array_keys($provider) as $providerKey) {
-                if (!is_string($provider[$providerKey])) {
-                    continue;
-                }
-
-                $placeholder = sprintf('{provider.%s}', $providerKey);
-                $mapping[$placeholder] = $provider[$providerKey];
-                $mapping[rawurlencode($placeholder)] = $provider[$providerKey];
-            }
-
-            $output .= str_replace(array_keys($mapping), array_values($mapping), $template);
-        }
-
-        return $output;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Installer.php b/xenforo_consumer/library/bdApiConsumer/Installer.php
deleted file mode 100644
index 66366429..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Installer.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-class bdApiConsumer_Installer
-{
-
-    /* Start auto-generated lines of code. Change made will be overwriten... */
-
-    protected static $_tables = array();
-    protected static $_patches = array(
-        array(
-            'table' => 'xf_user_profile',
-            'field' => 'bdapiconsumer_unused',
-            'showTablesQuery' => 'SHOW TABLES LIKE \'xf_user_profile\'',
-            'showColumnsQuery' => 'SHOW COLUMNS FROM `xf_user_profile` LIKE \'bdapiconsumer_unused\'',
-            'alterTableAddColumnQuery' => 'ALTER TABLE `xf_user_profile` ADD COLUMN `bdapiconsumer_unused` VARCHAR(255)',
-            'alterTableDropColumnQuery' => 'ALTER TABLE `xf_user_profile` DROP COLUMN `bdapiconsumer_unused`',
-        ),
-    );
-
-    public static function install($existingAddOn, $addOnData)
-    {
-        $db = XenForo_Application::get('db');
-
-        foreach (self::$_tables as $table) {
-            $db->query($table['createQuery']);
-        }
-
-        foreach (self::$_patches as $patch) {
-            $tableExisted = $db->fetchOne($patch['showTablesQuery']);
-            if (empty($tableExisted)) {
-                continue;
-            }
-
-            $existed = $db->fetchOne($patch['showColumnsQuery']);
-            if (empty($existed)) {
-                $db->query($patch['alterTableAddColumnQuery']);
-            }
-        }
-
-        self::installCustomized($existingAddOn, $addOnData);
-    }
-
-    public static function uninstall()
-    {
-        $db = XenForo_Application::get('db');
-
-        foreach (self::$_patches as $patch) {
-            $tableExisted = $db->fetchOne($patch['showTablesQuery']);
-            if (empty($tableExisted)) {
-                continue;
-            }
-
-            $existed = $db->fetchOne($patch['showColumnsQuery']);
-            if (!empty($existed)) {
-                $db->query($patch['alterTableDropColumnQuery']);
-            }
-        }
-
-        foreach (self::$_tables as $table) {
-            $db->query($table['dropQuery']);
-        }
-
-        self::uninstallCustomized();
-    }
-
-    /* End auto-generated lines of code. Feel free to make changes below */
-
-    private static function installCustomized(
-        /** @noinspection PhpUnusedParameterInspection */
-        $existingAddOn,
-        $addOnData
-    ) {
-        if (XenForo_Application::$versionId < 1030000) {
-            throw new XenForo_Exception('XenForo 1.3.0+ is required.');
-        }
-
-        $db = XenForo_Application::getDb();
-
-        $db->query("REPLACE INTO `xf_content_type` (content_type, addon_id, fields) VALUES ('bdapi_consumer', 'bdApiConsumer', '')");
-        $db->query("REPLACE INTO `xf_content_type_field` (content_type, field_name, field_value) VALUES ('bdapi_consumer', 'alert_handler_class', 'bdApiConsumer_AlertHandler_Provider')");
-        /** @var XenForo_Model_ContentType $contentTypeModel */
-        $contentTypeModel = XenForo_Model::create('XenForo_Model_ContentType');
-        $contentTypeModel->rebuildContentTypeCache();
-    }
-
-    private static function uninstallCustomized()
-    {
-        $db = XenForo_Application::getDb();
-
-        $db->query("DELETE FROM `xf_content_type` WHERE addon_id = ?", array('bdApiConsumer'));
-        $db->query("DELETE FROM `xf_content_type_field` WHERE content_type = ?", array('bdapi_consumer'));
-        $db->query("DELETE FROM `xf_user_alert` WHERE content_type = ?", array('bdapi_consumer'));
-        $db->query("DELETE FROM `xf_user_alert_optout` WHERE alert LIKE 'bdapiconsumer_%s'");
-        /** @var XenForo_Model_ContentType $contentTypeModel */
-        $contentTypeModel = XenForo_Model::create('XenForo_Model_ContentType');
-        $contentTypeModel->rebuildContentTypeCache();
-
-        bdApiConsumer_ShippableHelper_Updater::onUninstall();
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Listener.php b/xenforo_consumer/library/bdApiConsumer/Listener.php
deleted file mode 100755
index 1274aff1..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Listener.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-class bdApiConsumer_Listener
-{
-    public static function load_class($class, array &$extend)
-    {
-        static $classes = array(
-            'bdApi_Model_Subscription',
-
-            'XenForo_ControllerPublic_Account',
-            'XenForo_ControllerPublic_Login',
-            'XenForo_ControllerPublic_Logout',
-            'XenForo_ControllerPublic_Member',
-            'XenForo_ControllerPublic_Misc',
-            'XenForo_ControllerPublic_Register',
-            'XenForo_Model_Alert',
-            'XenForo_Model_Avatar',
-            'XenForo_Model_User',
-            'XenForo_Model_UserConfirmation',
-            'XenForo_Model_UserExternal',
-        );
-
-        if (in_array($class, $classes)) {
-            $extend[] = 'bdApiConsumer_' . $class;
-        }
-    }
-
-    public static function init_dependencies(
-        XenForo_Dependencies_Abstract $dependencies,
-        /** @noinspection PhpUnusedParameterInspection */
-        array $data
-    ) {
-        XenForo_Template_Helper_Core::$helperCallbacks[strtolower('bdApiConsumer_getOption')] = array(
-            'bdApiConsumer_Option',
-            'get'
-        );
-
-        if (bdApiConsumer_Option::get('takeOver', 'register')) {
-            $options = XenForo_Application::getOptions();
-            $options->set('registrationSetup', 'enabled', 0);
-            $options->set('bdapi_consumer_bypassRegistrationActive', 1);
-        }
-
-        if (bdApiConsumer_Option::get('takeOver', 'avatar')) {
-            bdApiConsumer_Helper_Avatar::setupHelper();
-        }
-
-        bdApiConsumer_ShippableHelper_Updater::onInitDependencies($dependencies);
-    }
-
-    public static function visitor_setup(XenForo_Visitor &$visitor)
-    {
-        if (bdApiConsumer_Option::get('takeOver', 'avatar')) {
-            // disable user ability to change avatar completely
-            $permissions = $visitor['permissions'];
-            $permissions['avatar']['allowed'] = false;
-            $visitor['permissions'] = $permissions;
-        }
-    }
-
-
-    public static function controller_post_dispatch(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_Controller $controller,
-        $controllerResponse,
-        $controllerName,
-        $action
-    ) {
-        if (bdApiConsumer_Option::get('autoLogin') AND $controllerResponse instanceof XenForo_ControllerResponse_Redirect) {
-            bdApiConsumer_Helper_AutoLogin::updateResponseRedirect($controller, $controllerResponse);
-        }
-    }
-
-    public static function file_health_check(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_ControllerAdmin_Abstract $controller,
-        array &$hashes
-    ) {
-        $hashes += bdApiConsumer_FileSums::getHashes();
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/Option.php b/xenforo_consumer/library/bdApiConsumer/Option.php
deleted file mode 100755
index 3462f679..00000000
--- a/xenforo_consumer/library/bdApiConsumer/Option.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-class bdApiConsumer_Option
-{
-    const CONFIG_TRACK_AUTHORIZE_URL_STATE = 'bdApiConsumer_trackAuthorizeUrlState';
-
-    protected static $_providers = null;
-    protected static $_activated = null;
-    protected static $_showButtons = null;
-
-    public static function get($key, $subKey = null)
-    {
-        $options = XenForo_Application::getOptions();
-
-        switch ($key) {
-            case '_activated':
-                if (self::$_activated === null) {
-                    $providers = self::getProviders();
-                    self::$_activated = !empty($providers);
-                }
-                return self::$_activated;
-            case '_showButtons':
-                if (self::$_showButtons === null) {
-                    self::$_showButtons = false;
-
-                    if (!self::get('takeOver', 'login')) {
-                        // no login take over, show the provider buttons
-                        self::$_showButtons = true;
-                    }
-
-                    if (self::get('loginFacebook') OR self::get('loginTwitter') OR self::get('loginGoogle')) {
-                        // show social buttons
-                        self::$_showButtons = true;
-                    }
-                }
-                return self::$_showButtons;
-            case 'autoLogin':
-                $autoLogin = $options->get('bdapi_consumer_autoLogin');
-
-                if (XenForo_Application::isRegistered('_bdCloudServerHelper_readonly')) {
-                    $autoLogin = '0';
-                }
-
-                return $autoLogin;
-            case 'providers':
-                if (self::$_providers === null) {
-                    self::$_providers = $options->get('bdapi_consumer_providers');
-                }
-                return self::$_providers;
-            case 'providerCode':
-                $providerCode = '';
-
-                $providers = self::get('providers');
-                $requestedCode = self::get($subKey);
-                if (isset($providers[$requestedCode])) {
-                    $providerCode = $providers[$requestedCode]['code'];
-                }
-
-                return $providerCode;
-        }
-
-        return $options->get('bdapi_consumer_' . $key, $subKey);
-    }
-
-    public static function setProviders($providers)
-    {
-        self::$_providers = $providers;
-    }
-
-    public static function getProviders()
-    {
-        return self::get('providers');
-    }
-
-    /**
-     * @param $code
-     * @return array|false
-     */
-    public static function getProviderByCode($code)
-    {
-        $providers = self::getProviders();
-
-        if (strpos($code, 'bdapi_') === 0) {
-            $code = substr($code, 6);
-        }
-
-        foreach ($providers as $provider) {
-            if ($provider['code'] === $code) {
-                return $provider;
-            }
-        }
-
-        return false;
-    }
-
-    public static function renderOptionProviders(XenForo_View $view, $fieldPrefix, array $preparedOption, $canEdit)
-    {
-        $providers = self::getProviders();
-
-        $editLink = $view->createTemplateObject('option_list_option_editlink', array(
-            'preparedOption' => $preparedOption,
-            'canEditOptionDefinition' => $canEdit
-        ));
-
-        return $view->createTemplateObject('bdapi_consumer_option_providers', array(
-            'fieldPrefix' => $fieldPrefix,
-            'listedFieldName' => $fieldPrefix . '_listed[]',
-            'preparedOption' => $preparedOption,
-            'formatParams' => $preparedOption['formatParams'],
-            'editLink' => $editLink,
-
-            'providers' => $providers
-        ));
-    }
-
-    public static function verifyOptionProviders(
-        array &$providers,
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_DataWriter $dw,
-        /** @noinspection PhpUnusedParameterInspection */
-        $fieldName
-    ) {
-        $output = array();
-
-        foreach ($providers as $provider) {
-            if (!empty($provider['root'])) {
-                $provider['root'] = rtrim($provider['root'], '/');
-            }
-
-            if (!empty($provider['name'])
-                && !empty($provider['root'])
-                && !empty($provider['client_id'])
-                && !empty($provider['client_secret'])
-            ) {
-                if (empty($provider['code'])) {
-                    $provider['code'] = substr(md5($provider['root']
-                        . $provider['client_id'] . $provider['client_secret']), -5);
-                }
-
-                $provider['verified'] = XenForo_Application::$time;
-
-                $output[$provider['code']] = $provider;
-            }
-        }
-
-        $providers = $output;
-        return true;
-    }
-
-    public static function renderOptionLoginSocial(XenForo_View $view, $fieldPrefix, array $preparedOption, $canEdit)
-    {
-        $providers = self::getProviders();
-
-        switch ($preparedOption['option_id']) {
-            case 'bdapi_consumer_loginFacebook':
-                $social = 'facebook';
-                break;
-            case 'bdapi_consumer_loginTwitter':
-                $social = 'twitter';
-                break;
-            case 'bdapi_consumer_loginGoogle':
-                $social = 'google';
-                break;
-        }
-        if (empty($social)) {
-            // unrecognized option
-            return '';
-        }
-
-        $choices = array('' => '');
-        foreach ($providers as $provider) {
-            $providerLoginSocial = bdApiConsumer_Helper_Provider::getLoginSocial($provider);
-            if (!empty($providerLoginSocial['social']) AND in_array($social, $providerLoginSocial['social'], true)) {
-                $choices[$provider['code']] = $provider['name'];
-            }
-        }
-        $preparedOption['formatParams'] = $choices;
-
-        return XenForo_ViewAdmin_Helper_Option::renderOptionTemplateInternal('option_list_option_select', $view,
-            $fieldPrefix, $preparedOption, $canEdit);
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/TempFile.php b/xenforo_consumer/library/bdApiConsumer/ShippableHelper/TempFile.php
deleted file mode 100644
index 5c9ecdbf..00000000
--- a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/TempFile.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2016-06-18T11:13:03+00:00
-
-/**
- * Class bdApiConsumer_ShippableHelper_TempFile
- * @version 4
- * @see DevHelper_Helper_ShippableHelper_TempFile
- */
-class bdApiConsumer_ShippableHelper_TempFile
-{
-    protected static $_cached = array();
-    protected static $_registeredShutdownFunction = false;
-
-    public static function cache($url, $tempFile)
-    {
-        self::$_cached[$url] = $tempFile;
-
-        if (!self::$_registeredShutdownFunction) {
-            register_shutdown_function(array(__CLASS__, 'deleteAllCached'));
-        }
-    }
-
-    public static function create($contents)
-    {
-        $tempFile = tempnam(XenForo_Helper_File::getTempDir(), self::_getPrefix());
-        self::cache(sprintf('%s::%s', __METHOD__, md5($tempFile)), $tempFile);
-
-        file_put_contents($tempFile, $contents);
-
-        return $tempFile;
-    }
-
-    public static function download($url)
-    {
-        if (isset(self::$_cached[$url]) AND file_exists(self::$_cached[$url])) {
-            // use cached temp file, no need to re-download
-            return self::$_cached[$url];
-        }
-
-        $tempFile = tempnam(XenForo_Helper_File::getTempDir(), self::_getPrefix());
-        self::cache($url, $tempFile);
-
-        $fh = fopen($tempFile, 'wb');
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_FILE, $fh);
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_exec($ch);
-
-        $downloaded = intval(curl_getinfo($ch, CURLINFO_HTTP_CODE)) == 200;
-
-        curl_close($ch);
-
-        fclose($fh);
-
-        if (XenForo_Application::debugMode()) {
-            $fileSize = filesize($tempFile);
-
-            XenForo_Helper_File::log(__CLASS__, call_user_func_array('sprintf', array(
-                'download %s -> %s, %s, %d bytes%s',
-                $url,
-                $tempFile,
-                ($downloaded ? 'succeeded' : 'failed'),
-                $fileSize,
-                ((!$downloaded && $fileSize > 0) ? "\n\t" . file_get_contents($tempFile) : ''),
-            )));
-        }
-
-        if ($downloaded) {
-            return $tempFile;
-        } else {
-            return false;
-        }
-    }
-
-    public static function deleteAllCached()
-    {
-        foreach (self::$_cached as $url => $tempFile) {
-            if (XenForo_Application::debugMode()) {
-                $fileSize = @filesize($tempFile);
-            }
-
-            $deleted = @unlink($tempFile);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, call_user_func_array('sprintf', array(
-                    'delete %s -> %s, %s, %d bytes',
-                    $url,
-                    $tempFile,
-                    ($deleted ? 'succeeded' : 'failed'),
-                    (!empty($fileSize) ? $fileSize : 0),
-                )));
-            }
-        }
-
-        self::$_cached = array();
-    }
-
-    protected static function _getPrefix()
-    {
-        static $prefix = null;
-
-        if ($prefix === null) {
-            $prefix = strtolower(preg_replace('#[^A-Z]#', '', __CLASS__)) . '_';
-        }
-
-        return $prefix;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/Updater.php b/xenforo_consumer/library/bdApiConsumer/ShippableHelper/Updater.php
deleted file mode 100644
index 26b1cc05..00000000
--- a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/Updater.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2016-07-15T10:46:14+00:00
-
-/**
- * Class bdApiConsumer_ShippableHelper_Updater
- * @version 7
- * @see DevHelper_Helper_ShippableHelper_Updater
- */
-class bdApiConsumer_ShippableHelper_Updater
-{
-    const KEY = 'ShippableHelper_Updater';
-    const API_URL = 'https://xfrocks.com/api/index.php?updater';
-
-    public static $_version = 2016050601;
-
-    /**
-     * Verifies config to make sure the Updater should run.
-     * 1. It has not been configured yet
-     * 2. Or it has been enabled at some point
-     *
-     * @param XenForo_Dependencies_Abstract $dependencies
-     * @param string|null $apiUrl
-     * @param string|null $addOnId
-     * @throws XenForo_Exception
-     */
-    public static function onInitDependencies(
-        XenForo_Dependencies_Abstract $dependencies,
-        $apiUrl = null,
-        $addOnId = null
-    ) {
-        if (get_class($dependencies) !== 'XenForo_Dependencies_Admin') {
-            // do nothing unless user are in AdminCP
-            return;
-        }
-
-        if (XenForo_Application::$versionId < 1020000) {
-            // only run if XenForo is at least 1.2.0
-            return;
-        }
-
-        if (!is_string($apiUrl)) {
-            // use default api url if nothing provided
-            // this will also make this method compatible with XenForo code event
-            // in which an array will be sent as the second parameter
-            $apiUrl = self::API_URL;
-        }
-
-        if (!parse_url($apiUrl, PHP_URL_HOST)) {
-            throw new XenForo_Exception(sprintf('$apiUrl is invalid: %s', $apiUrl));
-        }
-
-        $addOnId = self::_getAddOnId($addOnId);
-        $config = self::_readConfig($addOnId, $apiUrl);
-        if (!empty($config['configured'])
-            && empty($config['enabled'])
-        ) {
-            // admin has turned it off, bye bye
-            return;
-        }
-
-        if (!isset($GLOBALS[self::KEY])) {
-            $GLOBALS[self::KEY] = array(
-                'version' => array(),
-                'onPreRoute' => array(),
-                'setupMethod' => array(),
-                'addOns' => array(),
-            );
-        }
-
-        $GLOBALS[self::KEY]['version'][$apiUrl][self::$_version]
-            = 'bdApiConsumer_ShippableHelper_UpdaterCore';
-
-        if (!isset($GLOBALS[self::KEY]['onPreRoute'][$apiUrl])) {
-            $GLOBALS[self::KEY]['onPreRoute'][$apiUrl] = create_function('$fc',
-                __CLASS__ . '::onPreRoute($fc, ' . var_export($config, true) . ');');
-            XenForo_CodeEvent::addListener('front_controller_pre_route',
-                $GLOBALS[self::KEY]['onPreRoute'][$apiUrl]);
-        }
-
-        $GLOBALS[self::KEY][$apiUrl]['addOns'][$addOnId] = true;
-    }
-
-    /**
-     * Removes trace of Updater if it is no longer needed.
-     *
-     * @param string|null $apiUrl
-     * @param string|null $addOnId
-     * @throws Zend_Exception
-     */
-    public static function onUninstall($apiUrl = null, $addOnId = null)
-    {
-        if (XenForo_Application::$versionId < 1020000) {
-            // only run if XenForo is at least 1.2.0
-            return;
-        }
-
-        if (!is_string($apiUrl)) {
-            // use default api url if nothing provided
-            $apiUrl = self::API_URL;
-        }
-
-        $addOnId = self::_getAddOnId($addOnId);
-        $config = self::_readConfig($addOnId, $apiUrl);
-        $addOns = XenForo_Application::get('addOns');
-
-        $activeAddOnIds = array();
-        foreach ($config['addOnIds'] as $configAddOnId) {
-            if ($configAddOnId === $addOnId
-                || !isset($addOns[$configAddOnId])
-            ) {
-                continue;
-            }
-
-            $activeAddOnIds[] = $configAddOnId;
-        }
-
-        if (empty($activeAddOnIds)) {
-            // no active add-ons found, trigger uninstall routine
-            bdApiConsumer_ShippableHelper_UpdaterCore::_uninstallSelf($apiUrl);
-        }
-    }
-
-    /**
-     * Finds the latest Updater version and let it setup.
-     * THIS METHOD SHOULD NOT BE ALTERED BETWEEN VERSIONS.
-     *
-     * @param XenForo_FrontController $fc
-     * @param array $config
-     *
-     * @internal
-     */
-    public static function onPreRoute(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_FrontController $fc,
-        array $config
-    ) {
-        if (empty($GLOBALS[self::KEY]['version'][$config['apiUrl']])) {
-            return;
-        }
-        $versions = $GLOBALS[self::KEY]['version'][$config['apiUrl']];
-
-        ksort($versions);
-        $latest = array_pop($versions);
-
-        call_user_func(array($latest, 'bootstrap'), $config);
-    }
-
-    public static function getConfigOptionId($apiUrl)
-    {
-        $configOptionId = sprintf('updater%s%s', str_replace(' ', '', ucwords(preg_replace('#[^A-Za-z]+#', ' ',
-            parse_url($apiUrl, PHP_URL_HOST)))), md5($apiUrl));
-        if (strlen($configOptionId) > 50) {
-            $configOptionId = 'updater_' . md5($configOptionId);
-        }
-
-        return $configOptionId;
-    }
-
-    private static function _getAddOnId($addOnId)
-    {
-        if ($addOnId !== null) {
-            return $addOnId;
-        }
-
-        $clazz = __CLASS__;
-        $strPos = strpos($clazz, '_ShippableHelper_');
-        if ($strPos === false) {
-            throw new XenForo_Exception('Unable to determine $addOnId');
-        }
-
-        return substr($clazz, 0, $strPos);
-    }
-
-    private static function _readConfig($addOnId, $apiUrl)
-    {
-        $options = XenForo_Application::getOptions();
-
-        $configOptionId = self::getConfigOptionId($apiUrl);
-        $config = $options->get($configOptionId);
-
-        if ($config === null) {
-            $config = array(
-                'version' => 0,
-                'apiUrl' => $apiUrl,
-                'addOnIds' => array($addOnId),
-
-                'enabled' => false,
-                'ignored' => array(),
-            );
-        }
-
-        return $config;
-    }
-}
\ No newline at end of file
diff --git a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/UpdaterCore.php b/xenforo_consumer/library/bdApiConsumer/ShippableHelper/UpdaterCore.php
deleted file mode 100644
index fb394a60..00000000
--- a/xenforo_consumer/library/bdApiConsumer/ShippableHelper/UpdaterCore.php
+++ /dev/null
@@ -1,799 +0,0 @@
-<?php
-
-// updated by DevHelper_Helper_ShippableHelper at 2016-06-18T11:13:03+00:00
-
-/**
- * Class bdApiConsumer_ShippableHelper_UpdaterCore
- * @version 1
- * @see DevHelper_Helper_ShippableHelper_UpdaterCore
- */
-class bdApiConsumer_ShippableHelper_UpdaterCore
-{
-    const PARAM_ENABLE = 'updater-enable';
-    const PARAM_DISABLE = 'updater-disable';
-    const PARAM_FORCE = 'updater-force';
-    const PARAM_DOWNLOAD = 'updater-download';
-    const PARAM_IMPORT_XML = 'updater-importXml';
-    const PARAM_IMPORT_XML_PATH = 'updater-xmlPath';
-    const PARAM_AUTHORIZE = 'updater-authorize';
-    const PARAM_ACCESS_TOKEN = 'updater-accessToken';
-    const PARAM_IGNORE = 'updater-ignore';
-
-    protected static $_isBeta = true;
-
-    /**
-     * Bootstraps the Updater.
-     * This routine cannot be executed at `init_dependencies` due to version resolving,
-     * it will run at `front_controller_pre_route` instead. This method should only be called once
-     * for each <code>$config.apiUrl</code.
-     *
-     * @param array $config
-     *
-     * @internal
-     */
-    public static function bootstrap(array $config)
-    {
-        if (isset($GLOBALS[bdApiConsumer_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']])) {
-            if (XenForo_Application::debugMode()) {
-                die(sprintf('Updater for %s has been setup by %s already!', $config['apiUrl'],
-                    $GLOBALS[bdApiConsumer_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']]));
-            }
-            return;
-        }
-        $GLOBALS[bdApiConsumer_ShippableHelper_Updater::KEY]['setupMethod'][$config['apiUrl']] = __METHOD__;
-
-        if (self::$_config !== null) {
-            if (XenForo_Application::debugMode()) {
-                die(sprintf('%s has been setup to run with %s already!', __METHOD__, self::$_config['apiUrl']));
-            }
-            return;
-        }
-        self::_updateSelf($config);
-
-        // from this point, we no longer need to care about other implementations of Updater
-        // all checks have been passed and indicated that the current one is the latest version
-
-        XenForo_CodeEvent::addListener('front_controller_pre_view', array(__CLASS__, 'front_controller_pre_view'));
-    }
-
-    /**
-     * Handles pre_view code event and execute Updater routines appropriately.
-     *
-     * @param XenForo_FrontController $fc
-     * @param XenForo_ControllerResponse_Abstract $controllerResponse
-     * @param XenForo_ViewRenderer_Abstract $viewRenderer
-     * @param array $containerParams
-     *
-     * @internal
-     */
-    public static function front_controller_pre_view(
-        /** @noinspection PhpUnusedParameterInspection */
-        XenForo_FrontController $fc,
-        XenForo_ControllerResponse_Abstract &$controllerResponse,
-        XenForo_ViewRenderer_Abstract &$viewRenderer,
-        array &$containerParams
-    ) {
-        if (!$controllerResponse instanceof XenForo_ControllerResponse_View) {
-            return;
-        }
-
-        switch ($controllerResponse->viewName) {
-            case 'XenForo_ViewAdmin_AddOn_List':
-                self::_onAddOnList($controllerResponse, $containerParams);
-                break;
-            case 'XenForo_ViewAdmin_AddOn_Upgrade':
-                self::_onAddOnUpgrade($controllerResponse);
-                break;
-        }
-    }
-
-    private static function _onAddOnList(XenForo_ControllerResponse_View &$controllerResponse, array &$containerParams)
-    {
-        $message = '';
-
-        if (!empty($_GET[self::PARAM_ENABLE])
-            && $_GET[self::PARAM_ENABLE] === self::$_config['apiUrl']
-        ) {
-            self::$_config['configured'] = true;
-            self::$_config['enabled'] = true;
-            self::_saveConfig(self::$_config);
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-            return;
-        }
-
-        if (!empty($_GET[self::PARAM_DISABLE])
-            && $_GET[self::PARAM_DISABLE] === self::$_config['apiUrl']
-        ) {
-            self::$_config['configured'] = true;
-            self::$_config['enabled'] = false;
-            self::_saveConfig(self::$_config);
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-            return;
-        }
-
-        if (empty(self::$_config['configured'])) {
-            if (!self::$_isBeta
-                || XenForo_Application::debugMode()
-            ) {
-                $enabledAddOnIds = self::_getEnabledAddOnIds(self::$_config['addOnIds']);
-
-                if (!empty($enabledAddOnIds)) {
-                    /** @noinspection HtmlUnknownTarget */
-                    $message .= sprintf('Updater for %s: <a href="%s">enable</a> or <a href="%s">disable</a>?',
-                        implode(', ', $enabledAddOnIds),
-                        XenForo_Link::buildAdminLink('add-ons', null, array(
-                            self::PARAM_ENABLE => self::$_config['apiUrl'],
-                        )),
-                        XenForo_Link::buildAdminLink('add-ons', null, array(
-                            self::PARAM_DISABLE => self::$_config['apiUrl'],
-                        ))
-                    );
-
-                    if (self::$_isBeta) {
-                        $message .= ' Warning: The Updater is currently in beta.';
-                    }
-                }
-            }
-        } elseif (self::$_config['configured']) {
-            $forceRefresh = (!empty($_GET[self::PARAM_FORCE]) && $_GET[self::PARAM_FORCE] === self::$_config['apiUrl']);
-            $data = self::_refreshData(self::$_config['apiUrl'], self::$_config['addOnIds'], $forceRefresh);
-
-            if (!empty($data)) {
-                $message .= self::_onAddOnShowStatuses($data, $forceRefresh);
-            }
-
-        }
-
-        $paramKey = '_' . md5(self::$_config['apiUrl']);
-        $containerParams[$paramKey] = array('message' => $message);
-    }
-
-    private static function _onAddOnShowStatuses(array $data, $forceRefresh)
-    {
-        $statuses = '';
-        $xenAddOns = XenForo_Application::get('addOns');
-
-        foreach ($xenAddOns as $addOnId => $addOnVersionId) {
-            if (!in_array($addOnId, self::$_config['addOnIds'], true)) {
-                continue;
-            }
-
-            if (!isset($data[$addOnId])) {
-                if ($forceRefresh) {
-                    $statuses .= sprintf('%1$s cannot be verified with the Updater Server.<br />', $addOnId);
-                }
-                continue;
-            }
-
-            if ($addOnVersionId < $data[$addOnId]['version_id']) {
-                $ignoredVersionId = 0;
-                if (!empty(self::$_config['ignored'][$addOnId])) {
-                    $ignoredVersionId = self::$_config['ignored'][$addOnId];
-                }
-                $isIgnored = $data[$addOnId]['version_id'] <= $ignoredVersionId;
-
-                $actions = array();
-                if ($forceRefresh
-                    || !$isIgnored
-                ) {
-                    if (!empty($data[$addOnId]['links']['permalink'])) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">read more</a>', $data[$addOnId]['links']['permalink']);
-                    }
-
-                    if (!empty($data[$addOnId]['links']['content'])) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">update</a>',
-                            XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_DOWNLOAD => self::$_config['apiUrl'])));
-                    } elseif (!empty($data[$addOnId]['links']['authorize'])) {
-                        $authorizeUrl = sprintf('%s&redirect_uri=%s',
-                            $data[$addOnId]['links']['authorize'],
-                            rawurlencode(XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_AUTHORIZE => self::$_config['apiUrl'])))
-                        );
-
-                        /** @noinspection HtmlUnknownTarget */
-                        $actions[] = sprintf('<a href="%1$s">authorize an update</a>', $authorizeUrl);
-                    }
-                }
-
-                if (!empty($actions)) {
-                    $outOfDateMessage = sprintf('%1$s is out of date, latest version is v%3$s (#%4$d, yours is #%2$d).',
-                        $addOnId,
-                        $addOnVersionId,
-                        $data[$addOnId]['version_string'],
-                        $data[$addOnId]['version_id']);
-
-                    $ignoreMessage = '';
-                    if (!$isIgnored) {
-                        /** @noinspection HtmlUnknownTarget */
-                        $ignoreMessage = sprintf(' or <a href="%1$s">ignore this version</a>',
-                            XenForo_Link::buildAdminLink('full:add-ons/upgrade',
-                                array('addon_id' => $addOnId),
-                                array(self::PARAM_IGNORE => self::$_config['apiUrl'])));
-                    }
-
-                    $statuses .= sprintf('%1$s You may: %2$s%3$s.<br />',
-                        $outOfDateMessage,
-                        implode(', ', $actions),
-                        $ignoreMessage);
-                }
-            } else {
-                if ($forceRefresh) {
-                    if ($addOnVersionId > $data[$addOnId]['version_id']) {
-                        $statuses .= sprintf('%1$s appears to be even newer than'
-                            . ' reported from the Updater Server: their v%3$s (#%4$d) vs. your #%2$d.'
-                            . ' Awesome!<br />',
-                            $addOnId,
-                            $addOnVersionId,
-                            $data[$addOnId]['version_string'],
-                            $data[$addOnId]['version_id']);
-                    } else {
-                        $statuses .= sprintf('%1$s is up to date.<br />', $addOnId);
-                    }
-                }
-            }
-        }
-
-        return $statuses;
-    }
-
-    private static function _onAddOnUpgrade(XenForo_ControllerResponse_View &$controllerResponse)
-    {
-        if (!empty($_GET[self::PARAM_AUTHORIZE])
-            && $_GET[self::PARAM_AUTHORIZE] === self::$_config['apiUrl']
-        ) {
-            $downloadLink = XenForo_Link::buildAdminLink(
-                'full:add-ons/upgrade',
-                $controllerResponse->params['addOn'],
-                array(
-                    self::PARAM_DOWNLOAD => self::$_config['apiUrl']
-                )
-            );
-            $downloadLinkJson = json_encode($downloadLink);
-            $accessTokenParamJson = json_encode(self::PARAM_ACCESS_TOKEN);
-
-            $js = <<<EOF
-<script>
-var hash = window.location.hash.substr(1);
-var regex = /access_token=(.+?)(&|$)/;
-var match = hash.match(regex);
-if (match) {
-    var accessToken = match[1];
-    var downloadLink = $downloadLinkJson;
-    var redirect = downloadLink + '&' + $accessTokenParamJson + '=' + encodeURIComponent(accessToken);
-
-    window.location = redirect;
-}
-</script>
-EOF;
-            die($js);
-        }
-
-        if (!empty($_GET[self::PARAM_DOWNLOAD])
-            && $_GET[self::PARAM_DOWNLOAD] === self::$_config['apiUrl']
-        ) {
-            $accessToken = '';
-            if (!empty($_GET[self::PARAM_ACCESS_TOKEN])) {
-                $accessToken = $_GET[self::PARAM_ACCESS_TOKEN];
-            }
-
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $data = self::_fetchData(self::$_config['apiUrl'], array($addOnId), $accessToken);
-
-            if (!empty($data[$addOnId]['links']['content'])) {
-                $tempFile = bdApiConsumer_ShippableHelper_TempFile::download($data[$addOnId]['links']['content']);
-                $xmlPath = self::_updateAddOnFiles($addOnId, $tempFile);
-
-                /** @noinspection BadExpressionStatementJS */
-                die(sprintf('<script>window.location = %s;</script>',
-                    json_encode(XenForo_Link::buildAdminLink('add-ons/upgrade', array('addon_id' => $addOnId), array(
-                        self::PARAM_IMPORT_XML => self::$_config['apiUrl'],
-                        self::PARAM_IMPORT_XML_PATH => $xmlPath
-                    ))))
-                );
-            }
-        }
-
-        if (!empty($_GET[self::PARAM_IMPORT_XML])
-            && $_GET[self::PARAM_IMPORT_XML] === self::$_config['apiUrl']
-            && !empty($_GET[self::PARAM_IMPORT_XML_PATH])
-        ) {
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $xmlPath = $_GET[self::PARAM_IMPORT_XML_PATH];
-
-            /** @var XenForo_Model_AddOn $addOnModel */
-            $addOnModel = XenForo_Model::create('XenForo_Model_AddOn');
-            $addOnModel->installAddOnXmlFromFile($xmlPath, $addOnId);
-
-            $addOn = $addOnModel->getAddOnById($addOnId);
-            echo(sprintf('Updated add-on %1$s to v%2$s (#%3$d)',
-                $addOn['title'], $addOn['version_string'], $addOn['version_id']));
-
-            /** @noinspection BadExpressionStatementJS */
-            die(sprintf('<script>window.f=function(){window.location=%s;};'
-                . 'window.setTimeout("f()",5000);</script>',
-                json_encode(XenForo_Link::buildAdminLink('full:tools/run-deferred', null, array(
-                    'redirect' => XenForo_Link::buildAdminLink('full:add-ons')
-                )))));
-        }
-
-        if (!empty($_GET[self::PARAM_IGNORE])
-            && $_GET[self::PARAM_IGNORE] === self::$_config['apiUrl']
-        ) {
-            $addOnId = $controllerResponse->params['addOn']['addon_id'];
-            $data = self::_refreshData(self::$_config['apiUrl'], self::$_config['addOnIds'], false);
-            if (!empty($data[$addOnId]['version_id'])) {
-                self::$_config['ignored'][$addOnId] = $data[$addOnId]['version_id'];
-                self::_saveConfig(self::$_config);
-            }
-
-            $controllerResponse = new XenForo_ControllerResponse_Redirect();
-            $controllerResponse->redirectType = XenForo_ControllerResponse_Redirect::RESOURCE_UPDATED;
-            $controllerResponse->redirectTarget = XenForo_Link::buildAdminLink('add-ons');
-        }
-    }
-
-    private static function _updateSelf(array $config)
-    {
-        $options = XenForo_Application::getOptions();
-
-        $configOptionId = bdApiConsumer_ShippableHelper_Updater::getConfigOptionId($config['apiUrl']);
-        $templateTitle = $configOptionId;
-        $templateModKey = $configOptionId;
-
-        $configVersion = $config['version'];
-        $configUpdated = array();
-        if ($configVersion === 0) {
-            $configUpdated[] = '$config';
-        }
-
-        if ($configVersion < bdApiConsumer_ShippableHelper_Updater::$_version) {
-            if ($configVersion < 2015100121) {
-                /** @var XenForo_DataWriter_AdminTemplate $templateDw */
-                $templateDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplate');
-
-                /** @var XenForo_Model_AdminTemplate $templateModel */
-                $templateModel = XenForo_Model::create('XenForo_Model_AdminTemplate');
-                $template = $templateModel->getAdminTemplateByTitle($templateTitle);
-                if (!empty($template)) {
-                    $templateDw->setExistingData($template, true);
-                }
-
-                $templateDw->bulkSet(array(
-                    'title' => $templateTitle,
-                    'template' => self::$_template,
-                ));
-                $templateDw->save();
-
-                $configUpdated[] = '$templateDw';
-            }
-
-            if ($configVersion < 2015100107) {
-                /** @var XenForo_DataWriter_AdminTemplateModification $templateModDw */
-                $templateModDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplateModification');
-
-                /** @var XenForo_Model_AdminTemplateModification $templateModModel */
-                $templateModModel = XenForo_Model::create('XenForo_Model_AdminTemplateModification');
-                $templateMod = $templateModModel->getModificationByKey($templateModKey);
-                if (!empty($templateMod)) {
-                    $templateModDw->setExistingData($templateMod, true);
-                }
-
-                $templateModDw->bulkSet(array(
-                    'template' => 'content_header',
-                    'modification_key' => $templateModKey,
-                    'description' => $config['apiUrl'],
-                    'action' => 'preg_replace',
-                    'find' => '#^.+$#s',
-                    'replace' => '$0' . str_replace('md5', md5($config['apiUrl']), self::$_templateMod),
-                ));
-                $templateModDw->save();
-
-                $configUpdated[] = '$templateModDw';
-            }
-
-            $config['version'] = bdApiConsumer_ShippableHelper_Updater::$_version;
-            $configUpdated[] = '$config["version"]';
-        }
-
-        $addOnIdsUpdated = false;
-        foreach ($GLOBALS[bdApiConsumer_ShippableHelper_Updater::KEY][$config['apiUrl']]['addOns'] as $addOnId => $enabled) {
-            if (!in_array($addOnId, $config['addOnIds'], true)) {
-                $config['addOnIds'][] = $addOnId;
-                $addOnIdsUpdated = true;
-            }
-        }
-        if ($addOnIdsUpdated) {
-            sort($config['addOnIds']);
-            $configUpdated[] = '$config["addOnIds"]';
-        }
-
-        if (count($configUpdated) > 0) {
-            /** @var XenForo_DataWriter_Option $optionDw */
-            $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-            if ($configVersion > 0) {
-                $optionDw->setExistingData($configOptionId);
-            }
-            $optionDw->bulkSet(array(
-                'option_id' => $configOptionId,
-                'option_value' => $config,
-                'default_value' => 'a:0:{}',
-                'edit_format' => 'template',
-                'edit_format_params' => $templateTitle,
-                'data_type' => 'array',
-                'sub_options' => '*',
-            ));
-            $optionDw->setRelations(array(
-                'debug' => 9999,
-            ));
-            $optionDw->setExtraData(XenForo_DataWriter_Option::DATA_TITLE, 'Add-on Updates'
-                . (self::$_isBeta ? ' (BETA)' : ''));
-            $optionDw->setExtraData(XenForo_DataWriter_Option::DATA_EXPLAIN, 'Turn on this option if you want to'
-                . ' check for add-on updates from <a href="' . $config['apiUrl'] . '" target="_blank">'
-                . $config['apiUrl'] . '</a> regularly. If you want to perform update check immediately, <a href="'
-                . XenForo_Link::buildAdminLink('add-ons', null, array(self::PARAM_FORCE => $config['apiUrl']))
-                . '" target="_blank">click here</a>.');
-            $optionDw->save();
-            $options->set($configOptionId, $config);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): $configVersion=%d,'
-                    . ' self::$_version=%d, $configUpdated=%s',
-                    __METHOD__, $config['apiUrl'], var_export($configVersion, true),
-                    var_export(bdApiConsumer_ShippableHelper_Updater::$_version, true),
-                    var_export($configUpdated, true)));
-            }
-        }
-
-        self::$_config = $config;
-    }
-
-    private static function _updateAddOnFiles($addOnId, $tempFile)
-    {
-        $tempDir = $tempFile . '_extracted';
-
-        XenForo_Helper_File::createDirectory($tempDir, false);
-        XenForo_Helper_File::makeWritableByFtpUser($tempDir);
-
-        $decompress = new Zend_Filter_Decompress(array(
-            'adapter' => 'Zip',
-            'options' => array('target' => $tempDir)
-        ));
-
-        if (!$decompress->filter($tempFile)) {
-            throw new XenForo_Exception('Unable to extract add-on package.', true);
-        }
-
-        $uploadDir = sprintf('%s/upload', $tempDir);
-        if (!is_dir($uploadDir)) {
-            throw new XenForo_Exception('Unsupported add-on package (no "upload" directory found).', true);
-        }
-
-        $xfDir = dirname(XenForo_Autoloader::getInstance()->getRootDir());
-        $files = self::_verifyAddOnFiles($uploadDir, $xfDir);
-
-        $xmlPath = self::_findXmlPath($addOnId, $tempDir, $xfDir, $files);
-
-        self::_moveAddOnFiles($uploadDir, $xfDir, $files);
-
-        return $xmlPath;
-    }
-
-    private static function _verifyAddOnFiles($packageDir, $xfDir, $relativePath = null)
-    {
-        $files = array();
-
-        $dir = sprintf('%s/%s', $packageDir, $relativePath);
-        $entries = scandir($dir);
-        $subDirs = array();
-
-        foreach ($entries as $entry) {
-            if (substr($entry, 0, 1) === '.') {
-                // ignore hidden files
-                continue;
-            }
-
-            if ($relativePath !== null) {
-                $fileRelativePath = sprintf('%s/%s', $relativePath, $entry);
-            } else {
-                $fileRelativePath = $entry;
-            }
-
-            if (is_file(sprintf('%s/%s', $packageDir, $fileRelativePath))) {
-                $files[] = $fileRelativePath;
-
-                $fileSystemPath = sprintf('%s/%s', $xfDir, $fileRelativePath);
-                if (is_file($fileSystemPath)) {
-                    if (!is_writable($fileSystemPath)) {
-                        throw new XenForo_Exception('File is not writable: ' . $fileSystemPath, true);
-                    }
-                } elseif (is_dir($fileSystemPath)) {
-                    throw new XenForo_Exception('File/directory conflict: ' . $fileSystemPath, true);
-                } else {
-                    $parentOfFileSystemPath = dirname($fileSystemPath);
-                    if (is_dir($parentOfFileSystemPath)) {
-                        if (!is_writable($parentOfFileSystemPath)) {
-                            throw new XenForo_Exception('Directory is not writable: '
-                                . $parentOfFileSystemPath, true);
-                        }
-                    } else {
-                        if (!XenForo_Helper_File::createDirectory($parentOfFileSystemPath)) {
-                            throw new XenForo_Exception('Directory cannot be created: '
-                                . $parentOfFileSystemPath, true);
-                        }
-                    }
-                }
-            } else {
-                $subDirs[] = $fileRelativePath;
-            }
-        }
-
-        foreach ($subDirs as $subDir) {
-            $files = array_merge($files, self::_verifyAddOnFiles($packageDir, $xfDir, $subDir));
-        }
-
-        return $files;
-    }
-
-    private static function _moveAddOnFiles($packageDir, $xfDir, array $files)
-    {
-        foreach ($files as $file) {
-            $packagePath = sprintf('%s/%s', $packageDir, $file);
-            $systemPath = sprintf('%s/%s', $xfDir, $file);
-
-            if (!XenForo_Helper_File::safeRename($packagePath, $systemPath)) {
-                throw new XenForo_Exception('File cannot be updated: ' . $file);
-            }
-        }
-    }
-
-    private static function _findXmlPath($addOnId, $tempDir, $xfDir, array $files)
-    {
-        foreach ($files as $file) {
-            $fileName = basename($file);
-            if (preg_match('#^addon-(?<id>.+)\.xml$#', $fileName, $matches)) {
-                if ($addOnId === $matches['id']) {
-                    return sprintf('%s/%s', $xfDir, $file);
-                }
-            }
-        }
-
-        $entries = scandir($tempDir);
-        foreach ($entries as $entry) {
-            if (preg_match('#^addon-(?<id>.+)\.xml$#', $entry, $matches)) {
-                if ($addOnId === $matches['id']) {
-                    return sprintf('%s/%s', $tempDir, $entry);
-                }
-            }
-        }
-
-        throw new XenForo_Exception('Unsupported add-on package (no xml found).', true);
-    }
-
-    public static function _uninstallSelf($apiUrl)
-    {
-        $configOptionId = bdApiConsumer_ShippableHelper_Updater::getConfigOptionId($apiUrl);
-        $templateTitle = $configOptionId;
-        $templateModKey = $configOptionId;
-
-        try {
-            XenForo_Db::beginTransaction();
-
-            /** @var XenForo_Model_AdminTemplate $templateModel */
-            $templateModel = XenForo_Model::create('XenForo_Model_AdminTemplate');
-            $template = $templateModel->getAdminTemplateByTitle($templateTitle);
-            if (!empty($template)) {
-                /** @var XenForo_DataWriter_AdminTemplate $templateDw */
-                $templateDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplate');
-                $templateDw->setExistingData($template, true);
-                $templateDw->delete();
-            }
-
-
-            /** @var XenForo_Model_AdminTemplateModification $templateModModel */
-            $templateModModel = XenForo_Model::create('XenForo_Model_AdminTemplateModification');
-            $templateMod = $templateModModel->getModificationByKey($templateModKey);
-            if (!empty($templateMod)) {
-                /** @var XenForo_DataWriter_AdminTemplateModification $templateModDw */
-                $templateModDw = XenForo_DataWriter::create('XenForo_DataWriter_AdminTemplateModification');
-                $templateModDw->setExistingData($templateMod, true);
-                $templateModDw->delete();
-            }
-
-            /** @var XenForo_DataWriter_Option $optionDw */
-            $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-            $optionDw->setExistingData($configOptionId);
-            $optionDw->delete();
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): ok',
-                    __METHOD__, $apiUrl));
-            }
-
-            XenForo_Db::commit();
-        } catch (XenForo_Exception $e) {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s): %s',
-                    __METHOD__, $apiUrl, $e->__toString()));
-            }
-
-            XenForo_Db::rollback();
-        }
-    }
-
-    private static function _refreshData($apiUrl, array $addOnIds, $forceRefresh)
-    {
-        $data = ($forceRefresh ? null : self::_getCache($apiUrl));
-        if (empty($data)
-            || $data['version'] < bdApiConsumer_ShippableHelper_Updater::$_version
-            || $data['timestamp'] < XenForo_Application::$time - 86400
-        ) {
-            $data = array(
-                'version' => bdApiConsumer_ShippableHelper_Updater::$_version,
-                'timestamp' => time(),
-                'json' => self::_fetchData($apiUrl, $addOnIds),
-            );
-
-            self::_setCache($apiUrl, $data);
-        }
-
-        return $data['json'];
-    }
-
-    private static function _fetchData($url, array $addOnIds, $accessToken = '')
-    {
-        if (empty($addOnIds)) {
-            return array();
-        }
-
-        $url .= sprintf('%s_version=%d', ((strpos($url, '?') === false) ? '?' : '&'),
-            bdApiConsumer_ShippableHelper_Updater::$_version);
-        if (!empty($accessToken)) {
-            $url .= sprintf('&oauth_token=%s', rawurlencode($accessToken));
-        }
-        foreach ($addOnIds as $addOnId) {
-            $url .= sprintf('&ids[]=%s', rawurlencode($addOnId));
-        }
-
-        $client = XenForo_Helper_Http::getClient($url);
-
-        try {
-            $response = $client->request('GET');
-
-            $responseStatus = $response->getStatus();
-            $responseBody = $response->getBody();
-        } catch (Exception $e) {
-            $responseStatus = 503;
-            $responseBody = $e->getMessage();
-        }
-
-        $json = null;
-        if ($responseStatus === 200) {
-            $json = @json_decode($responseBody, true);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($url=%s): status=%d, json=%s',
-                    __METHOD__, $url,
-                    var_export($responseStatus, true), var_export($json, true)));
-            }
-        } else {
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($url=%s): status=%d, body=%s',
-                    __METHOD__, $url,
-                    var_export($responseStatus, true), var_export($responseBody, true)));
-            }
-        }
-
-        return $json;
-    }
-
-    private static function _getCache($apiUrl)
-    {
-        /** @var XenForo_Model_DataRegistry $dataRegistryModel */
-        $dataRegistryModel = XenForo_Model::create('XenForo_Model_DataRegistry');
-        $data = $dataRegistryModel->get(bdApiConsumer_ShippableHelper_Updater::KEY);
-
-        if (!empty($data)
-            && isset($data[$apiUrl])
-        ) {
-            return $data[$apiUrl];
-        }
-
-        return array();
-    }
-
-    private static function _setCache($apiUrl, array $thisData)
-    {
-        /** @var XenForo_Model_DataRegistry $dataRegistryModel */
-        $dataRegistryModel = XenForo_Model::create('XenForo_Model_DataRegistry');
-        $data = $dataRegistryModel->get(bdApiConsumer_ShippableHelper_Updater::KEY);
-        if (empty($data)) {
-            $data = array();
-        }
-        $data[$apiUrl] = $thisData;
-        $dataRegistryModel->set(bdApiConsumer_ShippableHelper_Updater::KEY, $data);
-        return true;
-    }
-
-    private static function _saveConfig(array $config)
-    {
-        $configOptionId = bdApiConsumer_ShippableHelper_Updater::getConfigOptionId($config['apiUrl']);
-
-        /** @var XenForo_DataWriter_Option $optionDw */
-        $optionDw = XenForo_DataWriter::create('XenForo_DataWriter_Option');
-        $optionDw->setExistingData($configOptionId);
-        $optionDw->set('option_value', $config);
-
-        if ($optionDw->save()) {
-            XenForo_Application::getOptions()->set($configOptionId, $config);
-
-            if (XenForo_Application::debugMode()) {
-                XenForo_Helper_File::log(__CLASS__, sprintf('%s($apiUrl=%s)',
-                    __METHOD__, $config['apiUrl']));
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private static function _getEnabledAddOnIds($addOnIds)
-    {
-        $xenAddOns = XenForo_Application::get('addOns');
-        $enabledIds = array();
-        foreach ($addOnIds as $configAddOnId) {
-            if (isset($xenAddOns[$configAddOnId])) {
-                $enabledIds[] = $configAddOnId;
-            }
-        }
-
-        return $enabledIds;
-    }
-
-    private static $_template = '
-<xen:set var="$addOnListStr">
-    <xen:foreach loop="$preparedOption.option_value.addOnIds" value="$configAddOnId">
-        <xen:foreach loop="$xenAddOns" key="$xenAddOnId" value="$xenAddOnVersionId">
-            <xen:if is="{$configAddOnId} == {$xenAddOnId}">
-               {$configAddOnId}
-            </xen:if>
-        </xen:foreach>
-    </xen:foreach>
-</xen:set>
-
-<xen:checkboxunit label="{$preparedOption.title}">
-	<xen:explain>
-	    {xen:raw $preparedOption.explain}
-	    Supported add-ons: {$addOnListStr}</xen:explain>
-    <xen:option name="{$fieldPrefix}[{$preparedOption.option_id}][enabled]" value="1"
-        label="{xen:phrase enabled}"
-        selected="{$preparedOption.option_value.enabled}" />
-	<xen:html>
-		<input type="hidden" name="{$listedFieldName}" value="{$preparedOption.option_id}" />
-		{xen:raw $editLink}
-
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][configured]" value="1" />
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][version]" value="{$preparedOption.option_value.version}" />
-		<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][apiUrl]" value="{$preparedOption.option_value.apiUrl}" />
-		<xen:foreach loop="$preparedOption.option_value.addOnIds" value="$addOnId">
-            <input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][addOnIds][]" value="{$addOnId}" />
-        </xen:foreach>
-	</xen:html>
-</xen:checkboxunit>';
-
-    private static $_templateMod = '
-<xen:if is="{$_md5.message}">
-    <p class="importantMessage" style="text-align: left">{xen:raw $_md5.message}</p>
-</xen:if>';
-
-    private static $_config = null;
-}
\ No newline at end of file
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Account.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Account.php
deleted file mode 100755
index 0f6dadc9..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Account.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Account extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Account
-{
-    public function actionSecurity()
-    {
-        $response = parent::actionSecurity();
-
-        if (bdApiConsumer_Option::get('takeOver', 'login')) {
-            if ($response instanceof XenForo_ControllerResponse_View
-                && !empty($response->subView)
-                && empty($response->subView->params['hasPassword'])
-            ) {
-                /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-                $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-                $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations(XenForo_Visitor::getUserId());
-
-                if (!empty($auths)) {
-                    foreach ($auths as $auth) {
-                        $provider = bdApiConsumer_Option::getProviderByCode($auth['provider']);
-                        $link = bdApiConsumer_Helper_Provider::getAccountSecurityLink($provider);
-
-                        if (!empty($link)) {
-                            return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $link);
-                        }
-                    }
-                }
-            }
-        }
-
-        return $response;
-    }
-
-    public function actionExternalAccounts()
-    {
-        $response = parent::actionExternalAccounts();
-
-        if ($response instanceof XenForo_ControllerResponse_View
-            || empty($response->subView)
-        ) {
-            // good
-        } else {
-            // not a view? return it asap
-            return $response;
-        }
-
-        $visitor = XenForo_Visitor::getInstance();
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $externalAuthModel */
-        $externalAuthModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $auth = $this->_getUserModel()->getUserAuthenticationObjectByUserId($visitor['user_id']);
-        if (!$auth) {
-            return $this->responseNoPermission();
-        }
-
-        $externalAuths = $externalAuthModel->bdApiConsumer_getExternalAuthAssociations($visitor['user_id']);
-
-        $providers = bdApiConsumer_Option::getProviders();
-
-        $viewParams = array(
-            'hasPassword' => $auth->hasPassword(),
-
-            'bdApiConsumer_externalAuths' => $externalAuths,
-            'bdApiConsumer_providers' => $providers,
-        );
-
-        $response->subView->params += $viewParams;
-
-        return $response;
-    }
-
-    public function actionExternalAccountsDisassociate()
-    {
-        return parent::actionExternalAccountsDisassociate();
-    }
-
-    public function actionExternal()
-    {
-        return $this->responseRedirect(
-            XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL_PERMANENT,
-            XenForo_Link::buildPublicLink('account/external-accounts')
-        );
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Login.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Login.php
deleted file mode 100755
index e7376d22..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Login.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Login extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Login
-{
-    protected $_bdApiConsumer_beforeLoginVisitorId = 0;
-
-    public function bdApiConsumer_getBeforeLoginVisitorId()
-    {
-        return $this->_bdApiConsumer_beforeLoginVisitorId;
-    }
-
-    protected function _preDispatch($action)
-    {
-        $this->_bdApiConsumer_beforeLoginVisitorId = XenForo_Visitor::getUserId();
-
-        parent::_preDispatch($action);
-    }
-
-    public function actionExternal()
-    {
-        $this->_assertPostOnly();
-
-        if (XenForo_Application::isRegistered('_bdCloudServerHelper_readonly')) {
-            // disable external login if [bd] Cloud Server Helper Read Only mode is turned on
-            return $this->responseNoPermission();
-        }
-
-        $providerCode = $this->_input->filterSingle('provider', XenForo_Input::STRING);
-        $provider = bdApiConsumer_Option::getProviderByCode($providerCode);
-        if (empty($provider)) {
-            return $this->responseNoPermission();
-        }
-
-        $externalUserId = $this->_input->filterSingle('external_user_id', XenForo_Input::UINT);
-        if (empty($externalUserId)) {
-            return $this->responseNoPermission();
-        }
-
-        if (!bdApiConsumer_Helper_Api::verifyJsSdkSignature($provider, $_REQUEST)) {
-            return $this->responseNoPermission();
-        }
-
-        $userModel = $this->_getUserModel();
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-
-        $existingAssoc = $userExternalModel->getExternalAuthAssociation(
-            $userExternalModel->bdApiConsumer_getProviderCode($provider), $externalUserId);
-
-        if (!empty($existingAssoc)) {
-            $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $existingAssoc);
-            if (empty($accessToken)) {
-                // no access token in the auth, consider no auth at all
-                $existingAssoc = null;
-            }
-        }
-
-        if (empty($existingAssoc)) {
-            $autoRegister = bdApiConsumer_Option::get('autoRegister');
-
-            if ($autoRegister === 'on' OR $autoRegister === 'id_sync') {
-                // we have to do a refresh here
-                return $this->responseRedirect(
-                    XenForo_ControllerResponse_Redirect::SUCCESS,
-                    XenForo_Link::buildPublicLink('canonical:register/external', null, array(
-                        'provider' => $providerCode,
-                        'reg' => 1,
-                        'redirect' => $this->getDynamicRedirect(),
-                    )),
-                    new XenForo_Phrase('bdapi_consumer_being_auto_login_auto_register_x',
-                        array('provider' => $provider['name']))
-                );
-            }
-        }
-
-        if (!$existingAssoc) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_auto_login_with_x_failed',
-                array('provider' => $provider['name'])));
-        }
-        $user = $userModel->getFullUserById($existingAssoc['user_id']);
-        if (empty($user)) {
-            return $this->responseError(new XenForo_Phrase('requested_user_not_found'));
-        }
-
-        if (XenForo_Application::$versionId > 1050000) {
-            /** @var XenForo_ControllerHelper_Login $loginHelper */
-            $loginHelper = $this->getHelper('Login');
-
-            if ($loginHelper->userTfaConfirmationRequired($user)) {
-                $loginHelper->setTfaSessionCheck($user['user_id']);
-
-                return $this->responseMessage(new XenForo_Phrase('bdapi_consumer_auto_login_user_x_requires_tfa', array(
-                    'username' => $user['username'],
-                    'twoStepLink' => XenForo_Link::buildPublicLink('login/two-step', null, array(
-                        'redirect' => $this->getDynamicRedirect(),
-                        'remember' => 1,
-                    ))
-                )));
-            }
-        }
-
-        $userModel->setUserRememberCookie($user['user_id']);
-        XenForo_Model_Ip::log($user['user_id'], 'user', $user['user_id'], 'login_api_consumer');
-        $userModel->deleteSessionActivity(0, $this->_request->getClientIp(false));
-
-        if (XenForo_Application::$versionId < 1050000) {
-            XenForo_Application::getSession()->changeUserId($user['user_id']);
-            XenForo_Visitor::setup($user['user_id']);
-        } else {
-            $visitor = XenForo_Visitor::setup($user['user_id']);
-            XenForo_Application::getSession()->userLogin($user['user_id'], $visitor['password_date']);
-        }
-
-        return $this->responseRedirect(
-            XenForo_ControllerResponse_Redirect::SUCCESS,
-            $this->getDynamicRedirect(),
-            new XenForo_Phrase('bdapi_consumer_auto_login_with_x_succeeded_y', array(
-                'provider' => $provider['name'],
-                'username' => $user['username']
-            ))
-        );
-    }
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Logout.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Logout.php
deleted file mode 100755
index ecb3ac64..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Logout.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Logout extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Logout
-{
-    protected $_bdApiConsumer_beforeLogoutVisitorId = 0;
-
-    public function bdApiConsumer_getBeforeLogoutVisitorId()
-    {
-        return $this->_bdApiConsumer_beforeLogoutVisitorId;
-    }
-
-    protected function _preDispatch($action)
-    {
-        $this->_bdApiConsumer_beforeLogoutVisitorId = XenForo_Visitor::getUserId();
-
-        parent::_preDispatch($action);
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Member.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Member.php
deleted file mode 100644
index fd7def9e..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Member.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Member extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Member
-{
-    public function actionMember()
-    {
-        $response = parent::actionMember();
-
-        if (bdApiConsumer_Option::get('takeOver', 'profile')) {
-            if ($response instanceof XenForo_ControllerResponse_View AND !empty($response->params['user'])) {
-                /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-                $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-                $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations(
-                    $response->params['user']['user_id']);
-
-                foreach ($auths as $auth) {
-                    if (!empty($auth['extra_data']['links']['permalink'])) {
-                        return $this->responseRedirect(
-                            XenForo_ControllerResponse_Redirect::SUCCESS,
-                            $auth['extra_data']['links']['permalink']
-                        );
-                    }
-                }
-            }
-        }
-
-        return $response;
-    }
-
-    public function actionExternalAvatar()
-    {
-        $userId = $this->_input->filterSingle('user_id', XenForo_Input::UINT);
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations($userId);
-        foreach ($auths as $auth) {
-            $avatarUrl = bdApiConsumer_Helper_Avatar::getAvatarUrlFromAuthExtra($auth['extra_data']);
-            if (!empty($avatarUrl)) {
-                return $this->responseRedirect(XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL, $avatarUrl);
-            }
-        }
-
-        return $this->responseNoPermission();
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Misc.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Misc.php
deleted file mode 100755
index e50a276f..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Misc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Misc extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Misc
-{
-    public function actionApiConsumerCallback()
-    {
-        return $this->responseReroute('bdApiConsumer_ControllerPublic_Callback', 'index');
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Register.php b/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Register.php
deleted file mode 100755
index 84f12f86..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/ControllerPublic/Register.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_ControllerPublic_Register extends XFCP_bdApiConsumer_XenForo_ControllerPublic_Register
-{
-    const SESSION_KEY_REDIRECT = 'bdApiConsumer_redirect';
-
-    public function actionExternal()
-    {
-        $providerCode = $this->_input->filterSingle('provider', XenForo_Input::STRING);
-        $assocUserId = $this->_input->filterSingle('assoc', XenForo_Input::UINT);
-        $externalCode = $this->_input->filterSingle('code', XenForo_Input::STRING);
-        $redirect = $this->_bdApiConsumer_getRedirect();
-
-        $state = $this->_input->filterSingle('state', XenForo_Input::STRING);
-        if (!empty($state)) {
-            // looks like bdApiConsumer_Option::CONFIG_TRACK_AUTHORIZE_URL_STATE has been enabled
-            // attempt to unpack the state data now
-            $stateData = @base64_decode($state);
-            if ($stateData !== false) {
-                $stateData = @json_decode($stateData, true, 2);
-                if ($stateData !== null) {
-                    if (isset($stateData['time'])) {
-                        $stateData['timeElapsed'] = XenForo_Application::$time - $stateData['time'];
-                    }
-
-                    // make it available in server error log (if an error occurs)
-                    $_POST['.state'] = $stateData;
-                }
-            }
-        }
-
-        $provider = bdApiConsumer_Option::getProviderByCode($providerCode);
-        if (empty($provider)) {
-            if (!empty($externalCode)) {
-                // make this available in server error log
-                $_POST['.dynamicRedirect'] = $this->getDynamicRedirect();
-
-                // this is one serious error
-                throw new XenForo_Exception('Provider could not be determined');
-            } else {
-                return $this->responseNoPermission();
-            }
-        }
-
-        $externalRedirectUri = XenForo_Link::buildPublicLink('canonical:register/external', false, array(
-            'provider' => $providerCode,
-            'assoc' => ($assocUserId ? $assocUserId : false),
-        ));
-
-        if ($this->_input->filterSingle('reg', XenForo_Input::UINT)) {
-            XenForo_Application::get('session')->set(self::SESSION_KEY_REDIRECT, $redirect);
-
-            $social = $this->_input->filterSingle('social', XenForo_Input::STRING);
-            $requestUrl = bdApiConsumer_Helper_Api::getRequestUrl($provider,
-                $externalRedirectUri, array('social' => $social));
-
-            return $this->responseRedirect(XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL, $requestUrl);
-        }
-
-        $externalToken = null;
-
-        if (empty($externalToken)) {
-            $_token = $this->_input->filterSingle('_token', XenForo_Input::STRING);
-            if (!empty($_token)) {
-                $_token = @base64_decode($_token);
-                if (!empty($_token)) {
-                    $_token = @json_decode($_token, true);
-                    if (!empty($_token)) {
-                        $externalToken = $_token;
-                    }
-                }
-            }
-        }
-
-        if (empty($externalToken)) {
-            // there should be `code` at this point...
-            if (empty($externalCode)) {
-                return $this->responseError(new XenForo_Phrase('bdapi_consumer_error_occurred_while_connecting_with_x',
-                    array('provider' => $provider['name'])));
-            }
-
-            $externalToken = bdApiConsumer_Helper_Api::getAccessTokenFromCode($provider,
-                $externalCode, $externalRedirectUri);
-
-            if (!empty($externalToken)) {
-                $selfRedirect = $this->_request->getRequestUri();
-                $selfRedirect = preg_replace('#(\?|&)code=.+(&|$)#', '$1', $selfRedirect);
-                $selfRedirect = preg_replace('#(\?|&)state=.+(&|$)#', '$1', $selfRedirect);
-
-                // filter $externalToken keys to make it more lightweight
-                foreach (array_keys($externalToken) as $_key) {
-                    if ($_key === 'debug'
-                        || substr($_key, 0, 1) === '_'
-                    ) {
-                        unset($externalToken[$_key]);
-                    }
-                }
-                $selfRedirect .= sprintf('%1$s_token=%2$s',
-                    strpos($selfRedirect, '?') === false ? '?' : '&',
-                    rawurlencode(base64_encode(json_encode($externalToken))));
-
-                // do a self redirect immediately so user won't refresh the page
-                // TODO: improve this
-                return $this->responseRedirect(
-                    XenForo_ControllerResponse_Redirect::SUCCESS,
-                    $selfRedirect
-                );
-            }
-        }
-
-        if (empty($externalToken)) {
-            if (!XenForo_Visitor::getUserId()) {
-                // report error only if user hasn't been logged in
-                return $this->responseError(new XenForo_Phrase('bdapi_consumer_error_occurred_while_connecting_with_x',
-                    array('provider' => $provider['name'])));
-            } else {
-                // or try to be friendly and just redirect user back to where s/he was
-                return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $redirect);
-            }
-        }
-
-        $externalVisitor = bdApiConsumer_Helper_Api::getVisitor($provider, $externalToken['access_token']);
-        if (empty($externalVisitor)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_error_occurred_while_connecting_with_x',
-                array('provider' => $provider['name'])));
-        }
-        if (empty($externalVisitor['user_email'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_x_returned_unknown_error',
-                array('provider' => $provider['name'])));
-        }
-        if (isset($externalVisitor['user_is_valid'])
-            && isset($externalVisitor['user_is_verified'])
-        ) {
-            if (empty($externalVisitor['user_is_valid'])
-                || empty($externalVisitor['user_is_verified'])
-            ) {
-                return $this->responseError(new XenForo_Phrase('bdapi_consumer_x_account_not_good_standing',
-                    array('provider' => $provider['name'])));
-            }
-        }
-
-        $userModel = $this->_getUserModel();
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->_getUserExternalModel();
-
-        $existingAssoc = $userExternalModel->getExternalAuthAssociation(
-            $userExternalModel->bdApiConsumer_getProviderCode($provider), $externalVisitor['user_id']);
-        $autoRegistered = false;
-
-        if (empty($existingAssoc)) {
-            $existingAssoc = $this->_bdApiConsumer_autoRegister($provider, $externalToken, $externalVisitor);
-            if (!empty($existingAssoc)) {
-                $autoRegistered = true;
-            }
-        }
-
-        if ($existingAssoc
-            && $userModel->getUserById($existingAssoc['user_id'])
-        ) {
-            XenForo_Application::get('session')->changeUserId($existingAssoc['user_id']);
-            XenForo_Visitor::setup($existingAssoc['user_id']);
-
-            if (!$autoRegistered) {
-                $userExternalModel->bdApiConsumer_updateExternalAuthAssociation($provider,
-                    $externalVisitor['user_id'], $existingAssoc['user_id'],
-                    array_merge($externalVisitor, array('token' => $externalToken)));
-            }
-
-            return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $redirect);
-        }
-
-        $existingUser = false;
-        $emailMatch = false;
-        if (XenForo_Visitor::getUserId()) {
-            $existingUser = XenForo_Visitor::getInstance();
-        } elseif ($assocUserId) {
-            $existingUser = $userModel->getUserById($assocUserId);
-        }
-
-        if (!$existingUser) {
-            $existingUser = $userModel->getUserByEmail($externalVisitor['user_email']);
-            $emailMatch = true;
-        }
-
-        if ($existingUser) {
-            // must associate: matching user
-            return $this->responseView('bdApiConsumer_ViewPublic_Register_External',
-                'bdapi_consumer_register',
-                array(
-                    'associateOnly' => true,
-
-                    'provider' => $provider,
-                    'externalToken' => $externalToken,
-                    'externalVisitor' => $externalVisitor,
-
-                    'existingUser' => $existingUser,
-                    'emailMatch' => $emailMatch,
-                    'redirect' => $redirect
-                )
-            );
-        }
-
-        if (bdApiConsumer_Option::get('bypassRegistrationActive')) {
-            // do not check for registration active option
-        } else {
-            $this->_assertRegistrationActive();
-        }
-
-        $externalVisitor['username']
-            = bdApiConsumer_Helper_AutoRegister::suggestUserName($externalVisitor['username'], $userModel);
-
-        return $this->responseView(
-            'bdApiConsumer_ViewPublic_Register_External',
-            'bdapi_consumer_register',
-            array(
-                'provider' => $provider,
-                'externalToken' => $externalToken,
-                'externalVisitor' => $externalVisitor,
-                'redirect' => $redirect,
-
-                'customFields' => $this->_getFieldModel()->prepareUserFields(
-                    $this->_getFieldModel()->getUserFields(array('registration' => true)), true),
-
-                'timeZones' => XenForo_Helper_TimeZone::getTimeZones(),
-                'tosUrl' => XenForo_Dependencies_Public::getTosUrl()
-            ),
-            $this->_getRegistrationContainerParams()
-        );
-    }
-
-    public function actionExternalRegister()
-    {
-        $this->_assertPostOnly();
-
-        $redirect = $this->_bdApiConsumer_getRedirect();
-
-        $userModel = $this->_getUserModel();
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->_getUserExternalModel();
-
-        $providerCode = $this->_input->filterSingle('provider', XenForo_Input::STRING);
-        $provider = bdApiConsumer_Option::getProviderByCode($providerCode);
-        if (empty($provider)) {
-            return $this->responseNoPermission();
-        }
-
-        $doAssoc = ($this->_input->filterSingle('associate', XenForo_Input::STRING)
-            || $this->_input->filterSingle('force_assoc', XenForo_Input::UINT));
-        $userId = 0;
-        if ($doAssoc) {
-            $associate = $this->_input->filter(array(
-                'associate_login' => XenForo_Input::STRING,
-                'associate_password' => XenForo_Input::STRING
-            ));
-
-            $loginModel = $this->_getLoginModel();
-
-            if ($loginModel->requireLoginCaptcha($associate['associate_login'])) {
-                return $this->responseError(
-                    new XenForo_Phrase('your_account_has_temporarily_been_locked_due_to_failed_login_attempts'));
-            }
-
-            $userId = $userModel->validateAuthentication($associate['associate_login'],
-                $associate['associate_password'], $error);
-            if (!$userId) {
-                $loginModel->logLoginAttempt($associate['associate_login']);
-                return $this->responseError($error);
-            }
-        }
-
-        $refreshToken = $this->_input->filterSingle('refresh_token', XenForo_Input::STRING);
-        $externalToken = bdApiConsumer_Helper_Api::getAccessTokenFromRefreshToken($provider, $refreshToken);
-        if (empty($externalToken)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_error_occurred_while_connecting_with_x',
-                array('provider' => $provider['name'])));
-        }
-
-        $externalVisitor = bdApiConsumer_Helper_Api::getVisitor($provider, $externalToken['access_token']);
-        if (empty($externalVisitor)) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_error_occurred_while_connecting_with_x',
-                array('provider' => $provider['name'])));
-        }
-        if (empty($externalVisitor['user_email'])) {
-            return $this->responseError(new XenForo_Phrase('bdapi_consumer_x_returned_unknown_error',
-                array('provider' => $provider['name'])));
-        }
-        if (isset($externalVisitor['user_is_valid']) AND isset($externalVisitor['user_is_verified'])) {
-            if (empty($externalVisitor['user_is_valid']) OR empty($externalVisitor['user_is_verified'])) {
-                return $this->responseError(new XenForo_Phrase('bdapi_consumer_x_account_not_good_standing',
-                    array('provider' => $provider['name'])));
-            }
-        }
-
-        if ($doAssoc) {
-            $userExternalModel->bdApiConsumer_updateExternalAuthAssociation($provider,
-                $externalVisitor['user_id'], $userId,
-                array_merge($externalVisitor, array('token' => $externalToken)));
-
-            XenForo_Application::getSession()->changeUserId($userId);
-            XenForo_Visitor::setup($userId);
-
-            return $this->responseRedirect(XenForo_ControllerResponse_Redirect::SUCCESS, $redirect);
-        }
-
-        if (bdApiConsumer_Option::get('bypassRegistrationActive')) {
-            // do not check for registration active option
-        } else {
-            $this->_assertRegistrationActive();
-        }
-
-        $data = $this->_input->filter(array(
-            'username' => XenForo_Input::STRING,
-            'timezone' => XenForo_Input::STRING,
-        ));
-
-        // TODO: custom fields
-
-        if (XenForo_Dependencies_Public::getTosUrl()
-            && !$this->_input->filterSingle('agree', XenForo_Input::UINT)
-        ) {
-            return $this->responseError(new XenForo_Phrase('you_must_agree_to_terms_of_service'));
-        }
-
-        $user = bdApiConsumer_Helper_AutoRegister::createUser($data, $provider,
-            $externalToken, $externalVisitor, $this->_getUserExternalModel());
-
-        XenForo_Application::getSession()->changeUserId($user['user_id']);
-        XenForo_Visitor::setup($user['user_id']);
-
-        $viewParams = array(
-            'user' => $user,
-            'redirect' => $redirect,
-        );
-
-        return $this->responseView(
-            'XenForo_ViewPublic_Register_Process',
-            'register_process',
-            $viewParams,
-            $this->_getRegistrationContainerParams()
-        );
-    }
-
-    protected function _bdApiConsumer_autoRegister($provider, $externalToken, array $externalVisitor)
-    {
-        $mode = bdApiConsumer_Option::get('autoRegister');
-
-        if ($mode !== 'on' AND $mode !== 'id_sync') {
-            // not in working mode
-            return false;
-        }
-
-        $data = array();
-
-        $sameName = $this->_getUserModel()->getUserByName($externalVisitor['username']);
-        if (!empty($sameName)) {
-            // username conflict found, too bad
-            return false;
-        }
-        $data['username'] = $externalVisitor['username'];
-
-        if ($mode === 'id_sync') {
-            // additionally look for user with same ID
-            $sameId = $this->_getUserModel()->getUserById($externalVisitor['user_id']);
-            if (!empty($sameId)) {
-                // ID conflict found...
-                return false;
-            }
-            $data['user_id'] = $externalVisitor['user_id'];
-        }
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->_getUserExternalModel();
-        $user = bdApiConsumer_Helper_AutoRegister::createUser($data, $provider,
-            $externalToken, $externalVisitor, $userExternalModel);
-
-        if (empty($user)) {
-            // for some reason, the user could not be created
-            return false;
-        }
-
-        return $userExternalModel->getExternalAuthAssociation(
-            $userExternalModel->bdApiConsumer_getProviderCode($provider), $externalVisitor['user_id']);
-    }
-
-    protected function _bdApiConsumer_getRedirect()
-    {
-        $redirect = $this->_input->filterSingle('redirect', XenForo_Input::STRING);
-
-        if (empty($redirect)) {
-            $redirect = XenForo_Application::getSession()->get(self::SESSION_KEY_REDIRECT);
-        }
-
-        if (empty($redirect)) {
-            $redirect = XenForo_Link::convertUriToAbsoluteUri($this->getDynamicRedirect());
-        }
-
-        return $redirect;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Alert.php b/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Alert.php
deleted file mode 100644
index 55e7b75b..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Alert.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_Model_Alert extends XFCP_bdApiConsumer_XenForo_Model_Alert
-{
-    protected $_bdApiConsumer_unreadAlertProviders = array();
-
-    public function resetUnreadAlertsCounter($userId)
-    {
-        if ($userId == XenForo_Visitor::getUserId()
-            && !empty($this->_bdApiConsumer_unreadAlertProviders[$userId])
-        ) {
-            $viewingUser = null;
-            $this->standardizeViewingUserReference($viewingUser);
-
-            $this->_bdApiConsumer_markExternalAlertsRead($viewingUser,
-                array_keys($this->_bdApiConsumer_unreadAlertProviders[$userId]));
-        }
-
-        parent::resetUnreadAlertsCounter($userId);
-    }
-
-    public function bdApiConsumer_alertUser($provider, $user, $notification)
-    {
-        return call_user_func_array(array(
-            $this,
-            'alertUser'
-        ), array(
-            $user['user_id'],
-            0,
-            $provider['name'],
-            'bdapi_consumer',
-            0,
-            $provider['code'],
-            array('notification' => $notification),
-        ));
-    }
-
-    public function bdApiConsumer_markAlertsRead($provider, $user, $time = null)
-    {
-        if ($time === null) {
-            $time = XenForo_Application::$time;
-        }
-
-        $updated = $this->_getDb()->update('xf_user_alert', array('view_date' => $time), array(
-            'alerted_user_id = ?' => $user['user_id'],
-            'view_date = ?' => 0,
-            'content_type = ?' => 'bdapi_consumer',
-            'action = ?' => $provider['code'],
-        ));
-
-        if ($updated > 0) {
-            $this->_getDb()->query('
-                UPDATE `xf_user`
-                SET alerts_unread = IF(alerts_unread > ?, alerts_unread - ?, 0)
-                WHERE user_id = ?
-            ', array(
-                $updated,
-                $updated,
-                $user['user_id']
-            ));
-        }
-
-        return $updated;
-    }
-
-    public function getAlertsForUser($userId, $fetchMode, array $fetchOptions = array(), array $viewingUser = null)
-    {
-        $this->standardizeViewingUserReference($viewingUser);
-        $shouldWork = (bdApiConsumer_Option::get('displayExternalNotifications')
-            && $userId == $viewingUser['user_id']);
-
-        if ($shouldWork) {
-            // only check external server when in recent mode
-            // for popup mode, only check if subscription is not confirmed
-            $alwaysCheck = false;
-            if ($fetchMode == XenForo_Model_Alert::FETCH_MODE_RECENT) {
-                if (empty($fetchOptions['page'])
-                    || $fetchOptions['page'] == 1
-                ) {
-                    $alwaysCheck = true;
-                }
-            }
-
-            $this->_bdApiConsumer_getExternalAlertsForUser($viewingUser, $alwaysCheck);
-        }
-
-        $alerts = parent::getAlertsForUser($userId, $fetchMode, $fetchOptions, $viewingUser);
-
-        if ($shouldWork
-            && !empty($alerts['alerts'])
-        ) {
-            foreach ($alerts['alerts'] as $alert) {
-                if (empty($alert['view_date'])
-                    && !empty($alert['content_type'])
-                    && !empty($alert['action'])
-                ) {
-                    if ($alert['content_type'] == 'bdapi_consumer') {
-                        $this->_bdApiConsumer_unreadAlertProviders[$userId][$alert['action']] = true;
-                    }
-                }
-            }
-        }
-
-        return $alerts;
-    }
-
-    protected function _bdApiConsumer_getExternalAlertsForUser(array $viewingUser, $alwaysCheck)
-    {
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations($viewingUser['user_id']);
-
-        foreach ($auths as &$authRef) {
-            if (!XenForo_Model_Alert::userReceivesAlert($viewingUser, 'bdapi_consumer', $authRef['provider'])) {
-                // user opted out for this provider
-                continue;
-            }
-
-            if (!$alwaysCheck
-                && empty($auth['extra_data']['notification_subscription_callback'])
-            ) {
-                // do not check to save resources
-                continue;
-            }
-
-            $provider = bdApiConsumer_Option::getProviderByCode($authRef['provider']);
-            if (empty($provider)) {
-                continue;
-            }
-            $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $authRef);
-            if (empty($accessToken)) {
-                continue;
-            }
-
-            $notifications = bdApiConsumer_Helper_Api::getNotifications($provider, $accessToken);
-            $alertUser = true;
-
-            if (!empty($notifications['_headerLinkHub'])) {
-                if (empty($notifications['subscription_callback'])) {
-                    // subscribe to future notifications
-                    if (bdApiConsumer_Helper_Api::postSubscription($provider,
-                        $accessToken, $notifications['_headerLinkHub'])
-                    ) {
-                        $authRef['extra_data']['notification_subscription_callback'] = 1;
-                        $userExternalModel->bdApiConsumer_updateExternalAuthAssociation($provider,
-                            $authRef['provider_key'], $authRef['user_id'], $authRef['extra_data']);
-                    }
-                } else {
-                    // subscribed, do not alert user to avoid duplicates
-                    $alertUser = false;
-                }
-            }
-
-            if ($alertUser
-                && !empty($notifications['notifications'])
-            ) {
-                // server does not support subscription, we will just put all notifications into
-                // user alerts then
-                foreach ($notifications['notifications'] as $notification) {
-                    $this->bdApiConsumer_alertUser($provider, $viewingUser, $notification);
-                }
-            }
-        }
-    }
-
-    protected function _bdApiConsumer_markExternalAlertsRead(array $viewingUser, array $providerCodes)
-    {
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations($viewingUser['user_id']);
-
-        foreach ($auths as &$authRef) {
-            $provider = bdApiConsumer_Option::getProviderByCode($authRef['provider']);
-            if (empty($provider)) {
-                continue;
-            }
-
-            if (!in_array($provider['code'], $providerCodes, true)) {
-                continue;
-            }
-
-            $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $authRef);
-            if (empty($accessToken)) {
-                continue;
-            }
-
-            bdApiConsumer_Helper_Api::postNotificationsRead($provider, $accessToken);
-        }
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Avatar.php b/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Avatar.php
deleted file mode 100644
index 2bb2134a..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/Avatar.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_Model_Avatar extends XFCP_bdApiConsumer_XenForo_Model_Avatar
-{
-    public function bdApiConsumer_applyAvatar($userId, $avatarUrl)
-    {
-        $dw = XenForo_DataWriter::create('XenForo_DataWriter_User');
-        $dw->setExistingData($userId);
-        $dw->bulkSet(array(
-            'avatar_date' => 0,
-            'avatar_width' => 0,
-            'avatar_height' => 0,
-            'avatar_crop_x' => 0,
-            'avatar_crop_y' => 0,
-            'gravatar' => bdApiConsumer_Helper_Avatar::getGravatar($userId, $avatarUrl),
-        ), array('runVerificationCallback' => false));
-
-        return $dw->save();
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/User.php b/xenforo_consumer/library/bdApiConsumer/XenForo/Model/User.php
deleted file mode 100644
index 17a6438b..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/User.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_Model_User extends XFCP_bdApiConsumer_XenForo_Model_User
-{
-    public function validateAuthentication($nameOrEmail, $password, &$error = '')
-    {
-        $userId = parent::validateAuthentication($nameOrEmail, $password, $error);
-
-        if (empty($userId) AND strpos($nameOrEmail, '@') === false AND bdApiConsumer_Option::get('takeOver', 'login')) {
-            // try to login with external providers
-            $providers = bdApiConsumer_Option::getProviders();
-
-            foreach ($providers as $provider) {
-                $externalToken = bdApiConsumer_Helper_Api::getAccessTokenFromUsernamePassword($provider, $nameOrEmail, $password);
-                if (empty($externalToken)) {
-                    continue;
-                }
-
-                $externalVisitor = bdApiConsumer_Helper_Api::getVisitor($provider, $externalToken['access_token']);
-                if (empty($externalVisitor)) {
-                    continue;
-                }
-
-                /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-                $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-                $existingAssoc = $userExternalModel->getExternalAuthAssociation(
-                    $userExternalModel->bdApiConsumer_getProviderCode($provider),
-                    $externalVisitor['user_id']);
-                if (!empty($existingAssoc)) {
-                    // yay, found an associated user!
-                    $error = '';
-                    $userExternalModel->bdApiConsumer_updateExternalAuthAssociation(
-                        $provider, $externalVisitor['user_id'],
-                        $existingAssoc['user_id'], $externalVisitor + array('token' => $externalToken));
-                    return $existingAssoc['user_id'];
-                }
-
-                $existingUser = $this->getUserByEmail($externalVisitor['user_email']);
-                if (!empty($existingUser)) {
-                    // this is not good, an user with matched email
-                    // this user will have to associate manually
-                    continue;
-                }
-
-                $sameName = $this->getUserByName($externalVisitor['username']);
-                if (!empty($sameName)) {
-                    // not good
-                    continue;
-                }
-                $data = array('username' => $externalVisitor['username']);
-
-                if (bdApiConsumer_Option::get('autoRegister') === 'id_sync') {
-                    // additionally look for user with same ID
-                    $sameId = $this->getUserById($externalVisitor['user_id']);
-                    if (!empty($sameId)) {
-                        // not good
-                        continue;
-                    }
-
-                    $data['user_id'] = $externalVisitor['user_id'];
-                }
-
-                $user = bdApiConsumer_Helper_AutoRegister::createUser($data, $provider,
-                    $externalToken, $externalVisitor, $userExternalModel);
-
-                if (!empty($user)) {
-                    $error = '';
-                    return $user['user_id'];
-                }
-            }
-        }
-
-        return $userId;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserConfirmation.php b/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserConfirmation.php
deleted file mode 100644
index 84332542..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserConfirmation.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_Model_UserConfirmation extends XFCP_bdApiConsumer_XenForo_Model_UserConfirmation
-{
-    public function sendPasswordResetRequest(array $user, array $confirmation = null)
-    {
-        if (empty($confirmation) AND $this->_bdApiConsumer_tryExternalPasswordResetRequest($user)) {
-            return true;
-        }
-
-        return parent::sendPasswordResetRequest($user, $confirmation);
-    }
-
-    protected function _bdApiConsumer_tryExternalPasswordResetRequest(array $user)
-    {
-        if (!bdApiConsumer_Option::get('takeOver', 'login')) {
-            return false;
-        }
-
-        /** @var XenForo_Model_User $userModel */
-        $userModel = $this->getModelFromCache('XenForo_Model_User');
-        $authentication = $userModel->getUserAuthenticationObjectByUserId($user['user_id']);
-        if ($authentication->hasPassword()) {
-            return false;
-        }
-
-        /** @var bdApiConsumer_XenForo_Model_UserExternal $userExternalModel */
-        $userExternalModel = $this->getModelFromCache('XenForo_Model_UserExternal');
-        $auths = $userExternalModel->bdApiConsumer_getExternalAuthAssociations($user['user_id']);
-        if (empty($auths)) {
-            return false;
-        }
-
-        foreach ($auths as $auth) {
-            $provider = bdApiConsumer_Option::getProviderByCode($auth['provider']);
-            if (empty($provider)) {
-                continue;
-            }
-
-            $accessToken = $userExternalModel->bdApiConsumer_getAccessTokenFromAuth($provider, $auth);
-            if (empty($accessToken)) {
-                continue;
-            }
-
-            bdApiConsumer_Helper_Api::postPasswordResetRequest($provider, $accessToken);
-        }
-
-        return true;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserExternal.php b/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserExternal.php
deleted file mode 100755
index c0ee1208..00000000
--- a/xenforo_consumer/library/bdApiConsumer/XenForo/Model/UserExternal.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-class bdApiConsumer_XenForo_Model_UserExternal extends XFCP_bdApiConsumer_XenForo_Model_UserExternal
-{
-    public function bdApiConsumer_getProviderCode(array $provider)
-    {
-        return 'bdapi_' . $provider['code'];
-    }
-
-    public function bdApiConsumer_getUserProfileField()
-    {
-        return 'bdapiconsumer_unused';
-    }
-
-    public function bdApiConsumer_syncUpOnRegistration(
-        XenForo_DataWriter_User $userDw,
-        $externalToken,
-        array $externalVisitor)
-    {
-        // TODO
-    }
-
-    public function bdApiConsumer_getAccessTokenFromAuth(array $provider, array &$auth)
-    {
-        if (!is_array($auth['extra_data'])) {
-            $auth['extra_data'] = @unserialize($auth['extra_data']);
-        }
-
-        if (empty($auth['extra_data']['token']['access_token'])) {
-            // old version...
-            return false;
-        }
-
-        if (empty($auth['extra_data']['token']['expire_date'])) {
-            // old version...
-            return false;
-        }
-
-        if ($auth['extra_data']['token']['expire_date'] < time()) {
-            // expired
-            // note: we are checking against time() here, not XenForo_Application::$time
-            $externalToken = bdApiConsumer_Helper_Api::getAccessTokenFromRefreshToken($provider,
-                $auth['extra_data']['token']['refresh_token']);
-            if (empty($externalToken)) {
-                $auth['extra_data']['token'] = false;
-            } else {
-                $auth['extra_data']['token'] = $externalToken;
-            }
-
-            $this->bdApiConsumer_updateExternalAuthAssociation($provider,
-                $auth['provider_key'], $auth['user_id'], $auth['extra_data']);
-        }
-
-        return $auth['extra_data']['token']['access_token'];
-    }
-
-    public function bdApiConsumer_updateExternalAuthAssociation(array $provider, $providerKey, $userId, array $extra)
-    {
-        $providerCode = $this->bdApiConsumer_getProviderCode($provider);
-
-        if (!empty($extra['token']['expires_in'])
-            && empty($extra['token']['expire_date'])
-        ) {
-            // use time() instead of XenForo_Application::$time to avoid issues
-            // when script is running for a long time in the background / CLI
-            $extra['token']['expire_date'] = time() + $extra['token']['expires_in'];
-        }
-
-        if (!empty($extra['token']['_headers'])) {
-            unset($extra['token']['_headers']);
-        }
-        if (!empty($extra['token']['_responseStatus'])) {
-            unset($extra['token']['_responseStatus']);
-        }
-
-        if (bdApiConsumer_Option::get('takeOver', 'avatar')) {
-            $avatarUrl = bdApiConsumer_Helper_Avatar::getAvatarUrlFromAuthExtra($extra);
-            if (!empty($avatarUrl)) {
-                /** @var bdApiConsumer_XenForo_Model_Avatar $avatarModel */
-                $avatarModel = $this->getModelFromCache('XenForo_Model_Avatar');
-                $avatarModel->bdApiConsumer_applyAvatar($userId, $avatarUrl);
-            }
-        }
-
-        if (XenForo_Application::$versionId >= 1030000) {
-            $this->updateExternalAuthAssociation($providerCode, $providerKey, $userId, $extra);
-        } else {
-            /** @noinspection PhpMethodParametersCountMismatchInspection */
-            $this->updateExternalAuthAssociation($providerCode, $providerKey, $userId,
-                $this->bdApiConsumer_getUserProfileField(), $extra);
-        }
-    }
-
-    public function bdApiConsumer_deleteExternalAuthAssociation($provider, $providerKey, $userId)
-    {
-        if (XenForo_Application::$versionId >= 1030000) {
-            $this->deleteExternalAuthAssociation($provider, $providerKey, $userId);
-        } else {
-            /** @noinspection PhpMethodParametersCountMismatchInspection */
-            $this->deleteExternalAuthAssociation($provider, $providerKey, $userId,
-                $this->bdApiConsumer_getUserProfileField());
-        }
-    }
-
-    public function bdApiConsumer_getExternalAuthAssociations($userId)
-    {
-        $externalAuths = $this->fetchAllKeyed('
-            SELECT *
-            FROM `xf_user_external_auth`
-            WHERE `user_id` = ?
-                AND `provider` LIKE \'bdapi_%\'
-            ', 'provider', array($userId));
-
-        foreach ($externalAuths as &$externalAuth) {
-            $externalAuth['extra_data'] = @unserialize($externalAuth['extra_data']);
-        }
-
-        return $externalAuths;
-    }
-
-    public function bdApiConsumer_getExternalAuthAssociationsForProviderUser($provider, $providerKeys)
-    {
-        $providerCode = $this->bdApiConsumer_getProviderCode($provider);
-
-        $externalAuths = $this->fetchAllKeyed("
-			SELECT *
-			FROM xf_user_external_auth
-			WHERE provider = ?
-				AND provider_key IN (" . $this->_getDb()->quote($providerKeys) . ")
-			ORDER BY provider
-		", 'provider_key', $providerCode);
-
-        foreach ($externalAuths as &$externalAuth) {
-            $externalAuth['extra_data'] = @unserialize($externalAuth['extra_data']);
-        }
-
-        return $externalAuths;
-    }
-
-}
diff --git a/xenforo_consumer/library/bdApiConsumer/addon-bdApiConsumer.xml b/xenforo_consumer/library/bdApiConsumer/addon-bdApiConsumer.xml
deleted file mode 100755
index 57ea07ca..00000000
--- a/xenforo_consumer/library/bdApiConsumer/addon-bdApiConsumer.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="bdApiConsumer" title="[bd] API Consumer" version_string="1.1.0" version_id="1010100" url="" install_callback_class="bdApiConsumer_Installer" install_callback_method="install" uninstall_callback_class="bdApiConsumer_Installer" uninstall_callback_method="uninstall">
-  <admin_navigation/>
-  <admin_permissions/>
-  <admin_style_properties/>
-  <admin_templates>
-    <template title="bdapi_consumer_option_providers"><![CDATA[<xen:controlunit label="{$preparedOption.title}" hint="{$preparedOption.hint}">
-	<xen:explain>{xen:raw $preparedOption.explain}</xen:explain>
-	<xen:html>
-		<ul>
-			<xen:foreach loop="$providers" i="$i" value="$provider">
-			<li>
-				<xen:set var="$counter">{xen:calc '{$i} - 1'}</xen:set>
-				<xen:include template="bdapi_consumer_option_providers_single">
-				</xen:include>
-			</li>
-			</xen:foreach>
-		
-			<li class="CensorWordOptionListener">
-				<xen:include template="bdapi_consumer_option_providers_single">
-					<xen:set var="$counter">{xen:count $providers}</xen:set>
-					<xen:set var="$provider"></xen:set>
-				</xen:include>
-			</li>
-		</ul>
-		
-		<input type="hidden" name="{$listedFieldName}" value="{$preparedOption.option_id}" />
-		{xen:raw $editLink}
-	</xen:html>
-</xen:controlunit>]]></template>
-    <template title="bdapi_consumer_option_providers_single"><![CDATA[<xen:if is="{$counter} > 0"><hr /></xen:if>
-<xen:textbox name="{$fieldPrefix}[{$preparedOption.option_id}][{$counter}][name]" value="{xen:if '{$provider}', $provider.name}"
-	size="20" placeholder="{xen:phrase bdapi_consumer_name}" />
-<xen:textbox name="{$fieldPrefix}[{$preparedOption.option_id}][{$counter}][root]" value="{xen:if '{$provider}', $provider.root}"
-	placeholder="{xen:phrase bdapi_consumer_root}" />
-<xen:textbox name="{$fieldPrefix}[{$preparedOption.option_id}][{$counter}][client_id]" value="{xen:if '{$provider}', $provider.client_id}"
-	placeholder="{xen:phrase bdapi_consumer_client_id}" />
-<xen:textbox name="{$fieldPrefix}[{$preparedOption.option_id}][{$counter}][client_secret]" value="{xen:if '{$provider}', $provider.client_secret}"
-	placeholder="{xen:phrase bdapi_consumer_client_secret}" />
-
-<xen:if is="!empty({$provider.code})">
-	<input type="hidden" name="{$fieldPrefix}[{$preparedOption.option_id}][{$counter}][code]"
-		value="{$provider.code}" />
-</xen:if>
-
-]]></template>
-  </admin_templates>
-  <admin_template_modifications/>
-  <code_events/>
-  <code_event_listeners>
-    <listener event_id="controller_post_dispatch" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="controller_post_dispatch" active="1" hint="" description=""/>
-    <listener event_id="file_health_check" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="file_health_check" active="1" hint="" description=""/>
-    <listener event_id="init_dependencies" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="init_dependencies" active="1" hint="" description=""/>
-    <listener event_id="load_class_controller" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="load_class" active="1" hint="" description=""/>
-    <listener event_id="load_class_model" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="load_class" active="1" hint="" description=""/>
-    <listener event_id="visitor_setup" execute_order="10" callback_class="bdApiConsumer_Listener" callback_method="visitor_setup" active="1" hint="" description=""/>
-  </code_event_listeners>
-  <cron/>
-  <email_templates/>
-  <email_template_modifications/>
-  <optiongroups>
-    <group group_id="bdApiConsumer" display_order="9999" debug_only="0"/>
-    <option option_id="bdapi_consumer_autoLogin" edit_format="radio" data_type="unsigned_integer" can_backup="1">
-      <default_value>1</default_value>
-      <edit_format_params>1 = {xen:phrase yes}
-0 = {xen:phrase no}</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="110"/>
-    </option>
-    <option option_id="bdapi_consumer_autoRegister" edit_format="radio" data_type="string" can_backup="1">
-      <default_value>off</default_value>
-      <edit_format_params>off = {xen:phrase bdapi_consumer_auto_register_off}
-on = {xen:phrase bdapi_consumer_auto_register_on}
-id_sync = {xen:phrase bdapi_consumer_auto_register_id_sync}</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="101"/>
-    </option>
-    <option option_id="bdapi_consumer_bypassRegistrationActive" edit_format="onoff" data_type="unsigned_integer" can_backup="1">
-      <default_value>0</default_value>
-      <edit_format_params></edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="100"/>
-    </option>
-    <option option_id="bdapi_consumer_displayExternalNotifications" edit_format="radio" data_type="unsigned_integer" can_backup="1">
-      <default_value>1</default_value>
-      <edit_format_params>1 = {xen:phrase yes}
-0 = {xen:phrase no}</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="120"/>
-    </option>
-    <option option_id="bdapi_consumer_loginFacebook" edit_format="callback" data_type="string" can_backup="1">
-      <default_value></default_value>
-      <edit_format_params>bdApiConsumer_Option::renderOptionLoginSocial</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="210"/>
-    </option>
-    <option option_id="bdapi_consumer_loginGoogle" edit_format="callback" data_type="string" can_backup="1">
-      <default_value></default_value>
-      <edit_format_params>bdApiConsumer_Option::renderOptionLoginSocial</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="220"/>
-    </option>
-    <option option_id="bdapi_consumer_loginTwitter" edit_format="callback" data_type="string" can_backup="1">
-      <default_value></default_value>
-      <edit_format_params>bdApiConsumer_Option::renderOptionLoginSocial</edit_format_params>
-      <sub_options></sub_options>
-      <relation group_id="bdApiConsumer" display_order="215"/>
-    </option>
-    <option option_id="bdapi_consumer_providers" edit_format="callback" data_type="array" can_backup="1" validation_class="bdApiConsumer_Option" validation_method="verifyOptionProviders">
-      <default_value></default_value>
-      <edit_format_params>bdApiConsumer_Option::renderOptionProviders</edit_format_params>
-      <sub_options>*</sub_options>
-      <relation group_id="bdApiConsumer" display_order="10"/>
-    </option>
-    <option option_id="bdapi_consumer_takeOver" edit_format="checkbox" data_type="array" can_backup="1">
-      <default_value></default_value>
-      <edit_format_params>login = {xen:phrase bdapi_consumer_take_over_login}
-register = {xen:phrase bdapi_consumer_take_over_register}
-profile = {xen:phrase bdapi_consumer_take_over_profile}
-avatar = {xen:phrase bdapi_consumer_take_over_avatar}</edit_format_params>
-      <sub_options>*</sub_options>
-      <relation group_id="bdApiConsumer" display_order="200"/>
-    </option>
-  </optiongroups>
-  <permissions>
-    <permission_groups/>
-    <permissions/>
-    <interface_groups/>
-  </permissions>
-  <phrases>
-    <phrase title="bdapi_consumer_alert_via_provider" version_id="24" version_string="0.9.8-dev"><![CDATA[(via <a href="{link}" target="_blank" tabindex="-1" rel="nofollow">{provider}</a>)]]></phrase>
-    <phrase title="bdapi_consumer_associated_x_account" version_id="8" version_string="0.9.2"><![CDATA[Associated {provider} Account]]></phrase>
-    <phrase title="bdapi_consumer_associate_with_x" version_id="8" version_string="0.9.2"><![CDATA[Associate with {provider}]]></phrase>
-    <phrase title="bdapi_consumer_auto_login_user_x_requires_tfa" version_id="28" version_string="0.9.8-dev"><![CDATA[Welcome back {username}, you need to finish <a href="{twoStepLink}">two step verification</a> to login.]]></phrase>
-    <phrase title="bdapi_consumer_auto_login_with_x_failed" version_id="3" version_string="0.9-dev"><![CDATA[Attempt to auto login with {provider} has been failed.]]></phrase>
-    <phrase title="bdapi_consumer_auto_login_with_x_succeeded_y" version_id="3" version_string="0.9-dev"><![CDATA[Welcome back {username}, you have been logged in via {provider}.]]></phrase>
-    <phrase title="bdapi_consumer_auto_register_id_sync" version_id="7" version_string="0.9.1"><![CDATA[Enabled with ID sync]]></phrase>
-    <phrase title="bdapi_consumer_auto_register_off" version_id="7" version_string="0.9.1"><![CDATA[Disabled]]></phrase>
-    <phrase title="bdapi_consumer_auto_register_on" version_id="7" version_string="0.9.1"><![CDATA[Enabled]]></phrase>
-    <phrase title="bdapi_consumer_being_auto_login_auto_register_x" version_id="21" version_string="0.9.8-dev"><![CDATA[Please wait while you are being logged in via {provider}.]]></phrase>
-    <phrase title="bdapi_consumer_client_id" version_id="1" version_string="0.9-dev"><![CDATA[Client ID]]></phrase>
-    <phrase title="bdapi_consumer_client_secret" version_id="1" version_string="0.9-dev"><![CDATA[Client Secret]]></phrase>
-    <phrase title="bdapi_consumer_disassociate_x_account" version_id="8" version_string="0.9.2"><![CDATA[Disassociate {provider} Account]]></phrase>
-    <phrase title="bdapi_consumer_disassociating_with_x_reset_password_email_y" version_id="8" version_string="0.9.2"><![CDATA[Disassociating with {provider} will cause a password to be generated for your account and emailed to {email}.]]></phrase>
-    <phrase title="bdapi_consumer_error_occurred_while_connecting_with_x" version_id="1" version_string="0.9-dev"><![CDATA[An error occurred while connecting with {provider}. Please try again later.]]></phrase>
-    <phrase title="bdapi_consumer_external" version_id="8" version_string="0.9.2"><![CDATA[External Associations]]></phrase>
-    <phrase title="bdapi_consumer_login_with_x" version_id="1" version_string="0.9-dev"><![CDATA[Login with {provider}]]></phrase>
-    <phrase title="bdapi_consumer_matches_email_address_associated_with_your_x_account" version_id="1" version_string="0.9-dev"><![CDATA[This member matches the email address associated with your {provider} account.]]></phrase>
-    <phrase title="bdapi_consumer_name" version_id="1" version_string="0.9-dev"><![CDATA[Provider Name]]></phrase>
-    <phrase title="bdapi_consumer_root" version_id="1" version_string="0.9-dev"><![CDATA[http://domain.com/xenforo/api]]></phrase>
-    <phrase title="bdapi_consumer_sign_up_with_x" version_id="1" version_string="0.9-dev"><![CDATA[Sign Up with {provider}]]></phrase>
-    <phrase title="bdapi_consumer_take_over_avatar" version_id="19" version_string="0.9.8-dev"><![CDATA[Avatar]]></phrase>
-    <phrase title="bdapi_consumer_take_over_login" version_id="16" version_string="0.9.7"><![CDATA[Login]]></phrase>
-    <phrase title="bdapi_consumer_take_over_profile" version_id="16" version_string="0.9.7"><![CDATA[User Profile]]></phrase>
-    <phrase title="bdapi_consumer_take_over_register" version_id="16" version_string="0.9.7"><![CDATA[Register]]></phrase>
-    <phrase title="bdapi_consumer_x_account_not_good_standing" version_id="10" version_string="0.9.4"><![CDATA[The connected {provider}'s account status is not in good standing. You may need to complete verification steps at {provider} before trying again.]]></phrase>
-    <phrase title="bdapi_consumer_x_integration" version_id="15" version_string="0.9.6b"><![CDATA[{provider} Integration]]></phrase>
-    <phrase title="bdapi_consumer_x_returned_unknown_error" version_id="1" version_string="0.9-dev"><![CDATA[{provider} returned an unknown error. Please try again later.]]></phrase>
-    <phrase title="bdapi_consumer_you_not_associated_with_x_account" version_id="8" version_string="0.9.2"><![CDATA[Your account is not currently associated with a {provider} account.]]></phrase>
-    <phrase title="option_bdapi_consumer_autoLogin" version_id="16" version_string="0.9.7"><![CDATA[Sync logged-in cookie]]></phrase>
-    <phrase title="option_bdapi_consumer_autoLogin_explain" version_id="16" version_string="0.9.7"><![CDATA[Use JavaScript to detect external logged-in status and let user login automatically.]]></phrase>
-    <phrase title="option_bdapi_consumer_autoRegister" version_id="7" version_string="0.9.1"><![CDATA[Auto Register]]></phrase>
-    <phrase title="option_bdapi_consumer_autoRegister_explain" version_id="7" version_string="0.9.1"><![CDATA[Enable this option to auto register external user after successful authentication. There are 3 modes available:<br/>
-<br/>
-&nbsp;- Disabled: do nothing.<br/>
-&nbsp;- Enabled: after authorization, external user will have an account immediately with data from external site. If there is a conflict, user will be asked as usual.<br/>
-&nbsp;- Enabled with ID sync: similar to `Enabled` but external user ID will be included in conflict check.]]></phrase>
-    <phrase title="option_bdapi_consumer_bypassRegistrationActive" version_id="2" version_string="0.9-dev"><![CDATA[Bypass Registration Active Check]]></phrase>
-    <phrase title="option_bdapi_consumer_bypassRegistrationActive_explain" version_id="2" version_string="0.9-dev"><![CDATA[Enabling this option will allow users who came from external sites to register regardless of the <a href="admin.php?options/list/usersAndRegistration" target="_blank" tabindex="-1">"Enable Registration" option</a>.]]></phrase>
-    <phrase title="option_bdapi_consumer_displayExternalNotifications" version_id="22" version_string="0.9.8-dev"><![CDATA[Display External Alerts]]></phrase>
-    <phrase title="option_bdapi_consumer_displayExternalNotifications_explain" version_id="22" version_string="0.9.8-dev"><![CDATA[]]></phrase>
-    <phrase title="option_bdapi_consumer_loginFacebook" version_id="20" version_string="0.9.8-dev"><![CDATA[Facebook Login]]></phrase>
-    <phrase title="option_bdapi_consumer_loginFacebook_explain" version_id="20" version_string="0.9.8-dev"><![CDATA[Choose a provider to let users who login via Facebook go through.]]></phrase>
-    <phrase title="option_bdapi_consumer_loginGoogle" version_id="20" version_string="0.9.8-dev"><![CDATA[Google Login]]></phrase>
-    <phrase title="option_bdapi_consumer_loginGoogle_explain" version_id="20" version_string="0.9.8-dev"><![CDATA[Choose a provider to let users who login via Google go through.]]></phrase>
-    <phrase title="option_bdapi_consumer_loginTwitter" version_id="20" version_string="0.9.8-dev"><![CDATA[Twitter Login]]></phrase>
-    <phrase title="option_bdapi_consumer_loginTwitter_explain" version_id="20" version_string="0.9.8-dev"><![CDATA[Choose a provider to let users who login via Twitter go through.]]></phrase>
-    <phrase title="option_bdapi_consumer_providers" version_id="1" version_string="0.9-dev"><![CDATA[Providers]]></phrase>
-    <phrase title="option_bdapi_consumer_providers_explain" version_id="1" version_string="0.9-dev"><![CDATA[Enter providers' information to authenticate against. All fields are required for each providers.]]></phrase>
-    <phrase title="option_bdapi_consumer_takeOver" version_id="16" version_string="0.9.7"><![CDATA[Take Over]]></phrase>
-    <phrase title="option_bdapi_consumer_takeOver_explain" version_id="19" version_string="0.9.8-dev"><![CDATA[External site can take over some functionalities, enable them as needed.<br/>
-<br/>
-- Login: login information is forwarded, login-with-provider links are hidden, password management tools are redirected.<br/>
-- Register: registration form is disabled.<br />
-- User Profile: profile pages are redirected.<br />
-- Avatar: avatars are set automatically to mirror external site's.<br />]]></phrase>
-    <phrase title="option_group_bdApiConsumer" version_id="1" version_string="0.9-dev"><![CDATA[[bd] API Consumer]]></phrase>
-    <phrase title="option_group_bdApiConsumer_description" version_id="1" version_string="0.9-dev"><![CDATA[]]></phrase>
-    <phrase title="password_of_x_account_wish_to_associate_with_not_y" version_id="1" version_string="0.9-dev"><![CDATA[This is the password of the {board_title} account that you wish to associate with. It is not your {provider} password.]]></phrase>
-  </phrases>
-  <route_prefixes/>
-  <style_properties/>
-  <templates>
-    <template title="bdapi_consumer.css" version_id="1000101" version_string="1.0.1"><![CDATA[.bdApiConsumer_Provider a,
-#loginBar .bdApiConsumer_Provider a
-{
-	color: {xen:property button.color};
-}
-
-.bdApiConsumer_Provider a,
-#loginBar .bdApiConsumer_Provider a
-{
-	display: inline-block;
-	width: {xen:property eAuthButtonWidth};
-	height: 22px;
-	box-sizing: border-box;
-	cursor: pointer;
-}]]></template>
-    <template title="bdapi_consumer_account_external" version_id="15" version_string="0.9.6b"><![CDATA[<xen:if is="!{$bdApiConsumer_noTitle}">
-	<xen:title>{xen:phrase bdapi_consumer_external}</xen:title>
-</xen:if>
-
-<xen:foreach loop="$bdApiConsumer_providers" value="$provider">
-	<xen:set var="$authProviderCode">bdapi_{$provider.code}</xen:set>
-
-	<form action="{xen:link account/external-accounts/disassociate}" method="post" class="xenForm">
-
-		<h3 class="textHeading">{xen:phrase bdapi_consumer_x_integration, 'provider={$provider.name}'}</h3>
-
-		<xen:if is="{$bdApiConsumer_externalAuths.{$authProviderCode}}">
-
-			<xen:include template="bdapi_consumer_account_external_associated">
-				<xen:map from="$bdApiConsumer_externalAuths.{$authProviderCode}" to="$auth" />
-			</xen:include>
-
-		<xen:else />
-
-			<xen:hook name="bdapi_consumer_account_external_not_associated" params="{xen:array 'provider={$provider}'}">
-			<dl class="ctrlUnit">
-				<dt></dt>
-				<dd>{xen:phrase bdapi_consumer_you_not_associated_with_x_account, 'provider={$provider.name}'}</dd>
-			</dl>
-			</xen:hook>
-
-			<dl class="ctrlUnit submitUnit">
-				<dt></dt>
-				<dd><a href="{xen:link register/external, '', 'provider={$provider.code}', 'reg=1', 'assoc={$visitor.user_id}'}" class="button primary">{xen:phrase bdapi_consumer_associate_with_x, 'provider={$provider.name}'}</a></dd>
-			</dl>
-
-		</xen:if>
-		
-		<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-		<input type="hidden" name="_xfConfirm" value="1" />
-		<input type="hidden" name="account" value="{$authProviderCode}" />
-	</form>
-</xen:foreach>]]></template>
-    <template title="bdapi_consumer_account_external_associated" version_id="15" version_string="0.9.6b"><![CDATA[<xen:hook name="bdapi_consumer_account_external_associated" params="{xen:array 'provider={$provider}'}">
-<dl class="ctrlUnit">
-	<dt>{xen:phrase bdapi_consumer_associated_x_account, 'provider={$provider.name}'}:</dt>
-	<dd>
-		<xen:if is="{$auth.extra_data}">
-			<a href="{xen:raw {$auth.extra_data.links.permalink}}" target="_blank">
-				{$auth.extra_data.username}
-			</a>
-		<xen:else />
-			#{$auth.provider_key}
-		</xen:if>
-	</dd>
-</dl>
-</xen:hook>
-
-<dl class="ctrlUnit submitUnit">
-	<dt></dt>
-	<dd><ul>
-		<li>
-			<label for="ctrl_disassociate_{$authProviderCode}">
-				<input type="checkbox" name="disassociate" value="1" id="ctrl_disassociate_{$authProviderCode}" class="Disabler" />
-				{xen:phrase bdapi_consumer_disassociate_x_account, 'provider={$provider.name}'}
-			</label>
-
-			<ul id="ctrl_disassociate_{$authProviderCode}_Disabler">
-				<li><input type="submit" class="button" name="disassociate_confirm" value="{xen:phrase confirm_disassociation}" /></li>
-			</ul>
-
-			<xen:if is="!{$hasPassword}">
-				<p class="explain">{xen:phrase bdapi_consumer_disassociating_with_x_reset_password_email_y, 'provider={$provider.name}', 'email={$visitor.email}'}</p>
-			</xen:if>
-		</li>
-	</ul></dd>
-</dl>]]></template>
-    <template title="bdapi_consumer_alert_provider" version_id="24" version_string="0.9.8-dev"><![CDATA[{xen:raw $notificationHtml}
-<span class="faint">{xen:phrase bdapi_consumer_alert_via_provider,
-	'link={$provider.root}',
-	'provider={$notificationProvider.name}'}</span>]]></template>
-    <template title="bdapi_consumer_auto_login_js" version_id="1000101" version_string="1.0.1"><![CDATA[<xen:if is="{xen:helper bdApiConsumer_getOption, autoLogin} != '0'
-	AND {$visitor.user_id} == 0
-	AND {$controllerName} != 'XenForo_ControllerPublic_Login'
-	AND {$controllerName} != 'XenForo_ControllerPublic_Register'">
-	<xen:if hascontent="true">
-		<xen:require js="js/bdApiConsumer/login.js" />
-		<xen:contentcheck>
-			<xen:callback class="bdApiConsumer_Helper_Template" method="renderProviderInLoop">
-				<script src="{provider.root}/index.php?assets/sdk.js&prefix={provider.code}"
-						class="bdApiConsumer_AutoLogin"
-						data-code="{provider.code}"
-						data-client-id="{provider.client_id}"
-						data-login-link="{xen:link full:login/external}"></script>
-			</xen:callback>
-		</xen:contentcheck>
-	</xen:if>
-</xen:if>]]></template>
-    <template title="bdapi_consumer_providers" version_id="1000101" version_string="1.0.1"><![CDATA[<xen:set var="$facebookProviderCode">{xen:helper bdApiConsumer_getOption, providerCode, loginFacebook}</xen:set>
-<xen:set var="$twitterProviderCode">{xen:helper bdApiConsumer_getOption, providerCode, loginTwitter}</xen:set>
-<xen:set var="$googleProviderCode">{xen:helper bdApiConsumer_getOption, providerCode, loginGoogle}</xen:set>
-
-<xen:if is="{$from} == 'login_bar'" >
-	<xen:edithint template="login_bar_form" />
-
-	<xen:if is="{$facebookProviderCode}">
-		<xen:require css="facebook.css" />
-		<li id="provider-{$facebookProviderCode}-facebook" class="bdApiConsumer_Provider {$facebookProviderCode} facebook">
-			<a href="{xen:link register/external, '', 'provider={$facebookProviderCode}', 'reg=1', 'social=facebook'}" class="fbLogin" tabindex="10">
-				<span>{xen:phrase login_with_facebook}</span>
-			</a>
-		</li>
-	</xen:if>
-
-	<xen:if is="{$twitterProviderCode}">
-		<xen:require css="twitter.css" />
-		<li id="provider-{$twitterProviderCode}-twitter" class="bdApiConsumer_Provider {$twitterProviderCode} twitter">
-			<a href="{xen:link register/external, '', 'provider={$twitterProviderCode}', 'reg=1', 'social=twitter'}" class="twitterLogin" tabindex="10">
-				<span>{xen:phrase login_with_twitter}</span>
-			</a>
-		</li>
-	</xen:if>
-
-	<xen:if is="{$googleProviderCode}">
-		<xen:require css="google.css" />
-		<li id="provider-{$googleProviderCode}-google" class="bdApiConsumer_Provider {$googleProviderCode} google">
-			<a href="{xen:link register/external, '', 'provider={$googleProviderCode}', 'reg=1', 'social=google'}" class="googleLogin" tabindex="10">
-				<span>{xen:phrase login_with_google}</span>
-			</a>
-		</li>
-	</xen:if>
-
-	<xen:if is="!{xen:helper bdApiConsumer_getOption, takeOver,login}">
-		<xen:require css="bdapi_consumer.css" />
-		<xen:callback class="bdApiConsumer_Helper_Template" method="renderProviderInLoop">
-			<li id="provider-{provider.code}" class="bdApiConsumer_Provider {provider.code}">
-				<a href="{xen:link register/external, '', 'provider={provider.code}', 'reg=1'}" tabindex="110" class="button">
-					<span>{xen:phrase bdapi_consumer_login_with_x, 'provider={provider.name}'}</span>
-				</a>
-			</li>
-		</xen:callback>
-	</xen:if>
-
-<xen:elseif is="{$from} == 'login_form'" />
-	<xen:edithint template="helper_login_form" />
-	<xen:set var="$redirect">{xen:if $redirect, $redirect, $requestPaths.fullUri}</xen:set>
-
-	<xen:if is="{$facebookProviderCode}">
-		<xen:require css="facebook.css" />
-		<dl id="provider-{$facebookProviderCode}-facebook" class="ctrlUnit bdApiConsumer_Provider {$facebookProviderCode} facebook">
-			<dt></dt>
-			<dd>
-				<a href="{xen:link register/external, '', 'provider={$facebookProviderCode}', 'reg=1', 'redirect={$redirect}', 'social=facebook'}" class="fbLogin" tabindex="10">
-					<span>{xen:phrase login_with_facebook}</span>
-				</a>
-			</dd>
-		</dl>
-	</xen:if>
-
-	<xen:if is="{$twitterProviderCode}">
-		<xen:require css="twitter.css" />
-		<dl id="provider-{$twitterProviderCode}-twitter" class="ctrlUnit bdApiConsumer_Provider {$twitterProviderCode} twitter">
-			<dt></dt>
-			<dd>
-				<a href="{xen:link register/external, '', 'provider={$twitterProviderCode}', 'reg=1', 'redirect={$redirect}', 'social=twitter'}" class="twitterLogin" tabindex="10">
-					<span>{xen:phrase login_with_twitter}</span>
-				</a>
-			</dd>
-		</dl>
-	</xen:if>
-
-	<xen:if is="{$googleProviderCode}">
-		<xen:require css="google.css" />
-		<dl id="provider-{$googleProviderCode}-google" class="ctrlUnit bdApiConsumer_Provider {$googleProviderCode} google">
-			<dt></dt>
-			<dd>
-				<a href="{xen:link register/external, '', 'provider={$googleProviderCode}', 'reg=1', 'redirect={$redirect}', 'social=google'}" class="googleLogin" tabindex="10">
-					<span>{xen:phrase login_with_google}</span>
-				</a>
-			</dd>
-		</dl>
-	</xen:if>
-
-	<xen:if is="!{xen:helper bdApiConsumer_getOption, takeOver,login}">
-		<xen:callback class="bdApiConsumer_Helper_Template" method="renderProviderInLoop">
-			<xen:require css="bdapi_consumer.css" />
-			<dl id="provider-{provider.code}" class="ctrlUnit bdApiConsumer_Provider {provider.code}">
-				<dt></dt>
-				<dd>
-					<a href="{xen:link register/external, '', 'provider={provider.code}', 'reg=1', 'redirect={$redirect}'}" tabindex="110" class="button">
-						<span>{xen:phrase bdapi_consumer_login_with_x, 'provider={provider.name}'}</span>
-					</a>
-				</dd>
-			</dl>
-		</xen:callback>
-	</xen:if>
-
-</xen:if>]]></template>
-    <template title="bdapi_consumer_register" version_id="17" version_string="0.9.8-dev"><![CDATA[<xen:title>{xen:phrase bdapi_consumer_sign_up_with_x, 'provider={$provider.name}'}</xen:title>
-	
-<form action="{xen:link 'register/external/register'}" method="post" class="xenForm AutoValidator"
-	data-fieldValidatorUrl="{xen:link register/validate-field}"
-	data-OptInOut="OptIn"
-	data-normalSubmit="1">
-
-<ul class="tabs Tabs" data-panes="#Tabs > li">
-	<xen:if is="!{$associateOnly}"><li><a>{xen:phrase create_new_account}</a></li></xen:if>
-	<li><a>{xen:phrase associate_existing_account}</a></li>
-</ul>
-
-<ul id="Tabs">
-	
-	<xen:if is="!{$associateOnly}">
-	<li>
-		<dl class="ctrlUnit">
-			<dt><label for="ctrl_username">{xen:phrase name}:</label></dt>
-			<dd>
-				<input type="text" name="username" value="{$externalVisitor.username}" class="textCtrl OptIn" id="ctrl_username" autofocus="true" autocomplete="off" />
-				<p class="explain">{xen:phrase this_is_name_that_will_be_shown_with_your_messages}</p>
-			</dd>
-		</dl>
-	
-		<dl class="ctrlUnit">
-			<dt><label for="ctrl_email">{xen:phrase email}:</label></dt>
-			<dd>{$externalVisitor.user_email}</dd>
-		</dl>
-		
-		<xen:include template="custom_fields_edit" />
-	
-		<dl class="ctrlUnit">
-			<dt><label for="ctrl_timezone">{xen:phrase time_zone}:</label></dt>
-			<dd>
-				<select name="timezone" class="textCtrl AutoTimeZone OptOut" id="ctrl_timezone">
-					<xen:foreach loop="$timeZones" key="$identifier" value="$name">
-						<option value="{$identifier}" {xen:selected "{$identifier} == {$xenOptions.guestTimeZone}"}>{$name}</option>
-					</xen:foreach>
-				</select>
-			</dd>
-		</dl>
-		
-		<dl class="ctrlUnit submitUnit">
-			<dt></dt>
-			<dd>
-				<xen:if is="{$tosUrl}">
-					<ul>
-						<li>
-							{xen:phrase i_agree_to_terms_and_rules, 'checkbox=<input type="checkbox" name="agree" value="1" id="ctrl_agree" class="Disabler" />', 'terms_attributes=href="{$tosUrl}" target="_blank"'}
-							<ul id="ctrl_agree_Disabler">
-								<li><input type="submit" value="{xen:phrase sign_up}" accesskey="s" class="button primary" /></li>
-							</ul>						
-						</li>
-					</ul>
-				<xen:else />
-					<input type="submit" value="{xen:phrase sign_up}" accesskey="s" class="button primary" />
-				</xen:if>
-			</dd>
-		</dl>
-	
-	</li>
-	</xen:if>
-
-	<li>
-		<dl class="ctrlUnit">
-			<dt><label for="ctrl_associate_login">{xen:phrase associate_with}:</label></dt>
-			<dd>
-				<xen:if is="{$existingUser}">
-					{$existingUser.username}
-					<xen:if is="{$emailMatch}">
-						<p class="explain">{xen:phrase bdapi_consumer_matches_email_address_associated_with_your_x_account, 'provider={$provider.name}'}</p>
-					</xen:if>
-					<input type="hidden" name="associate_login" value="{$existingUser.username}" />
-					<input type="hidden" name="force_assoc" value="1" />
-				<xen:else />
-					<input type="text" name="associate_login" class="textCtrl" id="ctrl_associate_login" />
-				</xen:if>
-			</dd>
-		</dl>
-		
-		<dl class="ctrlUnit">
-			<dt><label for="ctrl_associate_password">{xen:phrase password}:</label></dt>
-			<dd>
-				<input type="password" name="associate_password" class="textCtrl" id="ctrl_associate_password" />
-				<p class="explain">{xen:phrase password_of_x_account_wish_to_associate_with_not_y, 'board_title={$xenOptions.boardTitle}', 'provider={$provider.name}'}</p>
-			</dd>
-		</dl>
-		
-		<dl class="ctrlUnit submitUnit">
-			<dt></dt>
-			<dd><input type="submit" value="{xen:phrase associate_account}" name="associate" accesskey="a" class="button primary" /></dd>
-		</dl>
-	</li>
-
-</ul>
-
-<input type="hidden" name="_xfToken" value="{$visitor.csrf_token_page}" />
-<input type="hidden" name="redirect" value="{$redirect}" />
-<input type="hidden" name="provider" value="{$provider.code}" />
-<input type="hidden" name="refresh_token" value="{$externalToken.refresh_token}" />
-<input type="hidden" name="scope" value="{$externalToken.scope}" />
-</form>]]></template>
-  </templates>
-  <public_template_modifications>
-    <modification template="account_wrapper" modification_key="bdapi_consumer_account_wrapper" description="Enable account/externalAccounts link" execution_order="10" enabled="1" action="str_replace">
-      <find><![CDATA[{$xenOptions.facebookAppId} OR]]></find>
-      <replace><![CDATA[$0 {xen:helper bdApiConsumer_getOption, _activated} OR]]></replace>
-    </modification>
-    <modification template="helper_login_form" modification_key="bdapi_consumer_login" description="Insert providers" execution_order="10" enabled="1" action="str_replace">
-      <find><![CDATA[</form>]]></find>
-      <replace><![CDATA[<xen:if is="{xen:helper bdApiConsumer_getOption, _activated}">
-	<xen:include template="bdapi_consumer_providers">
-		<xen:set var="$from">login_form</xen:set>
-	</xen:include>
-</xen:if>
-
-$0]]></replace>
-    </modification>
-    <modification template="login_bar_form" modification_key="bdapi_consumer_login_bar_eauth_items" description="Insert providers" execution_order="10" enabled="1" action="preg_replace">
-      <find><![CDATA[#(<xen:hook name="login_bar_eauth_items">.+?)(</xen:hook>)#s]]></find>
-      <replace><![CDATA[$1
-
-<xen:if is="{xen:helper bdApiConsumer_getOption, _activated}">
-	<xen:include template="bdapi_consumer_providers">
-		<xen:set var="$from">login_bar</xen:set>
-	</xen:include>
-</xen:if>
-
-$2]]></replace>
-    </modification>
-    <modification template="login_bar_form" modification_key="bdapi_consumer_login_bar_eauth_set" description="set $eAuth=1" execution_order="10" enabled="1" action="str_replace">
-      <find><![CDATA[<xen:hook name="login_bar_eauth_set">]]></find>
-      <replace><![CDATA[$0
-
-<xen:if is="{xen:helper bdApiConsumer_getOption, _showButtons}">
-	<xen:set var="$eAuth">1</xen:set>
-</xen:if>]]></replace>
-    </modification>
-    <modification template="navigation_visitor_tab" modification_key="bdapi_consumer_navigation_visitor_tab" description="Enable account/externalAccounts link" execution_order="10" enabled="1" action="str_replace">
-      <find><![CDATA[{$xenOptions.facebookAppId} OR]]></find>
-      <replace><![CDATA[$0 {xen:helper bdApiConsumer_getOption, _activated} OR]]></replace>
-    </modification>
-    <modification template="page_container_js_body" modification_key="bdapi_consumer_page_container_js_body" description="Insert auto login scripts" execution_order="10" enabled="1" action="preg_replace">
-      <find><![CDATA[#\A.+\z#s]]></find>
-      <replace><![CDATA[$0
-
-<xen:include template="bdapi_consumer_auto_login_js" />]]></replace>
-    </modification>
-    <modification template="account_external_accounts" modification_key="bdapiconsumer_account_external_accounts" description="Merge our page with system External Accounts page" execution_order="10" enabled="1" action="preg_replace">
-      <find><![CDATA[#.+#s]]></find>
-      <replace><![CDATA[$0
-
-<xen:include template="bdapi_consumer_account_external">
-	<xen:set var="$bdApiConsumer_noTitle">1</xen:set>
-</xen:include>]]></replace>
-    </modification>
-  </public_template_modifications>
-  <bb_code_media_sites/>
-  <bb_codes/>
-</addon>
diff --git a/xenforo_consumer/library/bdApiConsumer/bdApi/Model/Subscription.php b/xenforo_consumer/library/bdApiConsumer/bdApi/Model/Subscription.php
deleted file mode 100644
index ec7779ec..00000000
--- a/xenforo_consumer/library/bdApiConsumer/bdApi/Model/Subscription.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class bdApiConsumer_bdApi_Model_Subscription extends XFCP_bdApiConsumer_bdApi_Model_Subscription
-{
-    protected function _preparePingDataManyNotification($pingDataMany)
-    {
-        $pingDataMany = parent::_preparePingDataManyNotification($pingDataMany);
-
-        foreach (array_keys($pingDataMany) as $key) {
-            if (!empty($pingDataMany[$key]['object_data']['notification_type'])) {
-                if (strpos($pingDataMany[$key]['object_data']['notification_type'], 'bdapi_consumer_') === 0) {
-                    // do not push out pings of our own alerts
-                    // may cause loop if a site installs both [bd] API and [bd] API Consumer
-                    unset($pingDataMany[$key]);
-                }
-            }
-        }
-
-        return $pingDataMany;
-    }
-
-}