Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (checkin): Various bugfixes.

Browse Source
This commit is contained in:
Interitio
2025-07-16 02:21:26 +10:00
parent 6f6f1c8711
commit 096831ff38
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/checkin/cog.py
View File

@@ -26,6 +26,7 @@ class CheckinCog(LionCog):
self.eswebsockets = {} self.eswebsockets = {}
async def cog_load(self): async def cog_load(self):
self._loop = asyncio.get_running_loop()
self._load_twitch_methods(self.crocbot) self._load_twitch_methods(self.crocbot)
check_in_channel_id = self.bot.config.croccy['check_in_channel'].strip() check_in_channel_id = self.bot.config.croccy['check_in_channel'].strip()
@@ -37,7 +38,7 @@ class CheckinCog(LionCog):
async def fetch_eventsub_for(self, channelid): async def fetch_eventsub_for(self, channelid):
if (eventsub := self.eswebsockets.get(channelid)) is None: if (eventsub := self.eswebsockets.get(channelid)) is None:
authcog = self.bot.get_cog('TwitchAuthCog') authcog = self.bot.get_cog('TwitchAuthCog')
if not await authcog.check_auth(channelid, scopes=[AuthScope.channelid_READ_REDEMPTIONS]): if not await authcog.check_auth(channelid, scopes=[AuthScope.CHANNEL_READ_REDEMPTIONS]):
logger.error( logger.error(
f"Insufficient auth to login to registered check-in channelid {channelid}" f"Insufficient auth to login to registered check-in channelid {channelid}"
) )
@@ -59,7 +60,7 @@ class CheckinCog(LionCog):
async def handle_redeem(self, data: ChannelPointsCustomRewardRedemptionData): async def handle_redeem(self, data: ChannelPointsCustomRewardRedemptionData):
# Check if the redeem is one of the 'checkin' or 'quiet checkin' redeems. # Check if the redeem is one of the 'checkin' or 'quiet checkin' redeems.
title = data.event.title.lower() title = data.event.reward.title.lower()
# TODO: Redeem ID based registration (configured) # TODO: Redeem ID based registration (configured)
seeking = ('check in', 'quiet hello') seeking = ('check in', 'quiet hello')
if title in seeking: if title in seeking:
@@ -102,7 +103,7 @@ class CheckinCog(LionCog):
counterid=check_in_counter.counterid, counterid=check_in_counter.counterid,
) )
position = len(entries) + 1 position = len(entries) + 1
if profile.profileid not in (e.userid for e in entries): if profile.profileid not in (e['userid'] for e in entries):
# User has not already checked in! # User has not already checked in!
# Check them in # Check them in
# TODO: May be worth setting custom counter time # TODO: May be worth setting custom counter time
@@ -144,6 +145,10 @@ class CheckinCog(LionCog):
await channel.send(message) await channel.send(message)
async def get_stream_start(self, channelid: str | int) -> Optional[datetime]: async def get_stream_start(self, channelid: str | int) -> Optional[datetime]:
future = asyncio.run_coroutine_threadsafe(self._get_stream_start(channelid), self._loop)
return future.result()
async def _get_stream_start(self, channelid: str | int) -> Optional[datetime]:
streams = await self.crocbot.fetch_streams(user_ids=[int(channelid)]) streams = await self.crocbot.fetch_streams(user_ids=[int(channelid)])
if streams: if streams:
return streams[0].started_at return streams[0].started_at