Merge branch 'release/1.0.8' into v1

CHANGELOG.md

@@ -1,5 +1,17 @@
 # YouTube Live Embed Changelog
 
+### 1.0.8 - 2020-11-14
+### Added
+- Support for webhook to toggle livestream status on and off.
+
+## 1.0.7 - 2020-11-12
+### Fixed
+- Fixed additional issue with regex of livestream page to get videoId
+
+## 1.0.6 - 2020-11-12
+### Fixed
+- Fixed issue with regex of livestream page to get videoId so the chat would load properly
+
 ## 1.0.5  2020-07-12
 
 ### Fixed

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-youtubeliveembed",
     "description": "This plugin allows you to embed a YouTube live stream and/or live chat on your webpage",
     "type": "craft-plugin",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "keywords": [
         "craft",
         "cms",
@@ -40,7 +40,8 @@
         "hasCpSection": false,
         "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-youtubeliveembed/master/CHANGELOG.md",
         "components": {
-            "embed": "nystudio107\\youtubeliveembed\\services\\Embed"
+            "embed": "nystudio107\\youtubeliveembed\\services\\Embed",
+            "stream": "nystudio107\\youtubelivembed\\services\\Stream"
         },
         "class": "nystudio107\\youtubeliveembed\\YoutubeLiveEmbed"
     }

src/YoutubeLiveEmbed.php

@@ -11,6 +11,7 @@
 namespace nystudio107\youtubeliveembed;
 
 use nystudio107\youtubeliveembed\services\Embed as EmbedService;
+use nystudio107\youtubeliveembed\services\Stream as StreamService;
 use nystudio107\youtubeliveembed\variables\YoutubeLiveEmbedVariable;
 use nystudio107\youtubeliveembed\models\Settings;
 
@@ -30,6 +31,7 @@
  * @since     1.0.0
  *
  * @property  EmbedService $embed
+ * @property  StreamService $stream
  */
 class YoutubeLiveEmbed extends Plugin
 {
@@ -52,7 +54,7 @@ class YoutubeLiveEmbed extends Plugin
     /**
      * @var string
      */
-    public $schemaVersion = '1.0.0';
+    public $schemaVersion = '1.0.9';
 
     // Public Methods
     // =========================================================================
@@ -63,6 +65,9 @@ class YoutubeLiveEmbed extends Plugin
     public function init()
     {
         parent::init();
+        $this->setComponents([
+            'stream' => services\Stream::class,
+        ]);
         self::$plugin = $this;
         self::$youtubeChannelId = $this->getSettings()->youtubeChannelId;
 

src/config.php

@@ -26,4 +26,5 @@
     // YouTube Channel ID
     "youtubeChannelId" => '',
     "isLive" => false,
+    "connectionToken" => '',
 ];

src/controllers/StreamController.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * YouTube Live Embed plugin for Craft CMS 3.x
+ *
+ * This plugin allows you to embed a YouTube live stream and/or live chat on your webpage
+ *
+ * @link      https://nystudio107.com
+ * @copyright Copyright (c) 2019 nystudio107
+ */
+
+namespace nystudio107\youtubeliveembed\controllers;
+
+use nystudio107\youtubeliveembed\YoutubeLiveEmbed;
+
+use Craft;
+use craft\web\Controller;
+
+/**
+ * @author    nystudio107
+ * @package   YoutubeLiveEmbed
+ * @since     1.0.9
+ */
+class StreamController extends Controller
+{
+    // Protected Properties
+    // ===========  ==============================================================
+
+    protected $allowAnonymous = [
+        'update-stream-status',
+    ];
+
+    // Public Methods
+    // =========================================================================
+
+
+    /**
+     * Toggles the stream to live or offline in plugin
+     *
+     * @param string $yttoken
+     * @return
+     */
+
+    public function actionUpdateStreamStatus($yttoken = '')
+    {
+        return YoutubeLiveEmbed::$plugin->stream->setStreamStatus($yttoken);
+    }
+}

src/models/Settings.php

@@ -32,6 +32,11 @@ class Settings extends Model
      */
     public $isLive = false;
 
+    /**
+     * @var string 
+     */
+    public $connectionToken = '';
+
     // Public Methods
     // =========================================================================
 
@@ -44,6 +49,7 @@ public function rules()
             ['youtubeChannelId', 'string'],
             ['youtubeChannelId', 'default', 'value' => ''],
             ['isLive', 'boolean'],
+            ['connectionToken', 'string'],
         ];
     }
 }

src/services/Stream.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * YouTube Live Embed plugin for Craft CMS 3.x
+ *
+ * This plugin allows you to embed a YouTube live stream and/or live chat on your webpage
+ *
+ * @link      https://nystudio107.com
+ * @copyright Copyright (c) 2019 nystudio107
+ */
+
+namespace nystudio107\youtubeliveembed\services;
+
+use nystudio107\youtubeliveembed\YoutubeLiveEmbed;
+use nystudio107\youtubeliveembed\helpers\PluginTemplate;
+
+use Craft;
+use craft\base\Component;
+use craft\helpers\UrlHelper;
+
+/** @noinspection MissingPropertyAnnotationsInspection */
+
+/**
+ * @author    nystudio107
+ * @package   YoutubeLiveEmbed
+ * @since     1.0.0
+ */
+class Stream extends Component
+{
+
+    public function setStreamStatus($yttoken)
+    {
+        $myPlugin = Craft::$app->plugins->getPlugin('youtubeliveembed');
+        $isLive = (YoutubeLiveEmbed::$plugin->embed->isLive() ? false : true);
+
+        if ($this->getToken() == $yttoken) {
+            return Craft::$app->plugins->savePluginSettings($myPlugin, array('isLive' => $isLive));
+        }
+    }
+
+    protected function getToken(): string
+    {
+        return YoutubeLiveEmbed::getInstance()->settings->connectionToken;
+    }
+}

src/templates/settings.twig

@@ -22,6 +22,13 @@
     name: 'youtubeChannelId',
     value: settings['youtubeChannelId']
 }) }}
+{{ forms.textField({
+    label: 'Connection Token',
+    instructions: 'A connection token you can use to toggle the stream status via cURL.',
+    id: 'connectionToken',
+    name: 'connectionToken',
+    value: settings['connectionToken']
+}) }}
 {{ forms.lightswitchField({
     label: 'Is the stream live?',
     instructions: 'Manually choose whether the stream is live or not',