Release v1.3.8 - Bugfixes

wrav · Jun 15, 2021 · 7d5171c · 7d5171c
1 parent cefd5c2
commit 7d5171c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # oEmbed Changelog
 
+## 1.3.8 - 2020-06-15
+
+### Updated
+- Fixes issue with code changes due to PHP namespacing.
+- Updates to caching key to support embed options, this resolves issues [#73](https://github.com/wrav/oembed/issues/73). 
+
 ## 1.3.7 - 2020-06-15
 
 ### Updated

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "wrav/oembed",
     "description": "A simple plugin to extract media information from websites, like youtube videos, twitter statuses or blog articles.",
     "type": "craft-plugin",
-    "version": "1.3.7",
+    "version": "1.3.8",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/models/OembedModel.php b/src/models/OembedModel.php
@@ -13,6 +13,7 @@
 use Embed\Adapters\Youtube;
 use wrav\oembed\Oembed;
 use craft\base\Model;
+use craft\helpers\Json;
 
 /**
  * OembedModel Model
@@ -159,9 +160,9 @@ public function media(array $options = [])
     /**
      * @return boolean
      */
-    public function valid()
+    public function valid(array $options = [])
     {
-        $media = $this->embed();
+        $media = $this->embed($options);
         return (!empty($media) && isset($media->code));
     }
 }
diff --git a/src/services/OembedService.php b/src/services/OembedService.php
@@ -36,8 +36,15 @@ class OembedService extends Component
      */
     public function embed($url, array $options = [])
     {
+        try {
+            $hash = md5(json_encode($options));
+        } catch (\Exception $exception) {
+            $hash = '';
+        }
+        $cacheKey = $url.'_'.$hash;
+
         if (Oembed::getInstance()->getSettings()->enableCache && Craft::$app->cache->exists($url)) {
-            return \Craft::$app->cache->get($url);
+            return \Craft::$app->cache->get($cacheKey);
         }
 
         if (Oembed::getInstance()->getSettings()->facebookKey) {
@@ -132,7 +139,7 @@ public function __call(string $name , array $arguments )
             }
             finally {
                 if (Oembed::getInstance()->getSettings()->enableCache) {
-                    Craft::$app->cache->set($url, $media, 'P1H');
+                    Craft::$app->cache->set($cacheKey, $media, 'P1H');
                 }
 
                 return $media;