Merge pull request #39 from nthmedia/master

Enable env variable for username setting
codemonauts · Feb 16, 2021 · bd4a386 · bd4a386
2 parents ec37928 + cf8f599
commit bd4a386
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Instagram Feed Changelog
 
 ## Unreleased
+### Added
+- Enable environment variables for setting username
+
 ### Changed
 - Fixed background color of icon
 - Adding rel noopener and noreferrer properties to links (thanks to @JayBox325)

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   "require": {
     "craftcms/cms": "^3.0.0",
     "ext-json": "*",
-    "php": "7.0"
+    "php": "^7.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -2,6 +2,8 @@
 
 namespace codemonauts\instagramfeed\models;
 
+use codemonauts\instagramfeed\InstagramFeed;
+use Craft;
 use craft\base\Model;
 
 class Settings extends Model
@@ -54,4 +56,9 @@ public function rules()
             [['userAgent', 'proxyKey'], 'string'],
         ];
     }
+
+    public function getAccount()
+    {
+        return Craft::parseEnv(trim(InstagramFeed::getInstance()->getSettings()->instagramUser));
+    }
 }
diff --git a/src/services/InstagramService.php b/src/services/InstagramService.php
@@ -23,7 +23,7 @@ class InstagramService extends Component
     public function getFeed(string $accountOrTag = null): array
     {
         if ($accountOrTag === null) {
-            $accountOrTag = trim(InstagramFeed::getInstance()->getSettings()->instagramUser);
+            $accountOrTag = InstagramFeed::getInstance()->getSettings()->getAccount();
             if (empty($accountOrTag)) {
                 Craft::warning('No Instagram account configured.', __METHOD__);
 

diff --git a/src/templates/settings.twig b/src/templates/settings.twig
@@ -1,11 +1,12 @@
 {% import "_includes/forms" as forms %}
 
-{{ forms.textField({
+{{ forms.autosuggestField({
     label: "Username"|t("instagramfeed"),
     id: 'instagramUser',
     name: 'instagramUser',
     instructions: "Please, enter your Instagram username."|t("instagramfeed"),
     value: settings.instagramUser,
+    suggestEnvVars: true,
     type: 'text',
     required: true
 }) }}

diff --git a/src/variables/InstagramFeedVariable.php b/src/variables/InstagramFeedVariable.php
@@ -13,7 +13,7 @@ public function getFeed($account = null)
 
     public function getAccount()
     {
-        return InstagramFeed::getInstance()->getSettings()->instagramUser;
+        return InstagramFeed::getInstance()->getSettings()->getAccount();
     }
 }