From d0e63fc8596751845d05deedbb66218b5cbbf41f Mon Sep 17 00:00:00 2001
From: ruru4143 <ruru@event-federation.eu>
Date: Wed, 17 Jul 2024 16:17:54 +0200
Subject: [PATCH 01/10] added settings page sceleton

---
 includes/admin/class-settings-page.php | 110 +++++++++++++++++++++++++
 includes/class-settings.php            |   0
 includes/class-setup.php               |   5 +-
 templates/admin-header.php             |  21 +++++
 templates/settings-extractor.php       |  13 +++
 templates/settings-general.php         |  13 +++
 6 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 includes/admin/class-settings-page.php
 delete mode 100644 includes/class-settings.php
 create mode 100644 templates/admin-header.php
 create mode 100644 templates/settings-extractor.php
 create mode 100644 templates/settings-general.php

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
new file mode 100644
index 0000000..27abc1c
--- /dev/null
+++ b/includes/admin/class-settings-page.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Class responsible for Event Plugin related admin notices.
+ *
+ * Notices for guiding to proper configuration of ActivityPub with event plugins.
+ *
+ * @package Activitypub_Event_Extensions
+ * @since 1.0.0
+ */
+
+namespace Activitypub_Event_Extensions\Admin;
+
+use Activitypub_Event_Extensions\Setup;
+
+/**
+ * Class responsible for Event Plugin related admin notices.
+ *
+ * Notices for guiding to proper configuration of ActivityPub with event plugins.
+ *
+ * @since 1.0.0
+ */
+class Settings_Page {
+
+	/*
+	 * TODO:
+     *  - [ ] create settings page
+	 *      - [ ] skeleton
+	 *      - [ ] Autoloader
+	 *  - [ ] Common settings?
+	 *  - [ ] Hook points
+	 *      - [ ] let transformers hook settings into the page
+	 *  - [ ] provide setting-type-classes for hooks
+	 *      - [ ] True/False
+	 *      - [ ] Number
+	 *      - [ ] advanced for mapping
+	 */
+
+	const static = 'Activitypub_Event_Extensions\Admin\Settings_Page';
+
+	/**
+	 * Warning if the plugin is Active and the ActivityPub plugin is not.
+	 */
+	public static function admin_menu() {
+		\add_options_page(
+			'Activitypub Event Extension',
+			'Activitypub Events',
+			'manage_options',
+			'activitypub-events',
+			array( self::static, 'settings_page' )
+		);
+	}
+
+
+
+
+	public static function settings_page() {
+		if ( empty( $_GET['tab'] ) ) {
+			$tab = 'general';
+		} else {
+			$tab = sanitize_key( $_GET['tab'] );
+		}
+
+		/*
+		submenu_options = {
+			tab => {name => ''
+					active => true|false}
+		}
+		 */
+
+		// todo generate this somehow
+		// maybe with filters, similar as with the settings
+		$submenu_options = array(
+			'general'             => array(
+				'name' => 'General',
+				'active' => false
+			),
+			'events_manager'      => array(
+				'name' => 'Events Manager',
+				'active' => false,
+			),
+			'gatherpress'         => array(
+				'name' => 'Gatherpress',
+				'active' => false,
+			),
+			'the_events_calendar' => array(
+				'name' => 'The Events Calendar',
+				'active' => false,
+			),
+			'vsel'                => array(
+				'name' => 'VS Event',
+				'active' => false,
+			),
+		);
+
+		$submenu_options[$tab]['active'] = true;
+
+
+
+		switch ( $tab ) {
+			case 'general':
+				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php' , true, $submenu_options );
+				break;
+			default:
+				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-extractor.php', true, $submenu_options );
+				break;
+		}
+
+	}
+
+}
diff --git a/includes/class-settings.php b/includes/class-settings.php
deleted file mode 100644
index e69de29..0000000
diff --git a/includes/class-setup.php b/includes/class-setup.php
index cf2f799..f1715a8 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -13,7 +13,7 @@ namespace Activitypub_Event_Extensions;
 
 use Activitypub_Event_Extensions\Admin\Event_Plugin_Admin_Notices;
 use Activitypub_Event_Extensions\Admin\General_Admin_Notices;
-
+use Activitypub_Event_Extensions\Admin\Settings_Page;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
@@ -141,6 +141,9 @@ class Setup {
 			return;
 		}
 
+		add_action( 'admin_menu', array( Settings_Page::static, 'admin_menu' ) );
+		add_filter( 'plugin_action_links_Activitypub_Event_Extensions', array( Settings_Page::static, 'settings_links' ) );
+
 		add_filter( 'activitypub_transformer', array( $this, 'register_activitypub_event_transformer' ), 10, 3 );
 	}
 
diff --git a/templates/admin-header.php b/templates/admin-header.php
new file mode 100644
index 0000000..53cb250
--- /dev/null
+++ b/templates/admin-header.php
@@ -0,0 +1,21 @@
+<!-- TODO css classes?
+currently reusing activitypub classes which is kinda nice, because it has a consistent theme then, but also it cloud break if activitypub changes something
+-->
+<div class="activitypub-settings-header">
+	<div class="activitypub-settings-title-section">
+		<h1><?php \esc_html_e( 'Activitypub Events Plugin', 'activitypub-events' ); ?></h1>
+	</div>
+
+	<nav class="activitypub-settings-tabs-wrapper" aria-label="<?php \esc_attr_e( 'Secondary menu', 'activitypub-events' ); ?>">
+        <!-- todo loop through settings pages of Extractors -->
+		<?php foreach ( $args as $slug => $plugin ) { ?>
+        <a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub-events&tab=' . $slug ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $plugin['active'] ? 'active' : '' ); ?>">
+			<?php \esc_html_e( $plugin['name'], 'activitypub-events' ); ?> <!-- Todo better name handling -->
+        </a>
+		<?php } ?>
+
+
+
+	</nav>
+</div>
+<hr class="wp-header-end">
diff --git a/templates/settings-extractor.php b/templates/settings-extractor.php
new file mode 100644
index 0000000..ac089a5
--- /dev/null
+++ b/templates/settings-extractor.php
@@ -0,0 +1,13 @@
+<?php
+// Is this check necessary? it's already enforced by admin_menu()
+// it's "recommended" by https://developer.wordpress.org/plugins/administration-menus/sub-menus/
+if ( ! current_user_can( 'manage_options' ) ) {
+	return;
+}
+
+\load_template(
+	__DIR__ . '/admin-header.php',
+	true,
+	$args
+);
+?>
\ No newline at end of file
diff --git a/templates/settings-general.php b/templates/settings-general.php
new file mode 100644
index 0000000..ac089a5
--- /dev/null
+++ b/templates/settings-general.php
@@ -0,0 +1,13 @@
+<?php
+// Is this check necessary? it's already enforced by admin_menu()
+// it's "recommended" by https://developer.wordpress.org/plugins/administration-menus/sub-menus/
+if ( ! current_user_can( 'manage_options' ) ) {
+	return;
+}
+
+\load_template(
+	__DIR__ . '/admin-header.php',
+	true,
+	$args
+);
+?>
\ No newline at end of file

From 098b1f578b35825e35d3848da7ac0500c816c0da Mon Sep 17 00:00:00 2001
From: ruru4143 <ruru@event-federation.eu>
Date: Thu, 18 Jul 2024 16:23:34 +0200
Subject: [PATCH 02/10] settings: moved slug into const var

---
 includes/admin/class-settings-page.php |  1 +
 templates/admin-header.php             | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 27abc1c..9ad568e 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -36,6 +36,7 @@ class Settings_Page {
 	 */
 
 	const static = 'Activitypub_Event_Extensions\Admin\Settings_Page';
+	const settings_slug = 'activitypub-events';
 
 	/**
 	 * Warning if the plugin is Active and the ActivityPub plugin is not.
diff --git a/templates/admin-header.php b/templates/admin-header.php
index 53cb250..a201095 100644
--- a/templates/admin-header.php
+++ b/templates/admin-header.php
@@ -3,14 +3,14 @@ currently reusing activitypub classes which is kinda nice, because it has a cons
 -->
 <div class="activitypub-settings-header">
 	<div class="activitypub-settings-title-section">
-		<h1><?php \esc_html_e( 'Activitypub Events Plugin', 'activitypub-events' ); ?></h1>
+		<h1><?php \esc_html_e( 'Activitypub Events Plugin', $args['slug'] ); ?></h1>
 	</div>
 
-	<nav class="activitypub-settings-tabs-wrapper" aria-label="<?php \esc_attr_e( 'Secondary menu', 'activitypub-events' ); ?>">
+	<nav class="activitypub-settings-tabs-wrapper" aria-label="<?php \esc_attr_e( 'Secondary menu', $args['slug'] ); ?>">
         <!-- todo loop through settings pages of Extractors -->
-		<?php foreach ( $args as $slug => $plugin ) { ?>
-        <a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page=activitypub-events&tab=' . $slug ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $plugin['active'] ? 'active' : '' ); ?>">
-			<?php \esc_html_e( $plugin['name'], 'activitypub-events' ); ?> <!-- Todo better name handling -->
+		<?php foreach ( $args['options'] as $tabslug => $plugin ) { ?>
+        <a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page='. $args['slug'] .'&tab=' . $tabslug ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $plugin['active'] ? 'active' : '' ); ?>">
+			<?php \esc_html_e( $plugin['name'], $args['slug'] ); ?> <!-- Todo better name handling -->
         </a>
 		<?php } ?>
 

From d1088756c8f6b68c25e2e3ed5285b875a98021b4 Mon Sep 17 00:00:00 2001
From: ruru4143 <ruru@event-federation.eu>
Date: Thu, 18 Jul 2024 16:24:05 +0200
Subject: [PATCH 03/10] settings: added/fixed link to settings in plugin page

---
 includes/admin/class-settings-page.php | 19 ++++++++++++++++---
 includes/class-setup.php               |  3 ++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 9ad568e..f7c8b57 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -46,13 +46,26 @@ class Settings_Page {
 			'Activitypub Event Extension',
 			'Activitypub Events',
 			'manage_options',
-			'activitypub-events',
+			self::settings_slug,
 			array( self::static, 'settings_page' )
 		);
 	}
 
-
-
+	/**
+	 * Adds Link to the settings page in the plugin page.
+	 * It's called via apply_filter('plugin_action_links_' . PLUGIN_NAME).
+	 *
+	 * @param links already added links
+	 * @return array original links but with link to setting page added
+	 */
+	public static function settings_link( $links ) {
+		return array_merge(
+			$links,
+			array(
+				'<a href="' . admin_url( 'options-general.php?page=' . self::settings_slug ) . '">Settings</a>',
+			)
+		);
+	}
 
 	public static function settings_page() {
 		if ( empty( $_GET['tab'] ) ) {
diff --git a/includes/class-setup.php b/includes/class-setup.php
index f1715a8..2e42d0e 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -142,7 +142,8 @@ class Setup {
 		}
 
 		add_action( 'admin_menu', array( Settings_Page::static, 'admin_menu' ) );
-		add_filter( 'plugin_action_links_Activitypub_Event_Extensions', array( Settings_Page::static, 'settings_links' ) );
+		add_filter( 'plugin_action_links_' . ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_BASENAME,
+					array( Settings_Page::static, 'settings_link' ) );
 
 		add_filter( 'activitypub_transformer', array( $this, 'register_activitypub_event_transformer' ), 10, 3 );
 	}

From fba9948b9d6e445c7d21751c9f97e2b414d40d88 Mon Sep 17 00:00:00 2001
From: ruru4143 <ruru@event-federation.eu>
Date: Thu, 18 Jul 2024 17:46:29 +0200
Subject: [PATCH 04/10] settings: forgot to commit new args

---
 includes/admin/class-settings-page.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index f7c8b57..2e08987 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -108,14 +108,17 @@ class Settings_Page {
 
 		$submenu_options[$tab]['active'] = true;
 
-
+		$args = array(
+			'slug' => settings_slug,
+			'options' => $submenu_options,
+		);
 
 		switch ( $tab ) {
 			case 'general':
-				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php' , true, $submenu_options );
+				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php' , true, $args );
 				break;
 			default:
-				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-extractor.php', true, $submenu_options );
+				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-extractor.php', true, $args );
 				break;
 		}
 

From 1f93f58760c92c0f444b7aa04b660ec06bbbeb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Thu, 15 Aug 2024 15:59:58 +0200
Subject: [PATCH 05/10] some linting

---
 includes/admin/class-settings-page.php | 51 +++++++++++++-------------
 includes/class-setup.php               |  8 ++--
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 2e08987..7d7bb59 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Class responsible for Event Plugin related admin notices.
+ * General settings class.
  *
- * Notices for guiding to proper configuration of ActivityPub with event plugins.
+ * This file contains the General class definition, which handles the "General" settings
+ * page for the ActivityPub Event Extension Plugin, providing options for configuring various general settings.
  *
  * @package Activitypub_Event_Extensions
  * @since 1.0.0
@@ -10,7 +11,8 @@
 
 namespace Activitypub_Event_Extensions\Admin;
 
-use Activitypub_Event_Extensions\Setup;
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 /**
  * Class responsible for Event Plugin related admin notices.
@@ -21,9 +23,9 @@ use Activitypub_Event_Extensions\Setup;
  */
 class Settings_Page {
 
-	/*
+	/**
 	 * TODO:
-     *  - [ ] create settings page
+     * 	- [ ] create settings page
 	 *      - [ ] skeleton
 	 *      - [ ] Autoloader
 	 *  - [ ] Common settings?
@@ -35,8 +37,9 @@ class Settings_Page {
 	 *      - [ ] advanced for mapping
 	 */
 
-	const static = 'Activitypub_Event_Extensions\Admin\Settings_Page';
-	const settings_slug = 'activitypub-events';
+	const STATIC = 'Activitypub_Event_Extensions\Admin\Settings_Page';
+
+	const SETTINGS_SLUG = 'activitypub-events';
 
 	/**
 	 * Warning if the plugin is Active and the ActivityPub plugin is not.
@@ -46,8 +49,8 @@ class Settings_Page {
 			'Activitypub Event Extension',
 			'Activitypub Events',
 			'manage_options',
-			self::settings_slug,
-			array( self::static, 'settings_page' )
+			self::SETTINGS_SLUG,
+			array( self::STATIC, 'settings_page' )
 		);
 	}
 
@@ -55,14 +58,14 @@ class Settings_Page {
 	 * Adds Link to the settings page in the plugin page.
 	 * It's called via apply_filter('plugin_action_links_' . PLUGIN_NAME).
 	 *
-	 * @param links already added links
-	 * @return array original links but with link to setting page added
+	 * @param array $links    Already added links.
+	 * @return array          Original links but with link to setting page added.
 	 */
 	public static function settings_link( $links ) {
 		return array_merge(
 			$links,
 			array(
-				'<a href="' . admin_url( 'options-general.php?page=' . self::settings_slug ) . '">Settings</a>',
+				'<a href="' . admin_url( 'options-general.php?page=' . self::SETTINGS_SLUG ) . '">Settings</a>',
 			)
 		);
 	}
@@ -81,47 +84,45 @@ class Settings_Page {
 		}
 		 */
 
-		// todo generate this somehow
-		// maybe with filters, similar as with the settings
+		// TODO: generate this somehow.
+		// Maybe with filters, similar as with the settings!
 		$submenu_options = array(
 			'general'             => array(
-				'name' => 'General',
-				'active' => false
+				'name'   => 'General',
+				'active' => false,
 			),
 			'events_manager'      => array(
-				'name' => 'Events Manager',
+				'name'   => 'Events Manager',
 				'active' => false,
 			),
 			'gatherpress'         => array(
-				'name' => 'Gatherpress',
+				'name'   => 'Gatherpress',
 				'active' => false,
 			),
 			'the_events_calendar' => array(
-				'name' => 'The Events Calendar',
+				'name'   => 'The Events Calendar',
 				'active' => false,
 			),
 			'vsel'                => array(
-				'name' => 'VS Event',
+				'name'   => 'VS Event',
 				'active' => false,
 			),
 		);
 
-		$submenu_options[$tab]['active'] = true;
+		$submenu_options[ $tab ]['active'] = true;
 
 		$args = array(
-			'slug' => settings_slug,
+			'slug'    => self::SETTINGS_SLUG,
 			'options' => $submenu_options,
 		);
 
 		switch ( $tab ) {
 			case 'general':
-				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php' , true, $args );
+				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php', true, $args );
 				break;
 			default:
 				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-extractor.php', true, $args );
 				break;
 		}
-
 	}
-
 }
diff --git a/includes/class-setup.php b/includes/class-setup.php
index 2e42d0e..5a8fa14 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -141,10 +141,12 @@ class Setup {
 			return;
 		}
 
-		add_action( 'admin_menu', array( Settings_Page::static, 'admin_menu' ) );
-		add_filter( 'plugin_action_links_' . ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_BASENAME,
-					array( Settings_Page::static, 'settings_link' ) );
+		add_action( 'admin_menu', array( Settings_Page::STATIC, 'admin_menu' ) );
 
+		add_filter(
+			'plugin_action_links_' . ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_BASENAME,
+			array( Settings_Page::STATIC, 'settings_link' )
+		);
 		add_filter( 'activitypub_transformer', array( $this, 'register_activitypub_event_transformer' ), 10, 3 );
 	}
 

From 02fd6af960d2db6bcc6b77d3612ffa404394e080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Tue, 27 Aug 2024 21:23:33 +0200
Subject: [PATCH 06/10] wip on category mapping

---
 .../activitypub/transformer/class-event.php   |  24 ++++
 includes/admin/class-settings-page.php        | 117 ++++++---------
 includes/admin/class-settings.php             |  65 +++++++++
 includes/class-setup.php                      |   5 +-
 templates/admin-header.php                    |  21 ---
 templates/settings-extractor.php              |  13 --
 templates/settings-general.php                |  13 --
 templates/settings.php                        | 134 ++++++++++++++++++
 8 files changed, 271 insertions(+), 121 deletions(-)
 create mode 100644 includes/admin/class-settings.php
 delete mode 100644 templates/admin-header.php
 delete mode 100644 templates/settings-extractor.php
 delete mode 100644 templates/settings-general.php
 create mode 100644 templates/settings.php

diff --git a/includes/activitypub/transformer/class-event.php b/includes/activitypub/transformer/class-event.php
index e1ff34d..569e194 100644
--- a/includes/activitypub/transformer/class-event.php
+++ b/includes/activitypub/transformer/class-event.php
@@ -16,8 +16,19 @@ use function Activitypub\get_rest_url_by_path;
 
 /**
  * Base transformer for WordPress event post types to ActivityPub events.
+ *
+ * Everything that transforming several WordPress post types that represent events
+ * have in common, as well as sane defaults for events should be defined here.
  */
 class Event extends Post {
+
+	/**
+	 * The WordPress event taxonomy.
+	 *
+	 * @var string
+	 */
+	protected $wp_taxonomy;
+
 	/**
 	 * Returns the User-URL of the Author of the Post.
 	 *
@@ -41,6 +52,19 @@ class Event extends Post {
 		return 'Event';
 	}
 
+	/**
+	 * Set the event category, via the mapping setting.
+	 */
+	public function get_category() {
+		$current_category_mapping = \get_option( 'activitypub_event_extensions_event_category_mappings', array() );
+		$terms                    = \get_the_terms( $this->wp_object, $this->wp_taxonomy );
+		if ( ! is_wp_error( $terms ) && $terms ) {
+			return $current_category_mapping[ $terms[0]->slug ];
+		} else {
+			return \get_option( 'activitypub_event_extensions_default_event_category', 'MEETING' );
+		}
+	}
+
 	/**
 	 * Generic function that converts an WP-Event object to an ActivityPub-Event object.
 	 *
diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 7d7bb59..2cd16dd 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -11,43 +11,29 @@
 
 namespace Activitypub_Event_Extensions\Admin;
 
+use Activitypub_Event_Extensions\Setup;
+
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 /**
- * Class responsible for Event Plugin related admin notices.
+ * Class responsible for the ActivityPui Event Extension related Settings.
  *
- * Notices for guiding to proper configuration of ActivityPub with event plugins.
+ * Class responsible for the ActivityPui Event Extension related Settings.
  *
  * @since 1.0.0
  */
 class Settings_Page {
-
-	/**
-	 * TODO:
-     * 	- [ ] create settings page
-	 *      - [ ] skeleton
-	 *      - [ ] Autoloader
-	 *  - [ ] Common settings?
-	 *  - [ ] Hook points
-	 *      - [ ] let transformers hook settings into the page
-	 *  - [ ] provide setting-type-classes for hooks
-	 *      - [ ] True/False
-	 *      - [ ] Number
-	 *      - [ ] advanced for mapping
-	 */
-
 	const STATIC = 'Activitypub_Event_Extensions\Admin\Settings_Page';
 
-	const SETTINGS_SLUG = 'activitypub-events';
-
+	const SETTINGS_SLUG = 'activitypub-event-extensions';
 	/**
 	 * Warning if the plugin is Active and the ActivityPub plugin is not.
 	 */
 	public static function admin_menu() {
 		\add_options_page(
 			'Activitypub Event Extension',
-			'Activitypub Events',
+			__( 'ActivityPub Events', 'activitypub_event_extensions' ),
 			'manage_options',
 			self::SETTINGS_SLUG,
 			array( self::STATIC, 'settings_page' )
@@ -70,59 +56,46 @@ class Settings_Page {
 		);
 	}
 
-	public static function settings_page() {
-		if ( empty( $_GET['tab'] ) ) {
-			$tab = 'general';
+	/**
+	 * Receive the event categories (terms) used by the event plugin.
+	 *
+	 * @param array $event_plugin Contains info about a certain event plugin.
+	 *
+	 * @return array An array of Terms.
+	 */
+	private static function get_event_terms( $event_plugin ) {
+		if ( isset( $event_plugin['taxonomy'] ) ) {
+			$event_terms = get_terms(
+				array(
+					'taxonomy'   => $event_plugin['taxonomy'],
+					'hide_empty' => true,
+				)
+			);
+			return $event_terms;
 		} else {
-			$tab = sanitize_key( $_GET['tab'] );
-		}
-
-		/*
-		submenu_options = {
-			tab => {name => ''
-					active => true|false}
-		}
-		 */
-
-		// TODO: generate this somehow.
-		// Maybe with filters, similar as with the settings!
-		$submenu_options = array(
-			'general'             => array(
-				'name'   => 'General',
-				'active' => false,
-			),
-			'events_manager'      => array(
-				'name'   => 'Events Manager',
-				'active' => false,
-			),
-			'gatherpress'         => array(
-				'name'   => 'Gatherpress',
-				'active' => false,
-			),
-			'the_events_calendar' => array(
-				'name'   => 'The Events Calendar',
-				'active' => false,
-			),
-			'vsel'                => array(
-				'name'   => 'VS Event',
-				'active' => false,
-			),
-		);
-
-		$submenu_options[ $tab ]['active'] = true;
-
-		$args = array(
-			'slug'    => self::SETTINGS_SLUG,
-			'options' => $submenu_options,
-		);
-
-		switch ( $tab ) {
-			case 'general':
-				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-general.php', true, $args );
-				break;
-			default:
-				\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings-extractor.php', true, $args );
-				break;
+			return array();
 		}
 	}
+
+	/**
+	 * Settings page.
+	 */
+	public static function settings_page() {
+		$plugin_setup = Setup::get_instance();
+
+		$event_plugins = $plugin_setup->get_active_event_plugins();
+
+		$event_terms = array();
+
+		foreach ( $event_plugins as $event_plugin_name => $events_plugin_info ) {
+			$event_terms[ $event_plugin_name ] = self::get_event_terms( $events_plugin_info );
+		}
+
+		$args = array(
+			'slug'        => self::SETTINGS_SLUG,
+			'event_terms' => $event_terms,
+		);
+
+		\load_template( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . 'templates/settings.php', true, $args );
+	}
 }
diff --git a/includes/admin/class-settings.php b/includes/admin/class-settings.php
new file mode 100644
index 0000000..4b79127
--- /dev/null
+++ b/includes/admin/class-settings.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * General settings class.
+ *
+ * This file contains the General class definition, which handles the "General" settings
+ * page for the ActivityPub Event Extension Plugin, providing options for configuring various general settings.
+ *
+ * @package Activitypub_Event_Extensions
+ * @since 1.0.0
+ */
+
+namespace Activitypub_Event_Extensions\Admin;
+
+use Activitypub\Activity\Extended_Object\Event;
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
+
+/**
+ * Class responsible for the ActivityPui Event Extension related Settings.
+ *
+ * Class responsible for the ActivityPui Event Extension related Settings.
+ *
+ * @since 1.0.0
+ */
+class Settings {
+	const STATIC = 'Activitypub_Event_Extensions\Admin\Settings_Page';
+
+	const SETTINGS_SLUG = 'activitypub-event-extensions';
+
+	/**
+	 * Register the settings for the ActivityPub Event Extensions plugin.
+	 */
+	public static function register_settings() {
+		\register_setting(
+			'activitypub-event-extensions',
+			'activitypub_event_extensions_default_event_category',
+			array(
+				'type'         => 'string',
+				'description'  => \__( 'Define your own custom post template', 'activitypub' ),
+				'show_in_rest' => true,
+				'default'      => 'MEETING',
+			)
+		);
+
+		\register_setting(
+			'activitypub-event-extensions',
+			'activitypub_event_extensions_event_category_mappings',
+			array(
+				'type'              => 'array',
+				'description'       => \__( 'Define your own custom post template', 'activitypub' ),
+				'default'           => array(),
+				'sanitize_callback' => function ( $event_category_mappings ) {
+					$allowed_mappings = Event::DEFAULT_EVENT_CATEGORIES;
+					foreach ( $event_category_mappings as $key => $value ) {
+						if ( ! in_array( $value, $allowed_mappings, true ) ) {
+							unset( $event_category_mappings[ $key ] );
+						}
+					}
+					return $event_category_mappings;
+				},
+			)
+		);
+	}
+}
diff --git a/includes/class-setup.php b/includes/class-setup.php
index 5a8fa14..207cdb5 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -135,17 +135,18 @@ class Setup {
 		register_activation_hook( ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_FILE, array( $this, 'activate' ) );
 
 		add_action( 'admin_init', array( $this, 'do_admin_notices' ) );
+		add_action( 'admin_init', array( Settings::class, 'register_settings' ) );
 
 		// If we don't have any active event plugins, or the ActivityPub plugin is not enabled, abort here.
 		if ( empty( $this->active_event_plugins ) || ! $this->activitypub_plugin_is_active ) {
 			return;
 		}
 
-		add_action( 'admin_menu', array( Settings_Page::STATIC, 'admin_menu' ) );
+		add_action( 'admin_menu', array( Settings_Page::class, 'admin_menu' ) );
 
 		add_filter(
 			'plugin_action_links_' . ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_BASENAME,
-			array( Settings_Page::STATIC, 'settings_link' )
+			array( Settings_Page::class, 'settings_link' )
 		);
 		add_filter( 'activitypub_transformer', array( $this, 'register_activitypub_event_transformer' ), 10, 3 );
 	}
diff --git a/templates/admin-header.php b/templates/admin-header.php
deleted file mode 100644
index a201095..0000000
--- a/templates/admin-header.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- TODO css classes?
-currently reusing activitypub classes which is kinda nice, because it has a consistent theme then, but also it cloud break if activitypub changes something
--->
-<div class="activitypub-settings-header">
-	<div class="activitypub-settings-title-section">
-		<h1><?php \esc_html_e( 'Activitypub Events Plugin', $args['slug'] ); ?></h1>
-	</div>
-
-	<nav class="activitypub-settings-tabs-wrapper" aria-label="<?php \esc_attr_e( 'Secondary menu', $args['slug'] ); ?>">
-        <!-- todo loop through settings pages of Extractors -->
-		<?php foreach ( $args['options'] as $tabslug => $plugin ) { ?>
-        <a href="<?php echo \esc_url_raw( admin_url( 'options-general.php?page='. $args['slug'] .'&tab=' . $tabslug ) ); ?>" class="activitypub-settings-tab <?php echo \esc_attr( $plugin['active'] ? 'active' : '' ); ?>">
-			<?php \esc_html_e( $plugin['name'], $args['slug'] ); ?> <!-- Todo better name handling -->
-        </a>
-		<?php } ?>
-
-
-
-	</nav>
-</div>
-<hr class="wp-header-end">
diff --git a/templates/settings-extractor.php b/templates/settings-extractor.php
deleted file mode 100644
index ac089a5..0000000
--- a/templates/settings-extractor.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// Is this check necessary? it's already enforced by admin_menu()
-// it's "recommended" by https://developer.wordpress.org/plugins/administration-menus/sub-menus/
-if ( ! current_user_can( 'manage_options' ) ) {
-	return;
-}
-
-\load_template(
-	__DIR__ . '/admin-header.php',
-	true,
-	$args
-);
-?>
\ No newline at end of file
diff --git a/templates/settings-general.php b/templates/settings-general.php
deleted file mode 100644
index ac089a5..0000000
--- a/templates/settings-general.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// Is this check necessary? it's already enforced by admin_menu()
-// it's "recommended" by https://developer.wordpress.org/plugins/administration-menus/sub-menus/
-if ( ! current_user_can( 'manage_options' ) ) {
-	return;
-}
-
-\load_template(
-	__DIR__ . '/admin-header.php',
-	true,
-	$args
-);
-?>
\ No newline at end of file
diff --git a/templates/settings.php b/templates/settings.php
new file mode 100644
index 0000000..6e0a6cb
--- /dev/null
+++ b/templates/settings.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Template for ActivityPub Event Extensions settings pages.
+ *
+ * This template is used to display and manage settings for the ActivityPub Event Extensions plugin.
+ *
+ * @package ActivityPub_Event_Extensions
+ * @since 1.0.0
+ *
+ * @param array  $args An array of arguments for the settings page.
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
+
+use Activitypub\Activity\Extended_Object\Event;
+
+if ( ! isset( $args ) ) {
+	return;
+}
+
+if ( ! current_user_can( 'manage_options' ) ) {
+	return;
+}
+
+$event_terms = get_terms(
+	array(
+		'taxonomy'   => 'tribe_events_cat',
+		'hide_empty' => true,
+	)
+);
+
+$default_event_category_strings = array(
+	'ARTS'                          => __( 'Arts', 'activitypub-event-extensions' ),
+	'BOOK_CLUBS'                    => __( 'Book clubs', 'activitypub-event-extensions' ),
+	'BUSINESS'                      => __( 'Business', 'activitypub-event-extensions' ),
+	'CAUSES'                        => __( 'Causes', 'activitypub-event-extensions' ),
+	'COMEDY'                        => __( 'Comedy', 'activitypub-event-extensions' ),
+	'CRAFTS'                        => __( 'Crafts', 'activitypub-event-extensions' ),
+	'FOOD_DRINK'                    => __( 'Food & Drink', 'activitypub-event-extensions' ),
+	'HEALTH'                        => __( 'Health', 'activitypub-event-extensions' ),
+	'MUSIC'                         => __( 'Music', 'activitypub-event-extensions' ),
+	'AUTO_BOAT_AIR'                 => __( 'Auto, boat and air', 'activitypub-event-extensions' ),
+	'COMMUNITY'                     => __( 'Community', 'activitypub-event-extensions' ),
+	'FAMILY_EDUCATION'              => __( 'Family & Education', 'activitypub-event-extensions' ),
+	'FASHION_BEAUTY'                => __( 'Fashion & Beauty', 'activitypub-event-extensions' ),
+	'FILM_MEDIA'                    => __( 'Film & Media', 'activitypub-event-extensions' ),
+	'GAMES'                         => __( 'Games', 'activitypub-event-extensions' ),
+	'LANGUAGE_CULTURE'              => __( 'Language & Culture', 'activitypub-event-extensions' ),
+	'LEARNING'                      => __( 'Learning', 'activitypub-event-extensions' ),
+	'LGBTQ'                         => __( 'LGBTQ', 'activitypub-event-extensions' ),
+	'MOVEMENTS_POLITICS'            => __( 'Movements and politics', 'activitypub-event-extensions' ),
+	'NETWORKING'                    => __( 'Networking', 'activitypub-event-extensions' ),
+	'PARTY'                         => __( 'Party', 'activitypub-event-extensions' ),
+	'PERFORMING_VISUAL_ARTS'        => __( 'Performing & Visual Arts', 'activitypub-event-extensions' ),
+	'PETS'                          => __( 'Pets', 'activitypub-event-extensions' ),
+	'PHOTOGRAPHY'                   => __( 'Photography', 'activitypub-event-extensions' ),
+	'OUTDOORS_ADVENTURE'            => __( 'Outdoors & Adventure', 'activitypub-event-extensions' ),
+	'SPIRITUALITY_RELIGION_BELIEFS' => __( 'Spirituality, Religion & Beliefs', 'activitypub-event-extensions' ),
+	'SCIENCE_TECH'                  => __( 'Science & Tech', 'activitypub-event-extensions' ),
+	'SPORTS'                        => __( 'Sports', 'activitypub-event-extensions' ),
+	'THEATRE'                       => __( 'Theatre', 'activitypub-event-extensions' ),
+	'MEETING'                       => __( 'Meeting', 'activitypub-event-extensions' ), // Default value in federation.
+	'DEFAULT'                       => __( 'Default', 'activitypub-event-extensions' ), // Internal default for overrides.
+);
+
+$selected_default_event_category = \get_option( 'activitypub_event_extensions_default_event_category', 'MEETING' );
+$current_category_mapping        = \get_option( 'activitypub_event_extensions_event_category_mappings', array() );
+?>
+
+<div class="activitypub-settings activitypub-settings-page hide-if-no-js">
+	<form method="post" action="options.php">
+		<?php \settings_fields( 'activitypub-event-extensions' ); ?>
+
+		<div class="box">
+
+			<h2> <?php esc_html_e( 'Default ActivityPub Event Category', 'activitypub-event-extensions' ); ?> </h2>
+
+			<p> <?php esc_html_e( 'The community defined an arbitrary set of basic event categories in order to allow events from multiple organizers to be grouped in a useful way. Please specify the category most common for your events.' ); ?> </p>
+
+			<table class="form-table">
+				<tr>
+					<th scope="row"> <?php esc_html_e( 'Default Category', 'activitypub-event-extensions' ); ?> </th>
+					<td>
+						<select id="activitypub_event_extensions_default_event_category" name="activitypub_event_extensions_default_event_category">';
+						<?php
+						foreach ( $default_event_category_strings as $value => $label ) {
+							echo '<option value="' . esc_attr( $value ) . '" ' . selected( $selected_default_event_category, $value, false ) . '>' . esc_html( $label ) . '</option>';
+						}
+						?>
+						</select>
+					</td>
+				</tr>
+			</table>
+
+			<h2> <?php esc_html_e( 'Specific mapping of Event Categories', 'activitypub-event-extensions' ); ?> </h2>
+
+			<p> <?php esc_html_e( 'Here you can assign each of your event categories in use to the basic category set used in ActivityPub .' ); ?> </p>
+
+			<table class="form-table">
+				<?php foreach ( $event_terms as $event_term ) { ?>
+					<tr>
+						<th scope="row"> <?php echo esc_html( $event_term->name ); ?> </th>
+						<td>
+							<select name="activitypub_event_extensions_event_category_mappings[<?php echo esc_attr( $event_term->slug ); ?>]">
+								<?php
+								$current_mapping_is_set = false;
+								if ( ! empty( $current_category_mapping ) ) {
+									$current_mapping_is_set = array_key_exists( $event_term->slug, $current_category_mapping );
+								}
+								if ( $current_mapping_is_set ) {
+									$mapping = $current_category_mapping[ $event_term->slug ];
+								} else {
+									$mapping = 'DEFAULT';
+								}
+								if ( 'DEFAULT' === $mapping ) {
+									echo '<option value="' . esc_attr( $mapping ) . '"> -- ' . esc_html( $default_event_category_strings[ $mapping ] ) . ' -- </option>';
+								} else {
+									echo '<option value="' . esc_attr( $mapping ) . '">' . esc_html( $default_event_category_strings[ $mapping ] ) . '</option>';
+								}
+								echo '<option value="DEFAULT" ' . selected( $selected_default_event_category, 'DEFAULT', false ) . '> -- ' . esc_html__( 'Default', 'activitypub-event-extensions' ) . ' -- </option>';
+								foreach ( Event::DEFAULT_EVENT_CATEGORIES as $event_category ) {
+									echo '<option value="' . esc_attr( $event_category ) . '" ' . selected( $mappings[ $event_term->slug ] ?? '', $event_category, false ) . '>' . esc_html( $default_event_category_strings[ $event_category ] ) . '</option>';
+								}
+								?>
+							</select>
+						</td>
+					</tr>
+				<?php } ?>
+			</table>
+		</div>
+		<?php \submit_button(); ?>
+	</form>
+</div>

From efcdf00ae30faeb334ea31d23086080f141f47c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Tue, 27 Aug 2024 21:42:17 +0200
Subject: [PATCH 07/10] a lot of small fixes to make a minimal commit

---
 includes/admin/class-settings-page.php  | 2 +-
 includes/{admin => }/class-settings.php | 2 +-
 includes/class-setup.php                | 9 +++++++++
 templates/settings.php                  | 7 +------
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename includes/{admin => }/class-settings.php (97%)

diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php
index 2cd16dd..22c8b1a 100644
--- a/includes/admin/class-settings-page.php
+++ b/includes/admin/class-settings-page.php
@@ -88,7 +88,7 @@ class Settings_Page {
 		$event_terms = array();
 
 		foreach ( $event_plugins as $event_plugin_name => $events_plugin_info ) {
-			$event_terms[ $event_plugin_name ] = self::get_event_terms( $events_plugin_info );
+			$event_terms = array_merge( $event_terms, self::get_event_terms( $events_plugin_info ) );
 		}
 
 		$args = array(
diff --git a/includes/admin/class-settings.php b/includes/class-settings.php
similarity index 97%
rename from includes/admin/class-settings.php
rename to includes/class-settings.php
index 4b79127..f5e781a 100644
--- a/includes/admin/class-settings.php
+++ b/includes/class-settings.php
@@ -9,7 +9,7 @@
  * @since 1.0.0
  */
 
-namespace Activitypub_Event_Extensions\Admin;
+namespace Activitypub_Event_Extensions;
 
 use Activitypub\Activity\Extended_Object\Event;
 
diff --git a/includes/class-setup.php b/includes/class-setup.php
index 207cdb5..22119df 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -52,6 +52,7 @@ class Setup {
 			'post_type'         => 'event',
 			'settings_page_id'  => 'settings_page_vsel',
 			'transformer_class' => 'VS_Event',
+			'taxonomy'        => 'event_cat',
 		),
 	);
 
@@ -122,6 +123,14 @@ class Setup {
 		return $active_event_plugins;
 	}
 
+	/**
+	 * Getter function for the active event plugins.
+	 */
+	public function get_active_event_plugins() {
+		return $this->active_event_plugins;
+	}
+
+
 	/**
 	 * Set up hooks for various purposes.
 	 *
diff --git a/templates/settings.php b/templates/settings.php
index 6e0a6cb..9d5acf0 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -23,12 +23,7 @@ if ( ! current_user_can( 'manage_options' ) ) {
 	return;
 }
 
-$event_terms = get_terms(
-	array(
-		'taxonomy'   => 'tribe_events_cat',
-		'hide_empty' => true,
-	)
-);
+$event_terms = $args['event_terms'];
 
 $default_event_category_strings = array(
 	'ARTS'                          => __( 'Arts', 'activitypub-event-extensions' ),

From be9733c55b524a7d947ef399da33b6aa26ad6d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Wed, 28 Aug 2024 17:48:15 +0200
Subject: [PATCH 08/10] several improvements and fixes - plugin version
 handling - category mapping - settings page css

---
 activitypub-event-extensions.php              |  5 ++--
 .../activitypub-event-extensions-admin.css    |  6 +++++
 .../activitypub/transformer/class-event.php   | 20 +++++++++++++---
 .../transformer/class-vs-event.php            | 20 +---------------
 includes/class-setup.php                      | 23 ++++++++++++++++++-
 templates/settings.php                        | 13 ++++++++---
 6 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 assets/css/activitypub-event-extensions-admin.css

diff --git a/activitypub-event-extensions.php b/activitypub-event-extensions.php
index da13f29..4e3dd3f 100644
--- a/activitypub-event-extensions.php
+++ b/activitypub-event-extensions.php
@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub Event Extensions
  * Description: Custom ActivityPub Transformers and Integrations for common Event Plugins.
  * Plugin URI:  https://event-federation.eu/
- * Version:     1.0.0
+ * Version:     0.1.0
  * Author:      André Menrath
  * Author URI:  https://graz.social/@linos
  * Text Domain: activitypub-event-extensions
@@ -18,12 +18,11 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
-define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_VERSION', '1.0.0' );
-
 define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
 define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_VERSION', current( get_file_data( __FILE__, array( 'Version' ), 'plugin' ) ) );
 
 // Include and register the autoloader class for automatic loading of plugin classes.
 require_once ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_DIR . '/includes/class-autoloader.php';
diff --git a/assets/css/activitypub-event-extensions-admin.css b/assets/css/activitypub-event-extensions-admin.css
new file mode 100644
index 0000000..c1d76b6
--- /dev/null
+++ b/assets/css/activitypub-event-extensions-admin.css
@@ -0,0 +1,6 @@
+.activitypub-settings-page .box {
+	border: 1px solid #c3c4c7;
+	background-color: #fff;
+	padding: 1em 1.5em;
+	margin-bottom: 1.5em;
+}
diff --git a/includes/activitypub/transformer/class-event.php b/includes/activitypub/transformer/class-event.php
index 569e194..ae1d9d6 100644
--- a/includes/activitypub/transformer/class-event.php
+++ b/includes/activitypub/transformer/class-event.php
@@ -52,16 +52,30 @@ class Event extends Post {
 		return 'Event';
 	}
 
+	/**
+	 * Extend the construction of the Post Transformer to also set the according taxonomy of the event post type.
+	 *
+	 * @param WP_Post $wp_object The WordPress post object (event).
+	 * @param string  $wp_taxonomy The taxonomy slug of the event post type.
+	 */
+	public function __construct( $wp_object, $wp_taxonomy ) {
+		parent::__construct( $wp_object );
+		$this->wp_taxonomy = $wp_taxonomy;
+	}
+
 	/**
 	 * Set the event category, via the mapping setting.
 	 */
 	public function get_category() {
 		$current_category_mapping = \get_option( 'activitypub_event_extensions_event_category_mappings', array() );
 		$terms                    = \get_the_terms( $this->wp_object, $this->wp_taxonomy );
-		if ( ! is_wp_error( $terms ) && $terms ) {
-			return $current_category_mapping[ $terms[0]->slug ];
+
+		// Check if the event has a category set and if that category has a specific mapping return that one.
+		if ( ! is_wp_error( $terms ) && $terms && array_key_exists( $terms[0]->slug, $current_category_mapping ) ) {
+			return sanitize_text_field( $current_category_mapping[ $terms[0]->slug ] );
 		} else {
-			return \get_option( 'activitypub_event_extensions_default_event_category', 'MEETING' );
+			// Return the default event category.
+			return sanitize_text_field( \get_option( 'activitypub_event_extensions_default_event_category', 'MEETING' ) );
 		}
 	}
 
diff --git a/includes/activitypub/transformer/class-vs-event.php b/includes/activitypub/transformer/class-vs-event.php
index a48e596..14a12b7 100644
--- a/includes/activitypub/transformer/class-vs-event.php
+++ b/includes/activitypub/transformer/class-vs-event.php
@@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 class VS_Event extends Event_Transformer {
 
 	/**
-	 * The target transformet ActivityPub Event object.
+	 * The target transformer ActivityPub Event object.
 	 *
 	 * @var Event
 	 */
@@ -44,7 +44,6 @@ class VS_Event extends Event_Transformer {
 	 * @return string Widget name.
 	 */
 	public function get_transformer_name() {
-
 		return 'activitypub-event-transformers/vs-event';
 	}
 
@@ -58,7 +57,6 @@ class VS_Event extends Event_Transformer {
 	 * @return string Widget title.
 	 */
 	public function get_transformer_label() {
-
 		return 'VS Event';
 	}
 
@@ -72,7 +70,6 @@ class VS_Event extends Event_Transformer {
 	 * @return array Widget categories.
 	 */
 	public static function get_supported_post_types() {
-
 		return array( 'event' );
 	}
 
@@ -84,7 +81,6 @@ class VS_Event extends Event_Transformer {
 	 * @return string The Event Object-Type.
 	 */
 	protected function get_type() {
-
 		return 'Event';
 	}
 
@@ -94,7 +90,6 @@ class VS_Event extends Event_Transformer {
 	 * @return array The Place.
 	 */
 	public function get_location() {
-
 		$address = get_post_meta( $this->wp_object->ID, 'event-location', true );
 		$place   = new Place();
 		$place->set_type( 'Place' );
@@ -107,7 +102,6 @@ class VS_Event extends Event_Transformer {
 	 * Get the end time from the events metadata.
 	 */
 	protected function get_end_time() {
-
 		$end_time = get_post_meta( $this->wp_object->ID, 'event-date', true );
 		return \gmdate( 'Y-m-d\TH:i:s\Z', $end_time );
 	}
@@ -116,7 +110,6 @@ class VS_Event extends Event_Transformer {
 	 * Get the end time from the events metadata.
 	 */
 	protected function get_start_time() {
-
 		$start_time = get_post_meta( $this->wp_object->ID, 'event-start-date', true );
 		return \gmdate( 'Y-m-d\TH:i:s\Z', $start_time );
 	}
@@ -125,7 +118,6 @@ class VS_Event extends Event_Transformer {
 	 * Get the event link from the events metadata.
 	 */
 	private function get_event_link() {
-
 		$event_link = get_post_meta( $this->wp_object->ID, 'event-link', true );
 		if ( $event_link ) {
 			return array(
@@ -141,7 +133,6 @@ class VS_Event extends Event_Transformer {
 	 * Overrides/extends the get_attachments function to also add the event Link.
 	 */
 	protected function get_attachment() {
-
 		$attachments = parent::get_attachment();
 		if ( count( $attachments ) ) {
 			$attachments[0]['type'] = 'Document';
@@ -154,15 +145,6 @@ class VS_Event extends Event_Transformer {
 		return $attachments;
 	}
 
-	/**
-	 * This function tries to map VS-Event categories to Mobilizon event categories.
-	 *
-	 * @return string $category
-	 */
-	protected function get_category() {
-		return 'MEETING';
-	}
-
 	/**
 	 * Create a custom summary.
 	 *
diff --git a/includes/class-setup.php b/includes/class-setup.php
index 22119df..2d5f716 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -151,6 +151,8 @@ class Setup {
 			return;
 		}
 
+		add_action( 'admin_enqueue_scripts', array( self::class, 'enqueue_styles' ) );
+
 		add_action( 'admin_menu', array( Settings_Page::class, 'admin_menu' ) );
 
 		add_filter(
@@ -160,6 +162,25 @@ class Setup {
 		add_filter( 'activitypub_transformer', array( $this, 'register_activitypub_event_transformer' ), 10, 3 );
 	}
 
+	/**
+	 * Add the CSS for the admin pages.
+	 *
+	 * @param string $hook_suffix The suffix of the hook.
+	 */
+	public static function enqueue_styles( $hook_suffix ) {
+		if ( false !== strpos( $hook_suffix, 'activitypub-event-extensions' ) ) {
+			wp_enqueue_style(
+				'activitypub-event-extensions-admin-styles',
+				plugins_url(
+					'assets/css/activitypub-event-extensions-admin.css',
+					ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_FILE
+				),
+				array(),
+				ACTIVITYPUB_EVENT_EXTENSIONS_PLUGIN_VERSION
+			);
+		}
+	}
+
 	/**
 	 * Fires the initialization of admin notices.
 	 */
@@ -198,7 +219,7 @@ class Setup {
 		foreach ( $this->active_event_plugins as $event_plugin ) {
 			if ( $wp_object->post_type === $event_plugin['post_type'] ) {
 				$transformer_class = 'Activitypub_Event_Extensions\Activitypub\Transformer\\' . $event_plugin['transformer_class'];
-				return new $transformer_class( $wp_object );
+				return new $transformer_class( $wp_object, $event_plugin['taxonomy'] );
 			}
 		}
 
diff --git a/templates/settings.php b/templates/settings.php
index 9d5acf0..ef2e832 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template for ActivityPub Event Extensions settings pages.
+ * Template for ActivityPub Event Extensions settings page.
  *
  * This template is used to display and manage settings for the ActivityPub Event Extensions plugin.
  *
@@ -15,7 +15,7 @@ defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Event;
 
-if ( ! isset( $args ) ) {
+if ( ! isset( $args ) || ! array_key_exists( 'event_terms', $args ) ) {
 	return;
 }
 
@@ -63,6 +63,13 @@ $selected_default_event_category = \get_option( 'activitypub_event_extensions_de
 $current_category_mapping        = \get_option( 'activitypub_event_extensions_event_category_mappings', array() );
 ?>
 
+<div class="activitypub-settings-header">
+	<div class="activitypub-settings-title-section">
+		<h1><?php \esc_html_e( 'ActivityPub Event Extensions', 'activitypub-event-extensions' ); ?></h1>
+	</div>
+</div>
+<hr class="wp-header-end">
+
 <div class="activitypub-settings activitypub-settings-page hide-if-no-js">
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub-event-extensions' ); ?>
@@ -90,7 +97,7 @@ $current_category_mapping        = \get_option( 'activitypub_event_extensions_ev
 
 			<h2> <?php esc_html_e( 'Specific mapping of Event Categories', 'activitypub-event-extensions' ); ?> </h2>
 
-			<p> <?php esc_html_e( 'Here you can assign each of your event categories in use to the basic category set used in ActivityPub .' ); ?> </p>
+			<p> <?php esc_html_e( 'Here you can assign each of your event categories in use to the basic category set used in ActivityPub.' ); ?> </p>
 
 			<table class="form-table">
 				<?php foreach ( $event_terms as $event_term ) { ?>

From 01a8ae85aab4d22f11d9136f6c7d532d90908334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Wed, 28 Aug 2024 19:43:42 +0200
Subject: [PATCH 09/10] linting

---
 includes/class-setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-setup.php b/includes/class-setup.php
index 2d5f716..9e60de8 100644
--- a/includes/class-setup.php
+++ b/includes/class-setup.php
@@ -52,7 +52,7 @@ class Setup {
 			'post_type'         => 'event',
 			'settings_page_id'  => 'settings_page_vsel',
 			'transformer_class' => 'VS_Event',
-			'taxonomy'        => 'event_cat',
+			'taxonomy'          => 'event_cat',
 		),
 	);
 

From 3bf3e6b93eb9fb8d59649caebcd85ec4e1738ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Wed, 28 Aug 2024 19:57:04 +0200
Subject: [PATCH 10/10] improve texts in the settings

---
 templates/settings.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/templates/settings.php b/templates/settings.php
index ef2e832..d988327 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -75,11 +75,8 @@ $current_category_mapping        = \get_option( 'activitypub_event_extensions_ev
 		<?php \settings_fields( 'activitypub-event-extensions' ); ?>
 
 		<div class="box">
-
 			<h2> <?php esc_html_e( 'Default ActivityPub Event Category', 'activitypub-event-extensions' ); ?> </h2>
-
-			<p> <?php esc_html_e( 'The community defined an arbitrary set of basic event categories in order to allow events from multiple organizers to be grouped in a useful way. Please specify the category most common for your events.' ); ?> </p>
-
+			<p> <?php esc_html_e( 'To help visitors find events more easily, the community created a set of basic event categories. Please select the category that best matches the majority of the events you organize.' ); ?> </p>
 			<table class="form-table">
 				<tr>
 					<th scope="row"> <?php esc_html_e( 'Default Category', 'activitypub-event-extensions' ); ?> </th>
@@ -94,11 +91,11 @@ $current_category_mapping        = \get_option( 'activitypub_event_extensions_ev
 					</td>
 				</tr>
 			</table>
+		</div>
 
-			<h2> <?php esc_html_e( 'Specific mapping of Event Categories', 'activitypub-event-extensions' ); ?> </h2>
-
-			<p> <?php esc_html_e( 'Here you can assign each of your event categories in use to the basic category set used in ActivityPub.' ); ?> </p>
-
+		<div class="box">
+			<h2> <?php esc_html_e( 'Advanced Event Category Settings', 'activitypub-event-extensions' ); ?> </h2>
+			<p> <?php esc_html_e( 'Take more control by adjusting how your event categories are mapped to the basic category set used in ActivityPub. This option lets you override the default selection above, ensuring more accurate categorization and better visibility for your events.' ); ?> </p>
 			<table class="form-table">
 				<?php foreach ( $event_terms as $event_term ) { ?>
 					<tr>