From 43837b568e1ab5e75a8116dc2142152e1805c523 Mon Sep 17 00:00:00 2001
From: Daniel Thies <dthies@gmail.com>
Date: Fri, 17 May 2024 13:36:49 -0500
Subject: [PATCH] MED-100: Fix Video Time resource url

---
 source/streamio/classes/manager.php               | 2 +-
 source/streamio/classes/output/media_resource.php | 2 +-
 source/videotime/classes/form/edit_resource.php   | 4 +++-
 source/videotime/lib.php                          | 3 +--
 source/vimeo/classes/output/video.php             | 1 -
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/streamio/classes/manager.php b/source/streamio/classes/manager.php
index fb61c81..e3e3d05 100644
--- a/source/streamio/classes/manager.php
+++ b/source/streamio/classes/manager.php
@@ -109,7 +109,7 @@ public function __construct($record = null) {
         }
 
         if ($record) {
-            $this->content = $record->content;
+            $this->content = json_decode($record->content);
         }
 
         if ($edit = optional_param('edit', null, PARAM_INT)) {
diff --git a/source/streamio/classes/output/media_resource.php b/source/streamio/classes/output/media_resource.php
index 7e75f3b..90c8f56 100644
--- a/source/streamio/classes/output/media_resource.php
+++ b/source/streamio/classes/output/media_resource.php
@@ -64,7 +64,7 @@ public function export_for_template(renderer_base $output) {
         $context = \context_system::instance();
         $videourl = $this->video_url($output);
 
-        $content += [
+        $content = [
             'elementid' => 'video-' . uniqid(),
             'instance' => json_encode([
                 'vimeo_url' => $videourl,
diff --git a/source/videotime/classes/form/edit_resource.php b/source/videotime/classes/form/edit_resource.php
index d7c69d0..be83e6a 100644
--- a/source/videotime/classes/form/edit_resource.php
+++ b/source/videotime/classes/form/edit_resource.php
@@ -137,11 +137,13 @@ public function definition_after_data() {
         if ($record) {
             $resource = new media_resource($record);
 
+            $videourl = $resource->video_url($OUTPUT);
+
             $content = [
                 'poster' => $resource->image_url($OUTPUT),
                 'elementid' => 'video-' . uniqid(),
                 'instance' => json_encode([
-                    'vimeo_url' => $resource->video_url($OUTPUT),
+                    'vimeo_url' => $videourl,
                     'controls' => true,
                     'responsive' => true,
                     'playsinline' => false,
diff --git a/source/videotime/lib.php b/source/videotime/lib.php
index d9dddbb..1c2b51d 100644
--- a/source/videotime/lib.php
+++ b/source/videotime/lib.php
@@ -45,11 +45,11 @@ function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $a
 
     if (
         in_array($filearea, [
+        'posterimage',
         'videofile',
         ])
     ) {
         $itemid = array_shift($args);
-        $contenthash = array_shift($args);
 
         $relativepath = implode('/', $args);
 
@@ -59,7 +59,6 @@ function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $a
         if (
             (!$file = $fs->get_file_by_hash(sha1($fullpath)))
             || $file->is_directory()
-            || $file->get_contenthash() != $contenthash
         ) {
             return false;
         }
diff --git a/source/vimeo/classes/output/video.php b/source/vimeo/classes/output/video.php
index cf089ed..7b5a455 100644
--- a/source/vimeo/classes/output/video.php
+++ b/source/vimeo/classes/output/video.php
@@ -57,7 +57,6 @@ public function __construct(stdClass $content) {
      */
     public function export_for_template(renderer_base $output) {
         global $DB, $USER;
-        $api = new \mediatimesrc_vimeo\api();
         $context = \context_system::instance();
 
         return [