generated from HoloTech/holotech-plugin-template
fix: Many typos
This commit is contained in:
+15
-10
@@ -2,6 +2,8 @@ from typing import Any, Optional
|
||||
import datetime as dt
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import aiohttp
|
||||
|
||||
from data import ORDER, Condition
|
||||
from data.conditions import NULL, condition
|
||||
from utils.lib import utc_now
|
||||
@@ -16,8 +18,9 @@ from . import logger
|
||||
|
||||
|
||||
class RewardCampaign:
|
||||
def __init__(self, row: Campaign):
|
||||
def __init__(self, row: Campaign, session: aiohttp.ClientSession | None = None):
|
||||
self.row = row
|
||||
self._session = session
|
||||
|
||||
self._webhook: ThreadedWebhook | None = None
|
||||
self._cached_webhookurl: str | None = None
|
||||
@@ -33,7 +36,7 @@ class RewardCampaign:
|
||||
if url is not None:
|
||||
# TODO: I don't know if these needs a client
|
||||
# Might be hard if so given we need to run this from Twitch client as well
|
||||
self._webhook = ThreadedWebhook.from_url(url)
|
||||
self._webhook = ThreadedWebhook.from_url(url, session=self._session)
|
||||
else:
|
||||
self._webhook = None
|
||||
return self._webhook
|
||||
@@ -170,8 +173,10 @@ class RewardCampaign:
|
||||
class CampaignRegistry:
|
||||
VERSION = CampaignData.VERSION
|
||||
|
||||
def __init__(self, data: CampaignData):
|
||||
def __init__(self, data: CampaignData, session: aiohttp.ClientSession | None = None):
|
||||
self.data = data
|
||||
# TODO: Actually pass in a session
|
||||
self._session = aiohttp.ClientSession()
|
||||
|
||||
async def init(self):
|
||||
await self.data.init()
|
||||
@@ -183,7 +188,7 @@ class CampaignRegistry:
|
||||
row = await Campaign.fetch(campaign_id)
|
||||
if row is None:
|
||||
raise ValueError("Campign %s doesn't exist." % campaign_id)
|
||||
camp = RewardCampaign(row)
|
||||
camp = RewardCampaign(row, session=self._session)
|
||||
return camp
|
||||
|
||||
async def fetch_campaigns(
|
||||
@@ -207,7 +212,7 @@ class CampaignRegistry:
|
||||
condition = condition and ~active_condition
|
||||
|
||||
rows = await Campaign.fetch_where(condition)
|
||||
campaigns = [RewardCampaign(row) for row in rows]
|
||||
campaigns = [RewardCampaign(row, session=self._session) for row in rows]
|
||||
|
||||
return campaigns
|
||||
|
||||
@@ -221,13 +226,13 @@ class CampaignRegistry:
|
||||
"""
|
||||
results = await Campaign.fetch_where(
|
||||
Condition._expression_equality(
|
||||
LOWER(Campaign.campaign_name.expr), LOWER(asexpr(name))
|
||||
LOWER(Campaign.campaign_name), LOWER(asexpr(name))
|
||||
),
|
||||
campaignid=cid,
|
||||
communityid=cid,
|
||||
)
|
||||
if results:
|
||||
row = results[0]
|
||||
camp = RewardCampaign(row)
|
||||
camp = RewardCampaign(row, session=self._session)
|
||||
else:
|
||||
camp = None
|
||||
return camp
|
||||
@@ -247,7 +252,7 @@ class CampaignRegistry:
|
||||
campaign_name=campaign_name,
|
||||
**kwargs
|
||||
)
|
||||
return RewardCampaign(row)
|
||||
return RewardCampaign(row, session=self._session)
|
||||
|
||||
async def update_campaign(
|
||||
self,
|
||||
@@ -261,4 +266,4 @@ class CampaignRegistry:
|
||||
"""
|
||||
campaign = await Campaign.fetch(campaign_id)
|
||||
await campaign.update(**kwargs)
|
||||
return RewardCampaign(campaign)
|
||||
return RewardCampaign(campaign, session=self._session)
|
||||
|
||||
Reference in New Issue
Block a user