From 4e3dc174cb0298af29785c3d0d2702fd18694f81 Mon Sep 17 00:00:00 2001 From: Corban-Lee Jones Date: Wed, 14 Feb 2024 00:21:09 +0000 Subject: [PATCH] working on new api changes into task --- src/extensions/tasks.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/extensions/tasks.py b/src/extensions/tasks.py index b0e06eb..883d152 100644 --- a/src/extensions/tasks.py +++ b/src/extensions/tasks.py @@ -16,7 +16,7 @@ from discord.errors import Forbidden from sqlalchemy import insert, select, and_ from feedparser import parse -from feed import Source, Article, RSSFeed +from feed import Source, Article, RSSFeed, Subscription, SubscriptionChannel from db import ( DatabaseManager, FeedChannelModel, @@ -90,10 +90,20 @@ class TaskCog(commands.Cog): async with aiohttp.ClientSession() as session: api = API(self.bot.api_token, session) - data, count = await api.get_rssfeed_list(discord_server_id__in=guild_ids) - rssfeeds = RSSFeed.from_list(data) - for item in rssfeeds: - log.info(item.name) + sub_data = api.get_subscriptions(server__in=guild_ids) + subscriptions = Subscriptions.from_list(sub_data) + + for sub in subscriptions: + channel_data = api.get_subscription_channels(subscription__uuid=sub.uuid) + channels = SubscriptionChannel.from_list(channel_data) + + + # async with aiohttp.ClientSession() as session: + # api = API(self.bot.api_token, session) + # data, count = await api.get_rssfeed_list(discord_server_id__in=guild_ids) + # rssfeeds = RSSFeed.from_list(data) + # for item in rssfeeds: + # log.info(item.name)