add ability to filter posts

Author: PolarWooolf

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cstleagueorg/cs2-blog-scraper",
-  "version": "2.1.2",
-  "description": "Scrap-scrap",
+  "version": "2.2.0",
+  "description": "Utils for watching for CS2 blog updates",
   "homepage": "https://github.com/CSTLeagueORG/CS2BlogScraper#readme",
   "main": "dist/src/index.js",
   "scripts": {
@@ -24,6 +24,7 @@
     "typescript",
     "jest",
     "cs2",
+    "csgo",
     "node-fetch"
   ],
   "author": "Sergey Zhirov <polarwolf@cstl.gg>",

src/index.ts

@@ -24,35 +24,50 @@ const INITIAL_FETCH_PARAMS = {
  * Uses this url: "https://www.counter-strike.net/news/"
  * @returns {Promise<Post[]>}
  * @param params
+ * @param postsFilter
  */
-export async function getBlogPosts (params?: Partial<CSGOFetchParams>): Promise<Post[]> {
-  return await getPosts(TYPE_IDS.blog, params)
+export async function getBlogPosts (params?: Partial<CSGOFetchParams>, postsFilter?: CSGOPostFilter): Promise<Post[]> {
+  return await getPosts(TYPE_IDS.blog, params, postsFilter)
 }
 
 /**
  * Uses this url: https://www.counter-strike.net/news/updates/
  * @returns {Promise<Post[]>}
  * @param params
+ * @param postsFilter
  */
-export async function getUpdatePosts (params?: Partial<CSGOFetchParams>): Promise<Post[]> {
-  return await getPosts(TYPE_IDS.updates, params)
+export async function getUpdatePosts (params?: Partial<CSGOFetchParams>, postsFilter?: CSGOPostFilter): Promise<Post[]> {
+  return await getPosts(TYPE_IDS.updates, params, postsFilter)
+}
+
+function filterPost (postsFilter: CSGOPostFilter, post: any, recursionDepth = 1): boolean {
+  if (recursionDepth > 5) {
+    return false
+  }
+  return Object.keys(postsFilter).every(key => (
+    typeof post === 'object' &&
+    (typeof postsFilter[key] === 'object'
+      ? filterPost(postsFilter[key], post[key], recursionDepth + 1)
+      : postsFilter[key] === post[key]
+    )
+  ))
 }
 
 /**
  *
  * @returns {Promise<Post[]>}
  * @param category
  * @param params
+ * @param postsFilter
  */
-export default async function getPosts (category?: number, params?: Partial<CSGOFetchParams>): Promise<Post[]> {
+export default async function getPosts (category?: number, params?: Partial<CSGOFetchParams>, postsFilter: CSGOPostFilter = {}): Promise<Post[]> {
   const res = await fetch(URL + new URLSearchParams({ ...INITIAL_FETCH_PARAMS, ...params } as unknown as Record<string, string>).toString(), {
     headers: {
       Accept: 'application/json'
     }
   })
   const data = await res.json()
-  if ((params?.offset ?? 0) > 100) console.log(await res.text())
-  return data.events.filter((post: any) => !category || post.event_type === category).map((post: any) => {
+  return data.events.filter((post: any) => (!category || post.event_type === category) && filterPost(postsFilter, post)).map((post: any) => {
     const image: string | undefined = JSON.parse(post.jsondata ?? '{}').localized_capsule_image[0]
     return {
       title: post.announcement_body.headline,
@@ -73,6 +88,10 @@ export interface CSGOFetchParams {
   origin: 'https://www.counter-strike.net' | string
 }
 
+export interface CSGOPostFilter {
+  [key: string]: any
+}
+
 export interface Post {
   title: string
   link: string
@@ -84,22 +103,24 @@ export interface Post {
 export class UpdatesListener {
   private readonly intervalId: NodeJS.Timer
   private readonly params?: Partial<CSGOFetchParams>
+  private readonly postsFilter: CSGOPostFilter
   private readonly callback: (post: Post) => any
   private readonly callbackError?: (e: unknown) => any
   private lastPostTime: number
-  constructor (callback: (post: Post) => any, interval: number = 600000, params?: Partial<CSGOFetchParams>, lastPostTime?: number, callbackError?: (e: unknown) => any) {
+  constructor (callback: (post: Post) => any, interval: number = 600000, params?: Partial<CSGOFetchParams>, lastPostTime?: number, callbackError?: (e: unknown) => any, postsFilter: CSGOPostFilter = {}) {
     this.lastPostTime = lastPostTime ?? Date.now()
     this.params = params
     this.callback = callback
     this.callbackError = callbackError
+    this.postsFilter = postsFilter
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.intervalId = setInterval(this.fetchPosts.bind(this), interval)
     void this.fetchPosts()
   }
 
   async fetchPosts (): Promise<void> {
     try {
-      const posts = await getPosts(undefined, this.params)
+      const posts = await getPosts(undefined, this.params, this.postsFilter)
       posts.reverse().forEach(post => {
         if (post.date.getTime() <= this.lastPostTime) {
           return

tests/index.test.ts

@@ -7,7 +7,12 @@ describe('getBlogPosts', () => {
   })
 
   it('should return an array of ukrainian posts', async () => {
-    const posts = await getBlogPosts()
+    const posts = await getBlogPosts({ l: 'ukrainian' }, { announcement_body: { language: 26 } })
+    expect(posts).toBeInstanceOf(Array)
+  })
+
+  it('should return an array of russian posts', async () => {
+    const posts = await getBlogPosts({ l: 'russian' }, { announcement_body: { language: 8 } })
     expect(posts).toBeInstanceOf(Array)
   })
 
@@ -22,7 +27,7 @@ describe('getUpdatePosts', () => {
     expect(posts).toBeInstanceOf(Array)
   })
   it('should return an array of ukrainian posts', async () => {
-    const posts = await getUpdatePosts({ l: 'ukrainian' })
+    const posts = await getUpdatePosts({ l: 'ukrainian' }, { announcement_body: { language: 26 } })
     expect(posts).toBeInstanceOf(Array)
   })