1 files changed, 33 insertions, 10 deletions

diff --git a/lib/serve.js b/lib/serve.js
index 75356a9..b8c296e 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -344,7 +344,8 @@ Serve.prototype.public = function (ext) {
     sortByTimestamp: q.sort === 'claimed',
     lt: Number(q.lt) || Date.now(),
     gt: Number(q.gt) || -Infinity,
-    limit: Number(q.limit) || 12
+    limit: Number(q.limit) || 12,
+    filter: q.filter,
   }
 
   pull(
@@ -397,7 +398,7 @@ Serve.prototype.new = function (ext) {
     }, -Infinity)
     pull(
       pull.values(msgs),
-      self.renderThread(opts, null, q),
+      self.renderThread(),
       self.wrapNew({
         gt: isFinite(maxTS) ? maxTS : Date.now()
       }),
@@ -417,6 +418,7 @@ Serve.prototype.private = function (ext) {
     lt: Number(q.lt) || Date.now(),
     gt: Number(q.gt) || -Infinity,
     limit: Number(q.limit) || 12,
+    filter: q.filter,
   }
 
   pull(
@@ -440,6 +442,7 @@ Serve.prototype.mentions = function (ext) {
     lt: Number(q.lt) || Date.now(),
     gt: Number(q.gt) || -Infinity,
     limit: Number(q.limit) || 12,
+    filter: q.filter,
   }
 
   return pull(
@@ -522,7 +525,9 @@ Serve.prototype.advsearch = function (ext) {
       ]),
       hasQuery && pull(
         self.app.advancedSearch(q),
-        self.renderThread(),
+        self.renderThread({
+	  feed: q.source,
+	}),
         self.wrapMessages()
       )
     ]),
@@ -548,6 +553,7 @@ Serve.prototype.live = function (ext) {
       self.app.sbot.createLogStream(opts),
       self.app.render.renderFeeds({
         withGt: true,
+	filter: q.filter,
       }),
       pull.map(u.toHTML)
     )),
@@ -900,6 +906,7 @@ Serve.prototype.type = function (path) {
     gt: Number(q.gt) || -Infinity,
     limit: Number(q.limit) || 12,
     type: type,
+    filter: q.filter,
   }
 
   pull(
@@ -926,7 +933,7 @@ Serve.prototype.links = function (path) {
 
   pull(
     this.app.sbot.links(opts),
-    this.renderThread(opts, null, q),
+    this.renderThread(),
     this.wrapMessages(),
     this.wrapLinks(dest),
     this.wrapPage('links: ' + dest),
@@ -965,6 +972,7 @@ Serve.prototype.channel = function (path) {
     gt: gt,
     limit: Number(q.limit) || 12,
     channel: channel,
+    filter: q.filter,
   }
 
   pull(
@@ -1013,7 +1021,9 @@ Serve.prototype.id = function (id, path) {
         if (err) return self.respond(500, err.stack || err)
         pull(
           pull.values(sort(links)),
-          self.renderThread(),
+          self.renderThread({
+	    msgId: id,
+	  }),
           self.wrapMessages(),
           self.wrapThread({
             recps: recps,
@@ -1039,7 +1049,9 @@ Serve.prototype.userFeed = function (id, path) {
     reverse: !q.forwards,
     lt: Number(q.lt) || Date.now(),
     gt: Number(q.gt) || -Infinity,
-    limit: Number(q.limit) || 20
+    limit: Number(q.limit) || 20,
+    feed: id,
+    filter: q.filter,
   }
   var isScrolled = q.lt || q.gt
 
@@ -1215,9 +1227,15 @@ Serve.prototype.wrapMessages = function () {
   })
 }
 
-Serve.prototype.renderThread = function () {
+Serve.prototype.renderThread = function (opts) {
   return pull(
-    this.app.render.renderFeeds({raw: false, full: this.query.full != null}),
+    this.app.render.renderFeeds({
+      raw: false,
+      full: this.query.full != null,
+      feed: opts.feed,
+      msgId: opts.msgId,
+      filter: this.query.filter,
+    }),
     pull.map(u.toHTML)
   )
 }
@@ -1258,7 +1276,7 @@ Serve.prototype.renderThreadPaginated = function (opts, feedId, q) {
           }))
         }
       },
-      this.app.render.renderFeeds(),
+      this.app.render.renderFeeds(opts),
       function onLast(msg, cb) {
         var num = feedId ? msg.value.sequence :
           opts.sortByTimestamp ? msg.value.timestamp :
@@ -1303,6 +1321,8 @@ Serve.prototype.renderRawMsgPage = function (id) {
   return pull(
     this.app.render.renderFeeds({
       raw: raw,
+      msgId: id,
+      filter: this.query.filter,
       markdownSource: showMarkdownSource
     }),
     pull.map(u.toHTML),
@@ -2578,7 +2598,10 @@ Serve.prototype.composer = function (opts, cb) {
       pull(
         pull.once(msg),
         self.app.unboxMessages(),
-        self.app.render.renderFeeds(raw),
+        self.app.render.renderFeeds({
+	  raw: raw,
+	  filter: self.query.filter,
+	}),
         pull.drain(function (el) {
           msgContainer.appendChild(h('tbody', el))
         }, cb)