fix: compute restricted types in statuses

makeomatic · Jan 17, 2023 · 7380931 · 7380931
1 parent 097afeb
commit 7380931
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/src/services/feed.js b/src/services/feed.js
@@ -54,18 +54,10 @@ class Feed {
       throw new HttpStatusError(400, 'the "account" parameter must be a string or an array');
     }
 
-    let restrictedTypes;
-    try {
-      restrictedTypes = this.service('twitter').statusesRestrictedTypes();
-    } catch (e) {
-      this.logger.info(e);
-      restrictedTypes = [];
-    }
-
     return this
       .service('storage')
       .twitterStatuses()
-      .list(data, restrictedTypes);
+      .list(data);
   }
 
   async remove(data) {

diff --git a/src/services/storage.js b/src/services/storage.js
@@ -9,13 +9,13 @@ const instagramMedia = new WeakMap();
 const twitterStatuses = new WeakMap();
 
 class Storage {
-  constructor(knex) {
+  constructor(knex, config) {
     this.client = knex;
 
     facebookMedia.set(this, new FacebookMedia(knex, 'facebook_media'));
     feeds.set(this, new Feeds(knex, 'feeds'));
     instagramMedia.set(this, new InstagramMedia(knex, 'instagram_media'));
-    twitterStatuses.set(this, new TwitterStatuses(knex, 'statuses'));
+    twitterStatuses.set(this, new TwitterStatuses(knex, 'statuses', config.twitter));
   }
 
   facebookMedia() {

diff --git a/src/services/storage/twitter-statuses.js b/src/services/storage/twitter-statuses.js
@@ -1,14 +1,20 @@
+const { TweetTypeByName } = require('../twitter/tweet-types');
+
 class TwitterStatuses {
-  constructor(knex, table) {
+  constructor(knex, table, config) {
     this.knex = knex;
     this.table = table;
+
+    const { restrictedTypes: names = [] } = config.requests || {};
+
+    this.restrictedTypes = names.map((name) => TweetTypeByName[name]);
   }
 
   save(data) {
     return this.knex.upsertItem(this.table, 'id', data);
   }
 
-  list(data, restrictedTypes = []) {
+  list(data) {
     const {
       page,
       pageSize,
@@ -30,8 +36,8 @@ class TwitterStatuses {
       .select()
       .whereRaw(rawQuery, [account]);
 
-    if (restrictedTypes.length) {
-      query.whereNotIn('type', restrictedTypes);
+    if (this.restrictedTypes.length) {
+      query.whereNotIn('type', this.restrictedTypes);
     }
 
     query

diff --git a/src/social.js b/src/social.js
@@ -70,7 +70,7 @@ class Social extends Microfleet {
   }
 
   initStorage() {
-    this.service(Social.SERVICE_STORAGE, new Storage(this.knex));
+    this.service(Social.SERVICE_STORAGE, new Storage(this.knex, this.config));
   }
 
   initFeed() {