Merge pull request #43 from wrav/feature/gdpr

Add GDPR support for Youtube and Vimeo
wrav · May 13, 2020 · 02fe15b · 02fe15b
2 parents 47ddc7c + 9c75423
commit 02fe15b
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # oEmbed Changelog
 
+## 1.3.1 - 2020-05-08
+
+### Added
+- *(NEW FEATURE)* Added GDPR setting to transform URL's for Youtube and Vimeo to their GDPR versions. This happen's without needing to change existing URL's.
+
 ## 1.3.0 - 2020-03-05
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,14 +2,15 @@
     "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.0",
+    "version": "1.3.1",
     "keywords": [
         "craft",
         "cms",
         "craftcms",
         "craft-plugin",
         "oembed",
         "graphql",
+        "gdpr",
         "iframe",
         "youtube",
         "vimeo",

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -20,14 +20,16 @@
  */
 class Settings extends Model
 {
-    // Public Properties
-    // =========================================================================
-
     /**
-     * @var string
+     * @var bool
      */
     public $enableCache;
 
+    /**
+     * @var bool
+     */
+    public $enableGdpr;
+
     /**
      * @var string
      */

diff --git a/src/services/OembedService.php b/src/services/OembedService.php
@@ -77,6 +77,8 @@ public function __call(string $name , array $arguments )
                 $iframe = $dom->getElementsByTagName('iframe')->item(0);
                 $src = $iframe->getAttribute('src');
 
+                $src = $this->manageGDPR($src);
+
                 if(!empty($options['params'])) {
                     foreach((array)$options['params'] as $key => $value) {
                         $src = preg_replace('/\?(.*)$/i', '?'.$key.'='. $value .'&${1}', $src);
@@ -128,6 +130,38 @@ public function __call(string $name , array $arguments )
         }
     }
 
+    private function manageGDPR($url)
+    {
+        if (Oembed::getInstance()->getSettings()->enableGdpr) {
+            $skip = false;
+            $youtubePattern = '/(?:http|https)*?:*\/\/(?:www\.|)(?:youtube\.com|m\.youtube\.com|youtu\.be|youtube-nocookie\.com)/i';
+            preg_match($youtubePattern, $url, $matches, PREG_OFFSET_CAPTURE);
+
+            if(count($matches)) {
+                $url = preg_replace($youtubePattern, 'https://www.youtube-nocookie.com', $url);
+                $skip = true;
+            }
+
+            if(!$skip) {
+                if (strpos($url, 'vimeo.com') !== false ) {
+                    if (strpos($url, 'dnt=') === false) {
+                        preg_match('/\?.*$/', $url, $matches, PREG_OFFSET_CAPTURE);
+                        if(count($matches)) {
+                            $url = preg_replace('/(\?(.*))$/i', '?dnt=1&${2}', $url);
+                        } else {
+                            $url = $url.'?dnt=1';
+                        }
+                    }
+
+                    $url = preg_replace('/(dnt=(1|0))/i', 'dnt=1', $url);
+                    $skip = true;
+                }
+            }
+        }
+
+        return $url;
+    }
+
     /**
      * @param $url
      * @param array $options

diff --git a/src/templates/settings.twig b/src/templates/settings.twig
@@ -18,6 +18,14 @@
     on: settings.enableCache,
 }) }}
 
+{{ forms.lightswitchField({
+    label: "Enable GDPR"|t,
+    instructions: "Currently supporting Youtube & Vimeo"|t,
+    id: 'enableGdpr',
+    name: 'enableGdpr',
+    on: settings.enableGdpr,
+}) }}
+
 {{ forms.lightswitchField({
     label: "Previews hidden by default"|t,
     instructions: "This will hide preview in collapsable component"|t,