Make BaseApi->checkAllowedScope into an object method

- It isn't called from static contexts anymore

diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php
index 10e4c9db04cec2542707e7266d02932d24068f01..ee9d098da4620f44088513022357dbd139299c2c 100644 (file)
--- a/src/Module/ActivityPub/Inbox.php
+++ b/src/Module/ActivityPub/Inbox.php
@@ -45,7 +45,7 @@ class Inbox extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid  = self::getCurrentUserID();
                $page = $request['page'] ?? null;
 

diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index 3dc0f00e74423086c5244106c414e04d838f3dd6..e637a8e55300cf1d4b3bd50e826ce6698a60dc56 100644 (file)
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -58,7 +58,7 @@ class Outbox extends BaseApi
 
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid      = self::getCurrentUserID();
                $postdata = Network::postdata();
 

diff --git a/src/Module/ActivityPub/Whoami.php b/src/Module/ActivityPub/Whoami.php
index 67128d99c153e2c842336cf5651c9de2cfb6ef7e..d78f6e83f73958f4591ae82b5c1068f459044e90 100644 (file)
--- a/src/Module/ActivityPub/Whoami.php
+++ b/src/Module/ActivityPub/Whoami.php
@@ -38,7 +38,7 @@ class Whoami extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $owner = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index d8edfd1a3e1c10f3ece4bd5463e6d1f05387c6df..e0935c8ef2ee260a07dd536ec7a29d68a29f7a2b 100644 (file)
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -44,7 +44,7 @@ class Activity extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Circle/Create.php b/src/Module/Api/Friendica/Circle/Create.php
index 8998dbdd9510a922eab6a2a8606057cb0a522e5f..ab38950aeeaa1fb0ab49940b4b59484b2fb3ebdc 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Create.php
+++ b/src/Module/Api/Friendica/Circle/Create.php
@@ -34,7 +34,7 @@ class Create extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Friendica/Circle/Delete.php b/src/Module/Api/Friendica/Circle/Delete.php
index 3bbe5bc7b35dc8c5ae5b0a26d477cc7bf255fcd9..3e40ecf6db7534dc855b626336ae65e968a5a04e 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Delete.php
+++ b/src/Module/Api/Friendica/Circle/Delete.php
@@ -34,7 +34,7 @@ class Delete extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Circle/Show.php b/src/Module/Api/Friendica/Circle/Show.php
index c6936dbe3c3eca04d4305e262c45e77b1aa3eedd..c9e6f981d5e119c5bdc0ea181b25ba4386aadeb8 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Show.php
+++ b/src/Module/Api/Friendica/Circle/Show.php
@@ -35,7 +35,7 @@ class Show extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
                $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 

diff --git a/src/Module/Api/Friendica/Circle/Update.php b/src/Module/Api/Friendica/Circle/Update.php
index d43082c7944eb366febb9f6c265d92fb84a6469c..b44d14290c843646d6faf4d1566cbc68ecb46774 100644 (file)
--- a/src/Module/Api/Friendica/Circle/Update.php
+++ b/src/Module/Api/Friendica/Circle/Update.php
@@ -35,7 +35,7 @@ class Update extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Friendica/DirectMessages/Search.php b/src/Module/Api/Friendica/DirectMessages/Search.php
index 04c7a405b4343b7e891de470771a25368b860020..dd83e6185adc6aa0dc5ce5a57c532df0a7c8a9e5 100644 (file)
--- a/src/Module/Api/Friendica/DirectMessages/Search.php
+++ b/src/Module/Api/Friendica/DirectMessages/Search.php
@@ -54,7 +54,7 @@ class Search extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php
index aa9fc0dac8679d6a71f58fdcd62e0c4fb8692597..eff80968586e1024122a652a021e6db6acd6d3ad 100644 (file)
--- a/src/Module/Api/Friendica/DirectMessages/Setseen.php
+++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php
@@ -32,7 +32,7 @@ class Setseen extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Events/Create.php b/src/Module/Api/Friendica/Events/Create.php
index edc1c5936ba24e8f325cf208a9df47b50df371c0..57bfe15b86b954c4b6812a8a6aa581abe06281d3 100644 (file)
--- a/src/Module/Api/Friendica/Events/Create.php
+++ b/src/Module/Api/Friendica/Events/Create.php
@@ -40,7 +40,7 @@ class Create extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Friendica/Events/Delete.php b/src/Module/Api/Friendica/Events/Delete.php
index b148c94e30f70fb7bb74b357e0c3c7c9a20177cf..94d040aa17b74a4e9f4b32a3bcba43fbd39f8d15 100644 (file)
--- a/src/Module/Api/Friendica/Events/Delete.php
+++ b/src/Module/Api/Friendica/Events/Delete.php
@@ -35,7 +35,7 @@ class Delete extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index a0986d8b0efe739fa1d41cb466137f343ba5cd3a..dd349205a4879ebd9e3c907dfd23ae3498a264fb 100644 (file)
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -34,7 +34,7 @@ class Index extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php
index f61d3451c93af7eeb3144f4504f95b5274ed4474..896b719d73438c25907d95403cb78c0a4676d62a 100644 (file)
--- a/src/Module/Api/Friendica/Notification.php
+++ b/src/Module/Api/Friendica/Notification.php
@@ -33,7 +33,7 @@ class Notification extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $Notifies = DI::notify()->selectAllForUser($uid, 50);

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index c0c50dbe7069e70d0ab43528f84be0c01c13fbed..5699b15888771c7773c30a92f3561e8647cf4e22 100644 (file)
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@ -40,7 +40,7 @@ class Seen extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                if (DI::args()->getArgc() !== 4) {

diff --git a/src/Module/Api/Friendica/Photo.php b/src/Module/Api/Friendica/Photo.php
index 3653a97fdc4d67b25e3e5a4f8c17e6e6186e85c1..d9031a755d259994ed59b6d79cbe29275cf88df2 100644 (file)
--- a/src/Module/Api/Friendica/Photo.php
+++ b/src/Module/Api/Friendica/Photo.php
@@ -46,7 +46,7 @@ class Photo extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
                $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 

diff --git a/src/Module/Api/Friendica/Photo/Create.php b/src/Module/Api/Friendica/Photo/Create.php
index b08b374111ebf8ca79ca65b9bf86dbe8f80b9daa..771a35c2c0bf569a6d5d200bea145e2e60e5f8aa 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Create.php
+++ b/src/Module/Api/Friendica/Photo/Create.php
@@ -50,7 +50,7 @@ class Create extends BaseApi
 
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid  = BaseApi::getCurrentUserID();
                $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 

diff --git a/src/Module/Api/Friendica/Photo/Lists.php b/src/Module/Api/Friendica/Photo/Lists.php
index 8a0a4d7ebec814d34d5b5a703bafdc84a52120fd..b8ba725141649cd6fd40f0e75242b1b955866c6e 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Lists.php
+++ b/src/Module/Api/Friendica/Photo/Lists.php
@@ -52,7 +52,7 @@ class Lists extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
                $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 

diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php
index 1e40f752c191f14358a53f022d7815722499242c..d9441bd195707939fdab5b968dcb74807cbf5fcf 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Update.php
+++ b/src/Module/Api/Friendica/Photo/Update.php
@@ -50,7 +50,7 @@ class Update extends BaseApi
 
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid  = BaseApi::getCurrentUserID();
                $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 

diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index 023d96797aaa32bc4d62a916c904fb25b9e9c8a0..2058edff56ebd2584d7e898acd6a830d98acd5e3 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -36,7 +36,7 @@ class Delete extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Photoalbum/Index.php b/src/Module/Api/Friendica/Photoalbum/Index.php
index af294585edbb15a217955569379806d63fab4e5a..12de0df41bdbab985f5f83e446428c17a4b9b1ee 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Index.php
+++ b/src/Module/Api/Friendica/Photoalbum/Index.php
@@ -33,7 +33,7 @@ class Index extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $albums = Photo::getAlbums($uid);

diff --git a/src/Module/Api/Friendica/Photoalbum/Show.php b/src/Module/Api/Friendica/Photoalbum/Show.php
index 8e6d77ae56481a36950d46aacbc3c6677a40ab63..66cd56cf0836944a0dd5deeb560279a8f8e937a6 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Show.php
+++ b/src/Module/Api/Friendica/Photoalbum/Show.php
@@ -52,7 +52,7 @@ class Show extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid     = BaseApi::getCurrentUserID();
                $type    = $this->getRequestValue($this->parameters, 'extension', 'json');
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php
index cba99b436bd28799eae88082343f19ec7454f8d9..2ea498c39444af913c62fc0bc81e11e096945712 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Update.php
+++ b/src/Module/Api/Friendica/Photoalbum/Update.php
@@ -34,7 +34,7 @@ class Update extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index 6aa2e8b66db8a9e2810a6c8ef5efc3fd40d5357c..8e68421f4267f6d609ebd4459a747ea9e43438ba 100644 (file)
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -36,7 +36,7 @@ class Show extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                // retrieve general information about profiles for user

diff --git a/src/Module/Api/Friendica/Statuses/Dislike.php b/src/Module/Api/Friendica/Statuses/Dislike.php
index 01bfeba90c6b8142281b51f7ed6f3f7af4dabafe..5491bf1890afc22cceedb675861035643a067647 100644 (file)
--- a/src/Module/Api/Friendica/Statuses/Dislike.php
+++ b/src/Module/Api/Friendica/Statuses/Dislike.php
@@ -35,7 +35,7 @@ class Dislike extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Friendica/Statuses/Undislike.php b/src/Module/Api/Friendica/Statuses/Undislike.php
index 4ede1fd945a809670df41bee6095fc91a09a5ad3..a646045e53179103014ea414b7eb151200760947 100644 (file)
--- a/src/Module/Api/Friendica/Statuses/Undislike.php
+++ b/src/Module/Api/Friendica/Statuses/Undislike.php
@@ -35,7 +35,7 @@ class Undislike extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
index 522b237b6cb439a9fa289cee4a03a1c69a86dd86..b7dff6f8c7fa518c61c89996951ae08795165b5e 100644 (file)
--- a/src/Module/Api/GNUSocial/Statusnet/Conversation.php
+++ b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
@@ -37,7 +37,7 @@ class Conversation extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index c4afb74a3e13f0c600a4bf3add0a197cab31b79d..1ddafda5696e9fa8f11b5f3ed87c999869e6ea66 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -34,7 +34,7 @@ class Block extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
index 52c0c2831f02bc64e5ae8682dfa4aed7b5ca61ff..c57b63cf66109a3eca3e1f6ad7aa3989ee3a5eb6 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
+++ b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
@@ -34,7 +34,7 @@ class FeaturedTags extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
 
                $this->jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index ad290f5ab49926c759ec0d3660947d62c95f52a9..a666f2f91ded47050c0f6c0db4af3a8d42a13cc4 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -33,7 +33,7 @@ class Follow extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index 65c7ac42d03ed8e760b8771cd6f59c2b2b7a7a26..e433943c8f73218a59e1f67f57ebaf41472a5f2d 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -37,7 +37,7 @@ class Followers extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index 5da678d9d5bcc87aa394a41d47f99535708cd0b7..3b19e1eedc26b42b0b9e6de9f4a58de8352a26c9 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -37,7 +37,7 @@ class Following extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
index ac2f2ab55e49cfad6c9e25a8317ec7510fd5feb5..97ec4ecbd1eb5cb522f099ab352c2170800e963a 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
+++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
@@ -34,7 +34,7 @@ class IdentityProofs extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
 
                $this->jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index d39f790810171b46119132beb34086817cf48185..4a494838b03a67318ee1f67a0e61764ea824d3fe 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -37,7 +37,7 @@ class Lists extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index f08e48154389327b0d8775e95f3be70b430b4e80..4169cb90fa4fd3296f5b924effc65ee04a3270a7 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -33,7 +33,7 @@ class Mute extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index fc7e72247854f535c4ead192a156acf7d27b09a0..24df3b3578226ee877773d9faa2848e77cb440d0 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -34,7 +34,7 @@ class Note extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Relationships.php b/src/Module/Api/Mastodon/Accounts/Relationships.php
index 531fcadd18a6e2d74d34a87cc6c55f566abee8bc..4ae5b0669098d445729956c900773d57d6ef327e 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Relationships.php
+++ b/src/Module/Api/Mastodon/Accounts/Relationships.php
@@ -36,7 +36,7 @@ class Relationships extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php
index a4936092cec509823155f215e8774099f75f0878..70b42494f4e3b53a811dd4cc0790051e871add01 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Search.php
+++ b/src/Module/Api/Mastodon/Accounts/Search.php
@@ -38,7 +38,7 @@ class Search extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index 35b532012989334b6cefc3d5ea84501120498fc5..8d8fb3e39ce22e6beaef8591b953e9a8c59806cf 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -33,7 +33,7 @@ class Unblock extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index c4bc172006452adeab0885c7a0e8dffcadd90954..83676f25a2ccdd9c68149207892c566744966a8d 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -33,7 +33,7 @@ class Unfollow extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index a2cf9082031edb5c6ca30d6359b2f25e88f8001d..7708e1472b7ff787fd20171a81d9e52253ed4ce7 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -33,7 +33,7 @@ class Unmute extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index 170861461ab4b89ecb19eec9f1b2e433d8031786..69c992c48de6095495258eacb8e19504d4f0f6fa 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -36,7 +36,7 @@ class UpdateCredentials extends BaseApi
 {
        protected function patch(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $owner = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index d59549ae8b0d50528b96291ae24ee75a3d3eee8f..2e6d64ff6e8717b2d62bd9096be9ee2dd6939b74 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -37,7 +37,7 @@ class VerifyCredentials extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $self = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Mastodon/Announcements.php b/src/Module/Api/Mastodon/Announcements.php
index 8e05659474321b92862ec79cc4233c2ba025ae70..10f6037e7766f40d3d889b27c13a84cd33e8fc62 100644 (file)
--- a/src/Module/Api/Mastodon/Announcements.php
+++ b/src/Module/Api/Mastodon/Announcements.php
@@ -34,7 +34,7 @@ class Announcements extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
 
                // @todo Possibly use the message from the pageheader addon for this
                $this->jsonExit([]);

diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
index c21e1e438a08cfe20f0f2965a5f74b81898bd131..82e0016ef4529f36e7047b545ff9c196fe4da376 100644 (file)
--- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
@@ -32,7 +32,7 @@ class VerifyCredentials extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $application = self::getCurrentApplication();
 
                if (empty($application['id'])) {

diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index 1495b763576b8f65eadef854f112ec00e0993f92..f4256f165d7057a75ec4641329ba40b2895d4dc6 100644 (file)
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -36,7 +36,7 @@ class Blocks extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php
index dab072b30754232e9bc12a18027591dd4df5d59e..fb4694055b4bbdb01dc879b5508faed7606895eb 100644 (file)
--- a/src/Module/Api/Mastodon/Bookmarks.php
+++ b/src/Module/Api/Mastodon/Bookmarks.php
@@ -39,7 +39,7 @@ class Bookmarks extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index abffff9ede5299dfa6101c43c64c62b877ca94dc..71239a0ff1467383279445afdadddf90e639b40e 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -33,7 +33,7 @@ class Conversations extends BaseApi
 {
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($this->parameters['id'])) {
@@ -51,7 +51,7 @@ class Conversations extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index e8b101634f00f3aee24cd9c0a6db8848c57ffabe..5bb7b3526cc77c999b3391ee2f70f4e5b8d09663 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -33,7 +33,7 @@ class Read extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Favourited.php b/src/Module/Api/Mastodon/Favourited.php
index 56beb93be2216ddf02f28cd832dcf9d44f643c58..141099edd07474d07e3ba86889ce13b82d5ce4b9 100644 (file)
--- a/src/Module/Api/Mastodon/Favourited.php
+++ b/src/Module/Api/Mastodon/Favourited.php
@@ -41,7 +41,7 @@ class Favourited extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index 3af93d24cbe033b1162dd54a2876de7ed41a22ed..5a40574a477676a757c43987fdf700729d0e95fb 100644 (file)
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -33,7 +33,7 @@ class Filters extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
 
                $this->response->unsupported(Router::POST, $request);
        }
@@ -43,7 +43,7 @@ class Filters extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
 
                $this->jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index 78efa4819adadc68f8ab7f766bbf7ea257b8b8f3..9947e8d4826d7a0715e3b7c9d86397f12969467a 100644 (file)
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -44,7 +44,7 @@ class FollowRequests extends BaseApi
         */
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_FOLLOW);
+               $this->checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                $cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
@@ -89,7 +89,7 @@ class FollowRequests extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/FollowedTags.php b/src/Module/Api/Mastodon/FollowedTags.php
index 9052290063cb1887f852ca8902cbaf1d861313a4..a327db727ea04a79024844e5c400129bb1e68bda 100644 (file)
--- a/src/Module/Api/Mastodon/FollowedTags.php
+++ b/src/Module/Api/Mastodon/FollowedTags.php
@@ -32,7 +32,7 @@ class FollowedTags extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 296009cc083b381fb2c380e7699ba9261b1de92b..571927a16845b55a04a8b7620e9afb9ef5e2448a 100644 (file)
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -33,7 +33,7 @@ class Lists extends BaseApi
 {
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {
@@ -53,7 +53,7 @@ class Lists extends BaseApi
 
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -93,7 +93,7 @@ class Lists extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 2d202c34dad722848057d49628fc8eb1a3e552c4..135701904ec9b0efcfe29286a384e00760fb6862 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -36,7 +36,7 @@ class Accounts extends BaseApi
 {
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
 
                $request = $this->getRequest([
                        'account_ids' => [], // Array of account IDs to remove from the list
@@ -51,7 +51,7 @@ class Accounts extends BaseApi
 
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
 
                $request = $this->getRequest([
                        'account_ids' =>  [], // Array of account IDs to add to the list
@@ -69,7 +69,7 @@ class Accounts extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index 2f0a6b6b74534078b603e159cd0c989ff5897dae..eb19acf8ebda235a91852db15ced58d6d2d8003a 100644 (file)
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -34,7 +34,7 @@ class Markers extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 
@@ -69,7 +69,7 @@ class Markers extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 

diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index 3fe8dfa3d86383c2c1168a7276048a902389ebe0..b2424f022732ce920179189a4cc4fb47b8321f82 100644 (file)
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -35,7 +35,7 @@ class Media extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -63,7 +63,7 @@ class Media extends BaseApi
 
        public function put(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -100,7 +100,7 @@ class Media extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index 71c17cc5113f8f686232deba8907624a531b122e..177b6187769203f33cacac095685e423eac26445 100644 (file)
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -36,7 +36,7 @@ class Mutes extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index 94247b80b6a886dd348fc91ae66efbacfca75f32..ee3a253b3d7079f233a3358df0a9392681bb75a7 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -41,7 +41,7 @@ class Notifications extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (!empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php
index cb2604337cb0aaf1146eb9cb5f8072e6ce0b7779..1f843f0487e61057b4a366b2a8b6bd994fff1792 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Clear.php
+++ b/src/Module/Api/Mastodon/Notifications/Clear.php
@@ -32,7 +32,7 @@ class Clear extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                DI::notification()->setAllDismissedForUser($uid);

diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index 753c0ac5dcf733cba473a1f35e3b499240a4b865..50d1be27b5de6460c4dbc812e9e23b7bb1c70b01 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -34,7 +34,7 @@ class Dismiss extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Preferences.php b/src/Module/Api/Mastodon/Preferences.php
index d1f9d2d3076068e20acc4dfced62071da9006b38..7a8eb117591923648e9c66e9680d0473f1a7b735 100644 (file)
--- a/src/Module/Api/Mastodon/Preferences.php
+++ b/src/Module/Api/Mastodon/Preferences.php
@@ -36,7 +36,7 @@ class Preferences extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $user = User::getById($uid, ['language', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);

diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index a801880131e86b66af67fd950286ba644c6d9052..a03d0250cc4e210d53e3f7d68c06677872af5ce9 100644 (file)
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -49,7 +49,7 @@ class PushSubscription extends BaseApi
 
        protected function post(array $request = []): void
        {
-               self::checkAllowedScope(self::SCOPE_PUSH);
+               $this->checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 
@@ -83,7 +83,7 @@ class PushSubscription extends BaseApi
 
        public function put(array $request = []): void
        {
-               self::checkAllowedScope(self::SCOPE_PUSH);
+               $this->checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 
@@ -122,7 +122,7 @@ class PushSubscription extends BaseApi
 
        protected function delete(array $request = []): void
        {
-               self::checkAllowedScope(self::SCOPE_PUSH);
+               $this->checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 
@@ -139,7 +139,7 @@ class PushSubscription extends BaseApi
 
        protected function rawContent(array $request = []): void
        {
-               self::checkAllowedScope(self::SCOPE_PUSH);
+               $this->checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
                $application = self::getCurrentApplication();
 

diff --git a/src/Module/Api/Mastodon/Reports.php b/src/Module/Api/Mastodon/Reports.php
index 2706aefe3c12e30c96c63222dfe0e5cb0fb85b14..324fe49d89155c16bc4792ef6f3a56e66e9bbd7b 100644 (file)
--- a/src/Module/Api/Mastodon/Reports.php
+++ b/src/Module/Api/Mastodon/Reports.php
@@ -51,7 +51,7 @@ class Reports extends BaseApi
 
        public function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
 
                $request = $this->getRequest([
                        'account_id' => '',      // ID of the account to report

diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index 6ac9430c679346df7686531bb8d7e45d582c058a..5204ab5563b004d0f8de8b3cb3b9e403e0b83c98 100644 (file)
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -35,7 +35,7 @@ class ScheduledStatuses extends BaseApi
 {
        public function put(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $this->response->unsupported(Router::PUT, $request);
@@ -43,7 +43,7 @@ class ScheduledStatuses extends BaseApi
 
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {
@@ -64,7 +64,7 @@ class ScheduledStatuses extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (isset($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index e0f629527a28c28123099a5c7a7f17b76e62ce41..ec4527f00deddea3fd979fb55caf14f033bb699d 100644 (file)
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -43,7 +43,7 @@ class Search extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 0369d2026c7debe2c4acdf2c5c3942a99b2352c4..749e0aa39f08037cacf05e62cec0209befe5322f 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -49,7 +49,7 @@ class Statuses extends BaseApi
 {
        public function put(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -164,7 +164,7 @@ class Statuses extends BaseApi
 
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([
@@ -315,7 +315,7 @@ class Statuses extends BaseApi
 
        protected function delete(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index ff34a8529fda92f270445a78361b4c68386addc0..f2e5ff40d453cbee9395862ea1fc5cf33dbae1c2 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -35,7 +35,7 @@ class Bookmark extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index da698c72f882849c55f35cefce7920b3defa014d..d8cf8054ee8e894afaed87c6fffbb8396465204c 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -35,7 +35,7 @@ class Favourite extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index 56c352b34c8893930de533e5d0cf5435d9b91c24..d282770dfd79d10d131b077e61d8569df743e41a 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -35,7 +35,7 @@ class Mute extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index c95f02e9b086b505af5ddcfa073b3d0fd600dd1f..d9f95132c382ad2b4d171b6c0325d89e6594b3ac 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -34,7 +34,7 @@ class Pin extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index d0cf46b06d8ac2f8e3dba1d1b980e5fdcebfbb09..6c368b019a2e95218d2cf304d29bf39f1018d618 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -38,7 +38,7 @@ class Reblog extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Source.php b/src/Module/Api/Mastodon/Statuses/Source.php
index db997b0a3e40390a2582b6c0378c865d1faccab2..408df3aad584fd019ac6fde70500111b5e6992bd 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Source.php
+++ b/src/Module/Api/Mastodon/Statuses/Source.php
@@ -37,7 +37,7 @@ class Source extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index 3bda450e484130fca8993f619a9365611558d263..36902fb21807a9ca912524c1440c6683e2667829 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -35,7 +35,7 @@ class Unbookmark extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index c41ed8d891923b63cfb4d772a42d0fddebe409dd..c6a924b2a4502f58233c9f607dc789337eb15543 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -35,7 +35,7 @@ class Unfavourite extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index 3668cb94599e29d7e35f7a2390612c17cf7dfde9..edf14925d060ea9840220fed7ab3f8579f791e41 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -35,7 +35,7 @@ class Unmute extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index fd23e3014b9216a3d8c7415b4c80353ba3150d66..0f5d44afac26b634293f80894bc5c1710b32411d 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -34,7 +34,7 @@ class Unpin extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index 3d1f7ea9a6e26622608a1e0567e1f0101ef961fe..4f72eac25d6d5f13beecc63540c3e75e3196661f 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -37,7 +37,7 @@ class Unreblog extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php
index f18637b3d5e60417b6dd16b3b3cc4a5e059933d5..7c5d5344961a9961e9b987ef7c28a328040b61be 100644 (file)
--- a/src/Module/Api/Mastodon/Suggestions.php
+++ b/src/Module/Api/Mastodon/Suggestions.php
@@ -36,7 +36,7 @@ class Suggestions extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Tags.php b/src/Module/Api/Mastodon/Tags.php
index 474bbe079658a7a36629d9b0f53387754e0108b3..d636dd9126ee20c9481cf502d7265f85b917f317 100644 (file)
--- a/src/Module/Api/Mastodon/Tags.php
+++ b/src/Module/Api/Mastodon/Tags.php
@@ -36,7 +36,7 @@ class Tags extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['hashtag'])) {

diff --git a/src/Module/Api/Mastodon/Tags/Follow.php b/src/Module/Api/Mastodon/Tags/Follow.php
index ec27ea733cb9aa1919c72a1c10adff87d3d85814..a450b2248e586b0b49e16f13a921010687f16b03 100644 (file)
--- a/src/Module/Api/Mastodon/Tags/Follow.php
+++ b/src/Module/Api/Mastodon/Tags/Follow.php
@@ -33,7 +33,7 @@ class Follow extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['hashtag'])) {

diff --git a/src/Module/Api/Mastodon/Tags/Unfollow.php b/src/Module/Api/Mastodon/Tags/Unfollow.php
index 02847f1fd2f1ed752d91fced2707447237e91871..b4a1a7e73d0825e2b2eea09ed212b7a281821123 100644 (file)
--- a/src/Module/Api/Mastodon/Tags/Unfollow.php
+++ b/src/Module/Api/Mastodon/Tags/Unfollow.php
@@ -33,7 +33,7 @@ class Unfollow extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['hashtag'])) {

diff --git a/src/Module/Api/Mastodon/Timelines/Direct.php b/src/Module/Api/Mastodon/Timelines/Direct.php
index e326bc7a12f3d27fe4a36d18bf9089bbdb6dc3d6..c1e71097097af31a57af3a8222f634b83045d65c 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Direct.php
+++ b/src/Module/Api/Mastodon/Timelines/Direct.php
@@ -37,7 +37,7 @@ class Direct extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index e9985508c4f8d36ef5e17986e1cdcc369f46ddc2..d92a87636f5dd6f9fbbeccc3ca0d24dbddbf23e0 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -41,7 +41,7 @@ class Home extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = $this->getRequest([

diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index fa4605128bf9b5b02a6e71940c94d7e97fe47ba2..2834b63fc36d080fadd922cbea32177eb11793af 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -41,7 +41,7 @@ class ListTimeline extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 5b3e82508b1c1d28326b0f6f97efdce4f340e459..9bbafd587e7a5882c0ee6dc9d5b4d78323f635d3 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -41,7 +41,7 @@ class Tag extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($this->parameters['hashtag'])) {

diff --git a/src/Module/Api/Twitter/Account/UpdateProfile.php b/src/Module/Api/Twitter/Account/UpdateProfile.php
index c58b8d24c8b54511a11e11043da431bcf18e6f88..2dfd2fb24da44082b0d4b993a851119b86ebf488 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfile.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfile.php
@@ -34,7 +34,7 @@ class UpdateProfile extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                $api_user = DI::twitterUser()->createFromUserId($uid, true)->toArray();

diff --git a/src/Module/Api/Twitter/Account/UpdateProfileImage.php b/src/Module/Api/Twitter/Account/UpdateProfileImage.php
index f6ac2d1984b5db1ce1fedf878990c51f191cc478..421963a48ef3863d6313369d83a157162f69eb87 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfileImage.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfileImage.php
@@ -35,7 +35,7 @@ class UpdateProfileImage extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // get mediadata from image or media (Twitter call api/account/update_profile_image provides image)

diff --git a/src/Module/Api/Twitter/Account/VerifyCredentials.php b/src/Module/Api/Twitter/Account/VerifyCredentials.php
index 738c08e5a26facfc0a024d3cc2ffa3f217b46986..b6f608a83acc09b96ab46a40aa7120bb4219905d 100644 (file)
--- a/src/Module/Api/Twitter/Account/VerifyCredentials.php
+++ b/src/Module/Api/Twitter/Account/VerifyCredentials.php
@@ -34,7 +34,7 @@ class VerifyCredentials extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $skip_status = $this->getRequestValue($request, 'skip_status', false);

diff --git a/src/Module/Api/Twitter/Blocks/Ids.php b/src/Module/Api/Twitter/Blocks/Ids.php
index e08dcf40fbea14e3a82786460f792c096bdb7dcd..d4798b2f3e7a35bc594559cc5a14a5d95b886c25 100644 (file)
--- a/src/Module/Api/Twitter/Blocks/Ids.php
+++ b/src/Module/Api/Twitter/Blocks/Ids.php
@@ -33,7 +33,7 @@ class Ids extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Blocks/Lists.php b/src/Module/Api/Twitter/Blocks/Lists.php
index ec5d711200bc0f15e3e08b1fd0e33d5ba87a0db6..51d682ec1b37ce1b06c73c5f6298062fcba99803 100644 (file)
--- a/src/Module/Api/Twitter/Blocks/Lists.php
+++ b/src/Module/Api/Twitter/Blocks/Lists.php
@@ -33,7 +33,7 @@ class Lists extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php
index 1ff9c7833920a29a45e521bda1b2fb68a5a18015..948e4980e3dd51bca14cd7943f2e6185094c76e1 100644 (file)
--- a/src/Module/Api/Twitter/ContactEndpoint.php
+++ b/src/Module/Api/Twitter/ContactEndpoint.php
@@ -42,7 +42,7 @@ abstract class ContactEndpoint extends BaseApi
        {
                parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
        }
 
        /**

diff --git a/src/Module/Api/Twitter/DirectMessages/All.php b/src/Module/Api/Twitter/DirectMessages/All.php
index cfd43ed845d01a8c7baef024d7e9a7682982bae1..8df7516770095b3000345e51363537f977429d40 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/All.php
+++ b/src/Module/Api/Twitter/DirectMessages/All.php
@@ -31,7 +31,7 @@ class All extends DirectMessagesEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $this->getMessages($request, $uid, []);

diff --git a/src/Module/Api/Twitter/DirectMessages/Conversation.php b/src/Module/Api/Twitter/DirectMessages/Conversation.php
index 91157e970115c87aa5d33ff4acacc9df18a715cc..6b3e0a1d384ecc41b384b32ec0eab9314c032a90 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Conversation.php
+++ b/src/Module/Api/Twitter/DirectMessages/Conversation.php
@@ -31,7 +31,7 @@ class Conversation extends DirectMessagesEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $this->getMessages($request, $uid, ["`parent-uri` = ?", $this->getRequestValue($request, 'uri', '')]);

diff --git a/src/Module/Api/Twitter/DirectMessages/Destroy.php b/src/Module/Api/Twitter/DirectMessages/Destroy.php
index 7108263ba88f66077a4217828e8829f349a124ff..06879a65906abdce27a3026204214327a6144db1 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Destroy.php
+++ b/src/Module/Api/Twitter/DirectMessages/Destroy.php
@@ -49,7 +49,7 @@ class Destroy extends BaseApi
        }
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/DirectMessages/Inbox.php b/src/Module/Api/Twitter/DirectMessages/Inbox.php
index 798cceb4109dc828040c649aabee6ed1b64bf608..b163ca29b6c8fa3d5118fc1273a736d06f3facd7 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Inbox.php
+++ b/src/Module/Api/Twitter/DirectMessages/Inbox.php
@@ -34,7 +34,7 @@ class Inbox extends DirectMessagesEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
                $pcid = Contact::getPublicIdByUserId($uid);
 

diff --git a/src/Module/Api/Twitter/DirectMessages/NewDM.php b/src/Module/Api/Twitter/DirectMessages/NewDM.php
index d111f98cb2ed68b8de7e6980318fbe0fb37db53d..f452560b67358cf3a9994129b503f3334bcac4c0 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/NewDM.php
+++ b/src/Module/Api/Twitter/DirectMessages/NewDM.php
@@ -56,7 +56,7 @@ class NewDM extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                if (empty($request['text']) || empty($request['screen_name']) && empty($request['user_id'])) {

diff --git a/src/Module/Api/Twitter/DirectMessages/Sent.php b/src/Module/Api/Twitter/DirectMessages/Sent.php
index 2db0d483468695a58ee88596e34f0ed1a3959ff6..03f62406ba62cb0faa466d655f8cfcb3a98837e0 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Sent.php
+++ b/src/Module/Api/Twitter/DirectMessages/Sent.php
@@ -34,7 +34,7 @@ class Sent extends DirectMessagesEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
                $pcid = Contact::getPublicIdByUserId($uid);
 

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index 771e0ef489221bb776880481adc1ac823ff4fa78..fbb0a9641ea0c2ab97e9632bcaaf1dc8586da50d 100644 (file)
--- a/src/Module/Api/Twitter/Favorites.php
+++ b/src/Module/Api/Twitter/Favorites.php
@@ -38,7 +38,7 @@ class Favorites extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // in friendica starred item are private

diff --git a/src/Module/Api/Twitter/Favorites/Create.php b/src/Module/Api/Twitter/Favorites/Create.php
index 86a3988046c6e19b71ca21dff040dabc21224f61..28c4adcedc9ae07225631322d0a23f859285f600 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Create.php
+++ b/src/Module/Api/Twitter/Favorites/Create.php
@@ -34,7 +34,7 @@ class Create extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/Favorites/Destroy.php b/src/Module/Api/Twitter/Favorites/Destroy.php
index e481f8a9f2d47d5bdece2ff81837fa1dd2e1306b..0c7f9acae0c04a0767e2089ca3bebe3c90db0f23 100644 (file)
--- a/src/Module/Api/Twitter/Favorites/Destroy.php
+++ b/src/Module/Api/Twitter/Favorites/Destroy.php
@@ -34,7 +34,7 @@ class Destroy extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/Followers/Ids.php b/src/Module/Api/Twitter/Followers/Ids.php
index 21adc682b3b28fe002938292b98eedc4478dca8f..7b7104c7008906c49ee37bdba4a948362bc9e00a 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Ids.php
+++ b/src/Module/Api/Twitter/Followers/Ids.php
@@ -34,7 +34,7 @@ class Ids extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php
index b4064fc27b0e2d995ba0d3f1fe538e5955ad090d..48201134f345b2170fde14d9e0408665c0e632e4 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Lists.php
+++ b/src/Module/Api/Twitter/Followers/Lists.php
@@ -33,7 +33,7 @@ class Lists extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Friends/Ids.php b/src/Module/Api/Twitter/Friends/Ids.php
index e12d67aae572dddff8dfc9d2c1944339aa0e7676..4b4a0e12873e20d1168a882f6072b824aeeaa773 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Ids.php
+++ b/src/Module/Api/Twitter/Friends/Ids.php
@@ -34,7 +34,7 @@ class Ids extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php
index 617d70e4db504b8bd7a0132c99682404a88d09d2..216e299f35956f6ab47e453d73aabefd030b57bc 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Lists.php
+++ b/src/Module/Api/Twitter/Friends/Lists.php
@@ -33,7 +33,7 @@ class Lists extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php
index 05cc304886e1773ba1687126fd576ded3aa5b4dc..2323c5003aef5459df3d46a6a990552e85ff9a7d 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Destroy.php
+++ b/src/Module/Api/Twitter/Friendships/Destroy.php
@@ -54,7 +54,7 @@ class Destroy extends ContactEndpoint
 
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                $owner = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php
index 62c372fa283195fdfc54dd95ffc5863f43a613db..47980608c1b810bd1154ec552f464eca84327161 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Incoming.php
+++ b/src/Module/Api/Twitter/Friendships/Incoming.php
@@ -32,7 +32,7 @@ class Incoming extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id

diff --git a/src/Module/Api/Twitter/Friendships/Show.php b/src/Module/Api/Twitter/Friendships/Show.php
index 6dd1c1d20059ab4fcc1dff75ad28496a5cb85a2e..950cac488bca38b12191d55c5c7ec932c72cbc36 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Show.php
+++ b/src/Module/Api/Twitter/Friendships/Show.php
@@ -35,7 +35,7 @@ class Show extends ContactEndpoint
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $source_cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'source_screen_name', ''), '', $this->getRequestValue($request, 'source_id', 0), $uid);

diff --git a/src/Module/Api/Twitter/Lists/Create.php b/src/Module/Api/Twitter/Lists/Create.php
index ed4650adc6877742baac15ec99a110e8a0b8edb5..aa5f385e150c07c2591252c8d9effe52f4e28bfe 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Create.php
+++ b/src/Module/Api/Twitter/Lists/Create.php
@@ -56,7 +56,7 @@ class Create extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Twitter/Lists/Destroy.php b/src/Module/Api/Twitter/Lists/Destroy.php
index 0e13ac9b2504e54e8ab57c1e2bc3e61b23f99513..d0277bcb767a6bd177556bca27193552d3339ce7 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Destroy.php
+++ b/src/Module/Api/Twitter/Lists/Destroy.php
@@ -56,7 +56,7 @@ class Destroy extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Twitter/Lists/Lists.php b/src/Module/Api/Twitter/Lists/Lists.php
index 8ebef3789f16d0743bba4ed8e618b084610259f4..dbb7e820b93759dd58e269c010ffdf63b8de73cf 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Lists.php
+++ b/src/Module/Api/Twitter/Lists/Lists.php
@@ -33,7 +33,7 @@ class Lists extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // This is a dummy endpoint

diff --git a/src/Module/Api/Twitter/Lists/Ownership.php b/src/Module/Api/Twitter/Lists/Ownership.php
index 11b85c51a3af0a064dd63aecbf247207a9eb091d..4cb7ba26affde3037416458f62e05a56f1c61ade 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Ownership.php
+++ b/src/Module/Api/Twitter/Lists/Ownership.php
@@ -53,7 +53,7 @@ class Ownership extends BaseApi
        }
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $circles = $this->dba->select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null]);

diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php
index 6e12f5908c8f595f18f19099e536f49b230ad40f..4a7ada4b383182b7fb2cc46f0fc809fde580c6fe 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Statuses.php
+++ b/src/Module/Api/Twitter/Lists/Statuses.php
@@ -58,7 +58,7 @@ class Statuses extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                if (empty($request['list_id'])) {

diff --git a/src/Module/Api/Twitter/Lists/Update.php b/src/Module/Api/Twitter/Lists/Update.php
index 17fd4636b9dc01d750eefd8d6e6c2a4147fa64f7..59292fa16272c99517a4eacf7c24043c3bbd0686 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Update.php
+++ b/src/Module/Api/Twitter/Lists/Update.php
@@ -56,7 +56,7 @@ class Update extends BaseApi
 
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                // params

diff --git a/src/Module/Api/Twitter/Media/Metadata/Create.php b/src/Module/Api/Twitter/Media/Metadata/Create.php
index be796363724d75ddb77a2ed7295b0324cb8a4f0b..68ac12f0c6b3708ad3dc6fd50f370b311f64d61b 100644 (file)
--- a/src/Module/Api/Twitter/Media/Metadata/Create.php
+++ b/src/Module/Api/Twitter/Media/Metadata/Create.php
@@ -36,7 +36,7 @@ class Create extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                $postdata = Network::postdata();

diff --git a/src/Module/Api/Twitter/Media/Upload.php b/src/Module/Api/Twitter/Media/Upload.php
index 0ea93f87beb2b5f1bdcb44637888c33d86d2f432..d7400e68bdfd16de559d48a9fa39c804ec203502 100644 (file)
--- a/src/Module/Api/Twitter/Media/Upload.php
+++ b/src/Module/Api/Twitter/Media/Upload.php
@@ -37,7 +37,7 @@ class Upload extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+               $this->checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
                if (empty($_FILES['media'])) {

diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php
index 8a6e5ced82f7a718512ffc0a0cbcf131547fd91d..7a0d6fdb1f231674964a19f36649ba2c4d10a80d 100644 (file)
--- a/src/Module/Api/Twitter/SavedSearches.php
+++ b/src/Module/Api/Twitter/SavedSearches.php
@@ -32,7 +32,7 @@ class SavedSearches extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_READ);
+               $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $terms = DBA::select('search', ['id', 'term'], ['uid' => $uid]);

diff --git a/src/Module/Api/Twitter/Search/Tweets.php b/src/Module/Api/Twitter/Search/Tweets.php
index ec13f00dc089273c2395d1fd58e8bce04d5968ab..9bf8ac28247a961cb1f607e13edf562903b45aab 100644 (file)
--- a/src/Module/Api/Twitter/Search/Tweets.php
+++ b/src/Module/Api/Twitter/Search/Tweets.php
@@ -38,7 +38,7 @@ class Tweets extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                if (empty($request['q'])) {

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index bde3ee678d6390a8feb47fe76af5742d39ad5f8f..8d86e061496d96d52f497708f91861257ed462bd 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -37,7 +37,7 @@ class Destroy extends BaseApi
 {
        protected function post(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/Statuses/HomeTimeline.php b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
index d7caea65dd6a45687fb225d1316f87c5fac00a7f..22715a37178b9bce597f153eb7c3fd09f084aab0 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
@@ -37,7 +37,7 @@ class HomeTimeline extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // get last network messages

diff --git a/src/Module/Api/Twitter/Statuses/Mentions.php b/src/Module/Api/Twitter/Statuses/Mentions.php
index 18d56f1a179303d05af5b229a5447c6747d6bd41..aaacb9f065aface3da5f66def0a55e2e902f97cf 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Mentions.php
+++ b/src/Module/Api/Twitter/Statuses/Mentions.php
@@ -37,7 +37,7 @@ class Mentions extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // get last network messages

diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
index 1f4cbc1b44a892666ce25947ad35fb002877b7ad..6069bc96e4038704fe7988a4c9f9d4c0c2a164c4 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
@@ -35,7 +35,7 @@ class NetworkPublicTimeline extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $count            = $this->getRequestValue($request, 'count', 20, 1, 100);

diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
index 49b9c986f98ee263dcf733b946a1f7ff039e261a..511e4465b71c866e4036084834f86302276d8f5e 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
@@ -35,7 +35,7 @@ class PublicTimeline extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                // get last network messages

diff --git a/src/Module/Api/Twitter/Statuses/Retweet.php b/src/Module/Api/Twitter/Statuses/Retweet.php
index 6640f880c6b36fd96311ff7c10b96dc90a86ef31..e94632b6552ff10d9301ef663f4159294db450ea 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Retweet.php
+++ b/src/Module/Api/Twitter/Statuses/Retweet.php
@@ -41,7 +41,7 @@ class Retweet extends BaseApi
 {
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/Statuses/Show.php b/src/Module/Api/Twitter/Statuses/Show.php
index 67a0b31af5c036c935f4c73db3998312ea7911a1..4d37420a37ec091c22e65057524f9202cb345840 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Show.php
+++ b/src/Module/Api/Twitter/Statuses/Show.php
@@ -39,7 +39,7 @@ class Show extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $id = $this->getRequestValue($request, 'id', 0);

diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php
index b3f0dd8a6f59ba01b10be4a3f4500324a915f872..064eac08a518bb4366220eb99938bf7432273c29 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Update.php
+++ b/src/Module/Api/Twitter/Statuses/Update.php
@@ -46,7 +46,7 @@ class Update extends BaseApi
 {
        public function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $owner = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 2c58fd6aff9aeb9a305b18b686e58beee497b12a..361c8dba2f9f66be3f7d73670c4b03dd34902818 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -38,7 +38,7 @@ class UserTimeline extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]);

diff --git a/src/Module/Api/Twitter/Users/Lookup.php b/src/Module/Api/Twitter/Users/Lookup.php
index 960239f226481d2aa8f3aa6ef5b6e68d65b072e2..4c39ae92b86ad7217d706bea04161fd9f446b043 100644 (file)
--- a/src/Module/Api/Twitter/Users/Lookup.php
+++ b/src/Module/Api/Twitter/Users/Lookup.php
@@ -34,7 +34,7 @@ class Lookup extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $users = [];

diff --git a/src/Module/Api/Twitter/Users/Search.php b/src/Module/Api/Twitter/Users/Search.php
index 2ca30afac78588368b253ec985932b48f637a781..6f26488e65b114c563b2a1f0cb173e77a2b2d8e6 100644 (file)
--- a/src/Module/Api/Twitter/Users/Search.php
+++ b/src/Module/Api/Twitter/Users/Search.php
@@ -37,7 +37,7 @@ class Search extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                $userlist = [];

diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php
index 158c3f18dc9bbadbb55153b57db6f11480399768..25e6012bffce12f7bfa4fbcf01833a8fe798ecc9 100644 (file)
--- a/src/Module/Api/Twitter/Users/Show.php
+++ b/src/Module/Api/Twitter/Users/Show.php
@@ -34,7 +34,7 @@ class Show extends BaseApi
 {
        protected function rawContent(array $request = [])
        {
-               BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+               $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                if (empty($this->parameters['id'])) {

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index d8bf657329a3fab87c307532ffc155b75257ac52..95eb8f04249d005eef54a5162b1d4e8f16c51eec 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -97,7 +97,7 @@ class BaseApi extends BaseModule
                                case Router::PATCH:
                                case Router::POST:
                                case Router::PUT:
-                                       self::checkAllowedScope(self::SCOPE_WRITE);
+                                       $this->checkAllowedScope(self::SCOPE_WRITE);
 
                                        if (!self::getCurrentUserID()) {
                                                throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
@@ -418,22 +418,22 @@ class BaseApi extends BaseModule
         *
         * @param string $scope the requested scope (read, write, follow, push)
         */
-       public static function checkAllowedScope(string $scope)
+       public function checkAllowedScope(string $scope)
        {
                $token = self::getCurrentApplication();
 
                if (empty($token)) {
-                       Logger::notice('Empty application token');
+                       $this->logger->notice('Empty application token');
                        DI::mstdnError()->Forbidden();
                }
 
                if (!isset($token[$scope])) {
-                       Logger::warning('The requested scope does not exist', ['scope' => $scope, 'application' => $token]);
+                       $this->logger->warning('The requested scope does not exist', ['scope' => $scope, 'application' => $token]);
                        DI::mstdnError()->Forbidden();
                }
 
                if (empty($token[$scope])) {
-                       Logger::warning('The requested scope is not allowed', ['scope' => $scope, 'application' => $token]);
+                       $this->logger->warning('The requested scope is not allowed', ['scope' => $scope, 'application' => $token]);
                        DI::mstdnError()->Forbidden();
                }
        }