Merge branch 'main' into issue-1269

Author: ferishili

cronjobs/opencast_discover_videos.php

@@ -176,13 +176,13 @@ public function execute($last_result, $parameters = array())
                 }
             } while (sizeof($oc_events) > 0);
 
-            // Check if local videos are not longer available in OC and remove them from Stud.IP
-            // If the video should reappear in the future, Stud.IP will readd it again.
+            // Check if local videos are no longer available in OC
             foreach (array_diff($local_event_ids, $event_ids) as $event_id) {
                 $video = Videos::findOneBySql("config_id = ? AND episode = ?", [$config['id'], $event_id]);
                 // Need null check for archived videos
                 if ($video) {
-                    $video->delete();
+                    $video->setValue('available', false);
+                    $video->store();
                 }
             }
 

lib/Models/Videos.php

@@ -424,6 +424,9 @@ protected static function getFilteredVideos($query, $filters)
         $where .= " AND trashed = " . $filters->getTrashed();
         $where .= " AND oc_video.token IS NOT NULL";
 
+        // Show only videos available in opencast to users
+        $where .= " AND oc_video.available = 1";
+
         $sql .= $where;
 
         $sql .= ' GROUP BY oc_video.id';