Abstract plugins from main codebase by motorlatitude · Pull Request #4 · motorlatitude/MotorBot

motorlatitude · 2026-04-21T19:51:03Z

Abstracted plugin logic to tidy up codebase
Add error handling in a new error module

- Abstracted plugin logic to tidy up codebase - Add error handling in a new error module

Copilot

Pull request overview

This PR refactors the bot into a plugin-based architecture, moving most command/event logic out of main.rs into discrete plugins, and introduces centralized error types for storage and plugins.

Changes:

Introduces a MotorbotPlugin trait + PluginContext, and updates the runtime to dispatch Discord events to loaded plugins.
Adds new plugins (ping/time/dice/coin-toss/debug/points/jokes/patches) and reworks the patches logic to fit the plugin system.
Replaces the storage error module and wires storage errors into the crate-wide error type.

Reviewed changes

Copilot reviewed 23 out of 24 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/storage/errors.rs	Removed legacy storage error module.
src/storage/error.rs	New storage error type (`StorageError`) with `Display` and conversions.
src/storage/database.rs	Updates DB layer to wrap/propagate the new crate-wide error + expands guild config keys/values.
src/storage.rs	Exposes `storage::error` module and re-exports `StorageError`.
src/plugins/time.rs	Adds `TimePlugin` slash command implementation.
src/plugins/points.rs	Adds points/voting plugin, including channel configuration and reaction handlers.
src/plugins/ping.rs	Adds `PingPlugin` slash command implementation.
src/plugins/patches/platforms/platform.rs	Adds `Default` derive for `Platform` (using `Unknown`).
src/plugins/patches/patches_plugin.rs	Removes old patches plugin implementation (pre-plugin-architecture).
src/plugins/patches/mod.rs	Removes old patches module root in favor of `patches.rs`.
src/plugins/patches.rs	New patches plugin implementation + scheduled update loop and slash commands.
src/plugins/mod.rs	Registers all plugin modules.
src/plugins/jokes.rs	Adds daily jokes plugin + channel configuration and scheduled posting.
src/plugins/dice.rs	Adds dice roll slash command plugin.
src/plugins/debug.rs	Adds debug plugin (whoami/version/plugins/events config).
src/plugins/coin_toss.rs	Adds coin toss slash command plugin.
src/plugin/plugin_info.rs	Adds `PluginInfo` struct used by the plugin system.
src/plugin/plugin_context.rs	Adds plugin context + event reporting to configured channels.
src/plugin/error.rs	Adds plugin-specific error enum (`PluginError`).
src/plugin.rs	Adds core plugin trait and the `option!` helper macro.
src/main.rs	Refactors main event handler to dispatch to plugins and emit startup/error events via `PluginContext`.
src/error.rs	Adds crate-wide `Error` + `Result` types and conversions.
Cargo.toml	Adds `async-trait` and `derive_more`; removes unused OpenAI dependency.
Cargo.lock	Dependency updates aligned with `Cargo.toml` changes.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <copilot@github.com>

…downvote to avoid potential panics Co-authored-by: Copilot <copilot@github.com>

…improve error handling in update method for patches plugin Co-authored-by: Copilot <copilot@github.com>

…er-compose for plugin abstraction AI command has been deprecated during this abstraction as it wasn't being used any way.

Copilot

Pull request overview

Copilot reviewed 25 out of 26 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…n a hardcoded constant

…traction

Co-authored-by: Copilot <copilot@github.com>

Carries out input sanitisation to ensure dice side is between 2 and 100 inclusive

…array case Co-authored-by: Copilot <copilot@github.com>

…issues

…red all open database instances are closed Co-authored-by: Copilot <copilot@github.com>

Co-authored-by: Copilot <copilot@github.com>

…plugin; replace PluginError usage with custom error variants Co-authored-by: Copilot <copilot@github.com>

motorlatitude

Some improvements

motorlatitude · 2026-04-25T21:15:40Z

+use crate::plugin::PluginError;
+use crate::{Error, Result};
+
+use crate::plugin::{MotorbotPlugin, PluginContext, PluginInfo};


Consider combining these

motorlatitude · 2026-04-25T21:17:16Z

+                        CreateInteractionResponse::Message(
+                            CreateInteractionResponseMessage::new().content(
+                                format!(
+                                    ":alarm_clock: The current time is: {}",


Consider using one of the custom pixel emojis instead of the standard alarm clock. Maybe the moon emoji?

motorlatitude · 2026-04-25T21:18:20Z

+                command
+                    .create_response(
+                        &p_ctx.ctx.http,
+                        CreateInteractionResponse::Message(
+                            CreateInteractionResponseMessage::new().content(
+                                format!(
+                                    ":alarm_clock: The current time is: {}",
+                                    current_time
+                                ),
+                            ),
+                        ),
+                    )
+                    .await
+                    .map_err(|err| {
+                        Error::Plugin(PluginError::FailedToRespond { err })
+                    })?;


Maybe create a macro for this to standardise the response process for most plugins

motorlatitude · 2026-04-25T21:19:23Z

+use crate::plugin::PluginError;
+use crate::{Error, Result};
+
+use crate::plugin::{MotorbotPlugin, PluginContext, PluginInfo};


Consider combining these

motorlatitude · 2026-04-25T21:20:58Z

+    async fn on_ready(&self, p_ctx: &PluginContext) -> Result<()> {
+        info!("Ping Plugin is ready!");
+
+        let _ = Command::create_global_command(


No need for let _ here, prefer using question mark notation

motorlatitude · 2026-04-26T10:10:30Z

-  }
 }

 pub struct GuildConfig {


Missing docstring

motorlatitude · 2026-04-26T10:12:01Z

+    ///   not found, it returns None.
+    /// * `Err(Error)` - If there is an error during the database query, it
+    ///   returns a [Error] variant with details about the failure.
+    pub async fn get_guild_config(


Rename to match other methods, remove "get". Should be guild_config

motorlatitude · 2026-04-26T10:13:57Z

+
+mod plugin;
+use plugin::MotorbotPlugin;
+struct Handler {


Missing docstring

motorlatitude · 2026-04-26T10:17:03Z

+    let subscriber = FmtSubscriber::builder().with_max_level(level).finish();
+    tracing::subscriber::set_global_default(subscriber)
+        .expect("setting default subscriber failed");


Check if something other than local can used here to separate MotorBot logging from Serenity logging

motorlatitude · 2026-04-26T10:18:12Z

+pub mod plugin_context;
+pub mod plugin_info;


Rename to context and info respectively.

🎨 Abstracted plugins

4c9a44a

- Abstracted plugin logic to tidy up codebase - Add error handling in a new error module

motorlatitude self-assigned this Apr 21, 2026

motorlatitude requested a review from Copilot April 22, 2026 06:51

Copilot started reviewing on behalf of motorlatitude April 22, 2026 06:52 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

Comment thread src/plugins/jokes.rs Outdated

Comment thread src/plugins/jokes.rs

Comment thread src/plugins/jokes.rs Outdated

Comment thread src/plugins/points.rs

Comment thread src/plugins/points.rs

Comment thread src/plugins/patches.rs Outdated

motorlatitude added this to the v0.3.0 milestone Apr 22, 2026

motorlatitude marked this pull request as draft April 22, 2026 09:29

motorlatitude added refactor This issue or pull request relates to refactoring of code labels Apr 22, 2026

motorlatitude and others added 5 commits April 22, 2026 19:43

🐛 Better error handling in jokes plugin

cace398

Co-authored-by: Copilot <copilot@github.com>

🐛 Fixed/points user command to correctly get supplied user

dc1f951

Co-authored-by: Copilot <copilot@github.com>

🎨 Update reaction handling in PointsPlugin to use EmojiId for upvote/…

6ee7455

…downvote to avoid potential panics Co-authored-by: Copilot <copilot@github.com>

🐛 Add InvalidInternalState error to handle plugin context issues and …

9738f19

…improve error handling in update method for patches plugin Co-authored-by: Copilot <copilot@github.com>

🔥 Remove OPENAI_API_KEY from environment variables in README and dock…

b3b6263

…er-compose for plugin abstraction AI command has been deprecated during this abstraction as it wasn't being used any way.

motorlatitude marked this pull request as ready for review April 22, 2026 20:45

motorlatitude requested a review from Copilot April 22, 2026 20:45

Copilot started reviewing on behalf of motorlatitude April 22, 2026 20:46 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

🎨 Check for message author id checks against actual bot ID rather tha…

7fdd3f1

…n a hardcoded constant

motorlatitude marked this pull request as draft April 23, 2026 10:56

motorlatitude marked this pull request as ready for review April 23, 2026 10:56

motorlatitude closed this Apr 23, 2026

motorlatitude reopened this Apr 23, 2026

motorlatitude and others added 7 commits April 23, 2026 12:04

Merge remote-tracking branch 'origin/develop' into feature/plugin-abs…

b71368b

…traction

🚨 Fix some lint errors

f76eaaf

Co-authored-by: Copilot <copilot@github.com>

🎨 Clamping dice sides

3bd82cc

Carries out input sanitisation to ensure dice side is between 2 and 100 inclusive

🎨 Add InvalidInternalAPIResponse error variant and handle empty joke …

3db51f9

…array case Co-authored-by: Copilot <copilot@github.com>

🎨 Update sleep durations in Jokes and Patches plugins; fix some lint …

1fca50a

…issues

🎨 Enhance error handling and plugin event sending. Additionally, ensu…

42136f3

…red all open database instances are closed Co-authored-by: Copilot <copilot@github.com>

🚨 Fix clippy warnings

216a5c0

Co-authored-by: Copilot <copilot@github.com>

🐛 Fix iteration over game IDs in PatchesPlugin

057892a

motorlatitude added the core Issues and PRs relating to the MotorBot’s core functionality label Apr 24, 2026

🎨 Introduce PatchesError enum for improved error handling in Patches …

1d5eca4

…plugin; replace PluginError usage with custom error variants Co-authored-by: Copilot <copilot@github.com>

motorlatitude commented Apr 26, 2026

View reviewed changes

Conversation

motorlatitude commented Apr 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

motorlatitude left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants