diff --git a/bouncer.js b/bouncer.js index 798962f..da2695d 100644 --- a/bouncer.js +++ b/bouncer.js @@ -225,13 +225,12 @@ function newConn(addr, client, reconn_t = 0) { data[1] = client.subalias.get(data[1]); if (client.pause_subs.has(data[1])) return; - if (client.acceptKinds && !client.acceptKinds.includes(data[2]?.kind)) return; - if (client.rejectKinds && client.rejectKinds.includes(data[2]?.kind)) return; - const filters = client.subs.get(data[1]); + if (!matchFilters(filters, data[2])) return; + const filter = client.mergedFilters.get(data[1]); const NotInSearchQuery = "search" in filter && !data[2]?.content?.toLowerCase().includes(filter.search.toLowerCase()); - if (!matchFilters(filters, data[2]) || NotInSearchQuery) return; + if (NotInSearchQuery) return; if (client.events.get(data[1]).has(data[2]?.id)) return; // No need to transmit once it has been transmitted before. if (!client.pause_subs.has(data[1])) {