assume borrowed FilterContext

src/filter.rs

@@ -63,6 +63,23 @@ pub struct FilterContext {
   logs: Option<Vec<String>>,
 }
 
+pub struct SubContext<'a> {
+  context: &'a mut FilterContext,
+  saved_filter_skip: Option<FilterSkip>,
+}
+
+impl AsMut<FilterContext> for SubContext<'_> {
+  fn as_mut(&mut self) -> &mut FilterContext {
+    self.context
+  }
+}
+
+impl Drop for SubContext<'_> {
+  fn drop(&mut self) {
+    self.context.filter_skip = self.saved_filter_skip.take();
+  }
+}
+
 impl FilterContext {
   #[cfg(test)]
   pub fn new() -> Self {
@@ -99,13 +116,11 @@ impl FilterContext {
     self.base = Some(base);
   }
 
-  pub fn subcontext(&self) -> Self {
-    Self {
-      base: self.base.clone(),
-      source: None,
-      filter_skip: None,
-      extra_queries: self.extra_queries.clone(),
-      logs: self.logs.clone(),
+  pub fn subcontext(&mut self) -> SubContext<'_> {
+    let saved_filter_skip = self.filter_skip.take();
+    SubContext {
+      context: self,
+      saved_filter_skip,
     }
   }
 
@@ -118,11 +133,10 @@ impl FilterContext {
     }
   }
 
-  pub fn enable_logging(self) -> Self {
-    Self {
-      logs: Some(Vec::new()),
-      ..self
-    }
+  pub fn enable_logging(&mut self) {
+    if self.logs.is_none() {
+      self.logs = Some(Vec::new());
+    };
   }
 
   pub fn logs(&self) -> Option<&[String]> {

src/filter/merge.rs

@@ -133,11 +133,12 @@ impl FeedFilter for Merge {
   async fn run(&self, ctx: &mut FilterContext, mut feed: Feed) -> Result<Feed> {
     let (new_feeds, errors) = self.fetch_sources(ctx).await?;
 
+    let mut subctx = ctx.subcontext();
     for new_feed in new_feeds {
-      let ctx = ctx.subcontext();
-      let filtered_new_feed = self.filters.run(ctx, new_feed).await?;
-      feed.merge(filtered_new_feed)?;
+      let new_feed = self.filters.run(subctx.as_mut(), new_feed).await?;
+      feed.merge(new_feed)?;
     }
+    drop(subctx);
 
     for (source, error) in errors {
       let post = post_from_error(source, error, ctx);

src/filter_pipeline.rs

@@ -56,7 +56,11 @@ impl FilterPipelineConfig {
 }
 
 impl FilterPipeline {
-  pub async fn run(&self, context: FilterContext, feed: Feed) -> Result<Feed> {
+  pub async fn run(
+    &self,
+    context: &mut FilterContext,
+    feed: Feed,
+  ) -> Result<Feed> {
     self.inner.lock().await.run(context, feed).await
   }
 
@@ -127,12 +131,12 @@ impl Inner {
 
   async fn run(
     &self,
-    mut context: FilterContext,
+    context: &mut FilterContext,
     mut feed: Feed,
   ) -> Result<Feed> {
     for (i, filter) in self.filters.iter().enumerate() {
       if context.allows_filter(i) {
-        feed = self.step(i, filter, &mut context, feed).await?;
+        feed = self.step(i, filter, context, feed).await?;
       }
     }
 

src/js.rs

@@ -5,7 +5,6 @@ mod fetch;
 use std::fs;
 use std::path::PathBuf;
 
-use builtin::Console;
 use rquickjs::loader::{
   BuiltinLoader, BuiltinResolver, FileResolver, Loader, Resolver, ScriptLoader,
 };

src/otf_filter.rs

@@ -64,7 +64,7 @@ impl OnTheFlyFilter {
   pub async fn run(
     &mut self,
     query: OnTheFlyFilterQuery,
-    context: FilterContext,
+    context: &mut FilterContext,
     feed: Feed,
   ) -> Result<Feed, Error> {
     let pipeline = self.update(query).await?;