diff --git a/composer.json b/composer.json index 3055df1..c449a41 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ "mpratt/relativetime": ">=1.0", "firebase/php-jwt": "2.*", "abraham/twitteroauth": "*", - "andreyco/instagram": "3.*", "ezyang/htmlpurifier": "4.*", "p3k/multipart": ">=0.2.0", "tantek/cassis": "*", diff --git a/composer.lock b/composer.lock index 64a263f..defd224 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "2869253e9c190f261651037122249e6f", + "content-hash": "9676d488b166fb91835dc9f7746c9d30", "packages": [ { "name": "abraham/twitteroauth", @@ -60,49 +60,6 @@ ], "time": "2017-06-30T22:02:01+00:00" }, - { - "name": "andreyco/instagram", - "version": "3.4.1", - "source": { - "type": "git", - "url": "https://github.com/Andreyco/Instagram-for-PHP.git", - "reference": "47b322bd3be98ca24f9ca637f14632996dc2e7dc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Andreyco/Instagram-for-PHP/zipball/47b322bd3be98ca24f9ca637f14632996dc2e7dc", - "reference": "47b322bd3be98ca24f9ca637f14632996dc2e7dc", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Andreyco\\Instagram\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-4-Clause" - ], - "authors": [ - { - "name": "Andrej Badin", - "email": "contact@andrejbadin.com", - "homepage": "http://andrejbadin.com" - } - ], - "description": "An easy-to-use PHP Class for accessing Instagram's API.", - "homepage": "https://github.com/Andreyco/Instagram-for-PHP", - "keywords": [ - "api", - "instagram" - ], - "time": "2017-04-13T10:32:53+00:00" - }, { "name": "barnabywalters/mf-cleaner", "version": "v0.1.4", diff --git a/lib/helpers.php b/lib/helpers.php index 57e3374..4d6ca3c 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -377,15 +377,6 @@ function relative_time($date) { return $rel->timeAgo($date); } -function instagram_client() { - return new Andreyco\Instagram\Client(array( - 'apiKey' => Config::$instagramClientID, - 'apiSecret' => Config::$instagramClientSecret, - 'apiCallback' => Config::$base_url . 'auth/instagram/callback', - 'scope' => array('basic','likes'), - )); -} - function validate_photo(&$file) { try { diff --git a/schema/migrations/0008.sql b/schema/migrations/0008.sql new file mode 100644 index 0000000..dcd9dd1 --- /dev/null +++ b/schema/migrations/0008.sql @@ -0,0 +1,2 @@ +ALTER TABLE users +DROP COLUMN instagram_access_token; diff --git a/schema/mysql.sql b/schema/mysql.sql index 1007256..681df54 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -21,7 +21,6 @@ CREATE TABLE `users` ( `twitter_access_token` text, `twitter_token_secret` text, `twitter_username` varchar(255) DEFAULT NULL, - `instagram_access_token` text, `email_username` varchar(255) DEFAULT NULL, `default_timezone` varchar(255) DEFAULT NULL, `supported_post_types` longtext, diff --git a/schema/sqlite.sql b/schema/sqlite.sql index 37365cd..3656a72 100644 --- a/schema/sqlite.sql +++ b/schema/sqlite.sql @@ -21,7 +21,6 @@ CREATE TABLE users ( twitter_access_token TEXT, twitter_token_secret TEXT, twitter_username TEXT, - instagram_access_token TEXT, email_username TEXT, default_timezone TEXT, supported_post_types TEXT,