fix: manual subscription adding

Author: Ni-2

apps/aigency-backend/src/grabbers/reddit/reddit.module.ts

@@ -1,12 +1,12 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { ContextModule } from 'src/context';
 import { FinderModule } from 'src/finder';
 import { SubscriptionModule } from 'src/subscription';
 import { RedditController } from './reddit.controller';
 import { RedditService } from './reddit.service';
 
 @Module({
-  imports: [SubscriptionModule, ContextModule, FinderModule],
+  imports: [forwardRef(() => SubscriptionModule), ContextModule, FinderModule],
   providers: [RedditService],
   controllers: [RedditController],
   exports: [RedditService],

apps/aigency-backend/src/grabbers/reddit/reddit.service.ts

@@ -1,11 +1,51 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import * as convertHTML from 'html-to-text';
 import { ContextService } from 'src/context/context.service';
 import { FinderService } from 'src/finder/finder.service';
 import { SubscriptionService } from 'src/subscription/subscription.service';
 import * as convertXML from 'xml-js';
 
-type RedditEntry = {
+export type RedditMessage = {
+  author: {
+    name: {
+      _text: string;
+    };
+    uri: {
+      _text: string;
+    };
+  };
+  category: {
+    _attributes: {
+      term: string;
+      label: string;
+    };
+  };
+  content: {
+    _attributes: {
+      type: string;
+    };
+    _text: string;
+  };
+  id: {
+    _text: string;
+  };
+  link: {
+    _attributes: {
+      href: string;
+    };
+  };
+  updated: {
+    _text: string;
+  };
+  published: {
+    _text: string;
+  };
+  title: {
+    _text: string;
+  };
+};
+
+export type RedditEntry = {
   feed: {
     id: {
       _text: string;
@@ -16,56 +56,40 @@ type RedditEntry = {
     title: {
       _text: string;
     };
-    entry: {
-      author: {
-        name: {
-          _text: string;
-        };
-        uri: {
-          _text: string;
-        };
-      };
-      category: {
-        _attributes: {
-          term: string;
-          label: string;
-        };
-      };
-      content: {
-        _attributes: {
-          type: string;
-        };
-        _text: string;
-      };
-      id: {
-        _text: string;
-      };
-      link: {
-        _attributes: {
-          href: string;
-        };
-      };
-      updated: {
-        _text: string;
-      };
-      published: {
-        _text: string;
-      };
-      title: {
-        _text: string;
-      };
-    }[];
+    entry: RedditMessage[];
   };
 };
 
 @Injectable()
 export class RedditService {
   constructor(
+    @Inject(forwardRef(() => SubscriptionService))
     private subscriptionService: SubscriptionService,
     private contextService: ContextService,
     private finderService: FinderService,
   ) {}
 
+  async getRedditChannelMessages(channelName: string) {
+    try {
+      const rss = await this.getRSS(
+        `https://www.reddit.com/${channelName}.rss`,
+      );
+      if (!rss) return;
+      const xml = this.parseXML(rss);
+      if (
+        !xml ||
+        !xml.feed ||
+        !xml.feed.entry ||
+        xml.feed.title._text === 'search results'
+      )
+        return;
+
+      return xml.feed.entry;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
   async grabReddits() {
     try {
       const activeSubscriptions =
@@ -91,6 +115,7 @@ export class RedditService {
             .map((sub) => sub.link),
         ),
       );
+      // console.log('uniqueReddits', uniqueReddits);
 
       const submissionXmls = await Promise.allSettled(
         uniqueReddits.map((reddit) =>

apps/aigency-backend/src/grabbers/telegram/get-messages.ts

@@ -4,7 +4,7 @@ import { Dialog } from 'telegram/tl/custom/dialog';
 const MSG_FETCH_LIMIT = 10;
 const MSG_FETCH_TIME_LIMIT_MINUTES = 60;
 
-export type Message = {
+export type TelegramMessage = {
   id: number;
   text: string;
   date: number;
@@ -28,8 +28,8 @@ export const getMessagesFromChannel = async ({
   >;
   isNew?: boolean;
   lastMessageId?: number;
-}): Promise<Message[]> => {
-  const messages: Message[] = [];
+}): Promise<TelegramMessage[]> => {
+  const messages: TelegramMessage[] = [];
   if (
     dialog.entity?.className === 'Channel' ||
     dialog.entity?.className === 'Chat'
@@ -143,7 +143,7 @@ export const getMessages = async ({
       return getMessagesFromChannel({ client, dialog, lastMessageId, isNew });
     }
   } else {
-    const result: Message[] = [];
+    const result: TelegramMessage[] = [];
     for (let i = 0; i < dialogs.length; i++) {
       const messages = await getMessagesFromChannel({
         client,

apps/aigency-backend/src/grabbers/telegram/telegram.module.ts

@@ -1,12 +1,12 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { ContextModule } from 'src/context';
 import { FinderModule } from 'src/finder';
 import { SubscriptionModule } from 'src/subscription';
 import { TelegramController } from './telegram.controller';
 import { TelegramService } from './telegram.service';
 
 @Module({
-  imports: [SubscriptionModule, ContextModule, FinderModule],
+  imports: [forwardRef(() => SubscriptionModule), ContextModule, FinderModule],
   providers: [TelegramService],
   controllers: [TelegramController],
   exports: [TelegramService],

apps/aigency-backend/src/grabbers/telegram/telegram.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import * as dotenv from 'dotenv';
 import { ContextService } from 'src/context/context.service';
 import { FinderService } from 'src/finder/finder.service';
@@ -19,6 +19,7 @@ export class TelegramService {
   private T_SESSION: string;
 
   constructor(
+    @Inject(forwardRef(() => SubscriptionService))
     private subscriptionService: SubscriptionService,
     private contextService: ContextService,
     private finderService: FinderService,
@@ -48,6 +49,19 @@ export class TelegramService {
     }
   }
 
+  async getTelegramChannelMessages(channelName: string) {
+    try {
+      const telegramEntry = await this.getTelegramClientAndDialogs();
+      if (!telegramEntry) return;
+      const { client, dialogs } = telegramEntry;
+      if (!client || !dialogs) return;
+      const messages = await getMessages({ client, dialogs, channelName });
+      return messages;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
   async grabTelegrams() {
     try {
       const activeSubscriptions =
@@ -74,6 +88,7 @@ export class TelegramService {
             .filter(Boolean),
         ),
       );
+      // console.log('uniqueTelegrams', uniqueTelegrams);
 
       const telegramEntry = await this.getTelegramClientAndDialogs();
       if (!telegramEntry) return;
@@ -98,6 +113,7 @@ export class TelegramService {
           console.log(error);
         }
       }
+      // console.log('telegramMessages', telegramMessages);
 
       // save profiles
       await Promise.all(

apps/aigency-backend/src/subscription/subscription.module.ts

@@ -1,12 +1,18 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Subscription } from './subscription.entity';
 import { SubscriptionRepository } from './subscription.repository';
 import { SubscriptionService } from './subscription.service';
 import { SubscriptionController } from './subscription.controller';
+import { TelegramModule } from 'src/grabbers/telegram';
+import { RedditModule } from 'src/grabbers/reddit';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Subscription])],
+  imports: [
+    TypeOrmModule.forFeature([Subscription]),
+    forwardRef(() => TelegramModule),
+    forwardRef(() => RedditModule),
+  ],
   providers: [SubscriptionRepository, SubscriptionService],
   controllers: [SubscriptionController],
   exports: [SubscriptionService],

apps/aigency-backend/src/subscription/subscription.service.ts

@@ -1,10 +1,16 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { SubscriptionRepository } from './subscription.repository';
+import { TelegramService } from 'src/grabbers/telegram/telegram.service';
+import { RedditService } from 'src/grabbers/reddit/reddit.service';
 
 @Injectable()
 export class SubscriptionService {
   constructor(
     private readonly subscriptionRepository: SubscriptionRepository,
+    @Inject(forwardRef(() => TelegramService))
+    private readonly telegramService: TelegramService,
+    @Inject(forwardRef(() => RedditService))
+    private readonly redditService: RedditService,
   ) {}
 
   async getSubscriptions(props: {
@@ -53,16 +59,33 @@ export class SubscriptionService {
     isByFinder: boolean;
   }) {
     const { userId, source, link, timestamp, isByFinder } = props;
+
+    // ToDo: hardcoded subscription checks. Move to service?
+    let channelName: string | null | undefined = null;
+    if (source === 'telegram') {
+      const messages =
+        await this.telegramService.getTelegramChannelMessages(link);
+      console.log(messages);
+      if (messages?.length) channelName = messages[0].source;
+    } else if (source === 'reddit') {
+      const messages = await this.redditService.getRedditChannelMessages(link);
+      console.log(messages);
+      if (messages?.length) {
+        channelName = messages[0].category._attributes.label;
+      }
+    }
+
+    // console.log(channelName);
+
     const subscription = this.subscriptionRepository.create({
       userId,
       source,
-      link,
+      link: channelName ?? link,
       isEnabled: true,
       lastSeenPostTimestamp: timestamp ?? null,
       isByFinder,
     });
-
-    // ToDo: check subscription link before save
+    // console.log(subscription);
 
     await this.subscriptionRepository.insert(subscription);