Merge pull request 'Fix visibility issue with fueltank attribute being private' (#4) from hotfix/fueltank-attribute-visibility into main

Reviewed-on: #4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "manifold"
-version = "6.1.0"
+version = "6.1.1"
 authors = ["Lucy Bladen <admin@lbladen.uk>"]
 edition = "2021"
 

src/commands/admin.rs

@@ -17,7 +17,7 @@ async fn register_commands(ctx: ManifoldContext<'_>) -> ManifoldResult<()> {
     Ok(())
 }
 
-#[poise::command(slash_command, prefix_command, track_edits, aliases("sa"), required_permissions = "MODERATE_MEMBERS")]
+#[poise::command(slash_command, prefix_command, track_edits, aliases("watch"), required_permissions = "MODERATE_MEMBERS")]
 async fn set_activity(ctx: ManifoldContext<'_>, #[rest] #[description="Who to watch"] target: String) -> ManifoldResult<()> {
     ctx.serenity_context().set_activity(Activity::watching(&target)).await;
 

src/helpers/mod.rs

@@ -25,7 +25,7 @@ pub async fn paginate(ctx: ManifoldContext<'_>, message: ReplyHandle<'_>, pages:
         // We defined our button IDs to start with `ctx_id`. If they don't, some other command's
         // button was pressed
         .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
-        // Timeout when no navigation button has been pressed for 24 hours
+        // Timeout when no navigation button has been pressed for five minutes
         .timeout(std::time::Duration::from_secs(300))
         .await
     {

src/models/fueltank.rs

@@ -19,9 +19,9 @@ pub trait Pump<V> {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct FuelTank {
-    pub(crate) source_uri: String,
+    pub source_uri: String,
     cache_name: Option<String>,
-    pub(crate) api_key: Option<String>,
+    pub api_key: Option<String>,
     cache_mode: TankMode,
 }
 
@@ -102,7 +102,7 @@ impl FuelTank {
             serde_json::to_writer(cache, &fuel)?;
         }
 
-        return Ok(single)
+        Ok(single)
     }
 
     pub async fn emit<U: Debug>(&self) -> ManifoldResult<U>