Merge pull request #189 from RRZE-Webteam/dev

Dev
RRZE-Webteam · Feb 7, 2024 · 26f20ba · 26f20ba
2 parents 0dc2d06 + 7d3be7f
commit 26f20ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/includes/CPT/CalendarFeed.php b/includes/CPT/CalendarFeed.php
@@ -449,7 +449,7 @@ public static function maybeDelete($newStatus, $oldStatus, $post)
             $newStatus != 'publish' && $oldStatus == 'publish'
             && self::POST_TYPE == get_post_type($postId)
         ) {
-            self::deleteData($postId);
+            self::deleteEvent($postId);
         }
     }
 
@@ -495,8 +495,8 @@ private static function saveData($postId)
         Events::insertData($postId);
     }
 
-    private static function deleteData($postId)
+    private static function deleteEvent($postId)
     {
-        Events::deleteData($postId);
+        Events::deleteEvent($postId);
     }
 }
diff --git a/includes/ICS/Events.php b/includes/ICS/Events.php
@@ -15,13 +15,15 @@ class Events
 
     public static function updateFeedsItems()
     {
+        self::deleteUnlinkedEvents();
+
         $feeds = self::getFeeds();
         foreach ($feeds as $post) {
             if ($post->post_status == 'publish') {
                 self::updateItems($post->ID);
                 self::insertData($post->ID);
             } else {
-                self::deleteStaleData($post->ID);
+                self::deleteEvent($post->ID);
             }
         }
     }
@@ -583,7 +585,7 @@ public static function insertData(int $postId)
         $items = count($items) ? self::getListData($postId, $items) : $items;
 
         if (count($items)) {
-            self::deleteData($postId);
+            self::deleteEvent($postId);
         } else {
             return;
         }
@@ -639,12 +641,7 @@ public static function insertData(int $postId)
         }
     }
 
-    private static function deleteStaleData(int $feedId)
-    {
-        self::deleteData($feedId);
-    }
-
-    public static function deleteData(int $feedId)
+    public static function deleteEvent(int $feedId)
     {
         $metaKey = 'ics_feed_id';
         $metaValue = $feedId;
@@ -666,4 +663,27 @@ public static function deleteData(int $feedId)
             wp_reset_postdata();
         }
     }
+
+    public static function deleteUnlinkedEvents()
+    {
+        $metaKey = 'ics_feed_id';
+        $query = new \WP_Query([
+            'meta_key' => $metaKey,
+            'post_type' => CalendarEvent::POST_TYPE,
+            'posts_per_page' => 100
+        ]);
+
+        if ($query->have_posts()) {
+            while ($query->have_posts()) {
+                $query->the_post();
+                $postId = get_the_ID();
+
+                $feedId = get_post_meta($postId, $metaKey, true);
+                if (!get_post($feedId)) {
+                    wp_delete_post($postId, true);
+                }
+            }
+            wp_reset_postdata();
+        }
+    }
 }
diff --git a/rrze-calendar.php b/rrze-calendar.php
@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Calendar
 Plugin URI:      https://github.com/RRZE-Webteam/rrze-calendar
 Description:     Import and output of FAU public events.
-Version:         2.1.0
+Version:         2.1.1
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License v3.0