Merge pull request #235 from gentlementlegen/fix/skip-bot-events-decode

fix: the default values for skipBotEvents and ubiquity:listeners is no longer overridden
ubiquity-os · Jan 22, 2025 · 2d59a51 · 2d59a51
2 parents cacf27f + ec99ca7
commit 2d59a51
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/github/types/plugin-configuration.ts b/src/github/types/plugin-configuration.ts
@@ -60,7 +60,7 @@ const pluginChainSchema = T.Array(
     plugin: githubPluginType(),
     with: T.Record(T.String(), T.Unknown(), { default: {} }),
     runsOn: T.Array(emitterType, { default: [] }),
-    skipBotEvents: T.Boolean({ default: true }),
+    skipBotEvents: T.Optional(T.Boolean({ default: true })),
   }),
   { minItems: 1, default: [] }
 );

diff --git a/src/github/utils/config.ts b/src/github/utils/config.ts
@@ -95,8 +95,12 @@ export async function getConfig(context: GitHubContext): Promise<PluginConfigura
   for (const plugin of mergedConfiguration.plugins) {
     const manifest = await getManifest(context, plugin.uses[0].plugin);
     if (manifest) {
-      plugin.uses[0].runsOn = manifest["ubiquity:listeners"] ?? [];
-      plugin.uses[0].skipBotEvents = manifest.skipBotEvents ?? true;
+      if (!plugin.uses[0].runsOn.length) {
+        plugin.uses[0].runsOn = manifest["ubiquity:listeners"] ?? [];
+      }
+      if (plugin.uses[0].skipBotEvents === undefined) {
+        plugin.uses[0].skipBotEvents = manifest.skipBotEvents ?? true;
+      }
     }
   }
   return mergedConfiguration;

diff --git a/tests/configuration.test.ts b/tests/configuration.test.ts
@@ -54,6 +54,7 @@ describe("Configuration tests", () => {
         plugins:
           - uses:
             - plugin: ubiquity/user-activity-watcher:compute.yml@fork/pull/1
+              skipBotEvents: false
               with:
                 settings1: 'enabled'`;
       } else {
@@ -187,14 +188,15 @@ describe("Configuration tests", () => {
                 "ubiquity:example": "/command"
               }
             },
-            "skipBotEvents": false
+            "skipBotEvents": true
           }
           `;
       } else if (args.path === CONFIG_FULL_PATH) {
         data = `
         plugins:
           - uses:
             - plugin: ubiquity/test-plugin
+              skipBotEvents: false
               with:
                 settings1: 'enabled'`;
       } else {