rewrite: Initial rewrite skeleton.
Remove modules that will no longer be required. Move pending modules to pending-rewrite folders.
This commit is contained in:
4
bot/modules/pending-rewrite/study/tracking/__init__.py
Normal file
4
bot/modules/pending-rewrite/study/tracking/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
||||
from . import data
|
||||
from . import settings
|
||||
from . import session_tracker
|
||||
from . import commands
|
||||
167
bot/modules/pending-rewrite/study/tracking/commands.py
Normal file
167
bot/modules/pending-rewrite/study/tracking/commands.py
Normal file
@@ -0,0 +1,167 @@
|
||||
from cmdClient.checks import in_guild
|
||||
from LionContext import LionContext as Context
|
||||
|
||||
from core import Lion
|
||||
from wards import is_guild_admin
|
||||
|
||||
from ..module import module
|
||||
|
||||
|
||||
MAX_TAG_LENGTH = 10
|
||||
|
||||
|
||||
@module.cmd(
|
||||
"now",
|
||||
group="🆕 Pomodoro",
|
||||
desc="What are you working on?",
|
||||
aliases=('studying', 'workingon'),
|
||||
flags=('clear', 'new')
|
||||
)
|
||||
@in_guild()
|
||||
async def cmd_now(ctx: Context, flags):
|
||||
"""
|
||||
Usage``:
|
||||
{prefix}now [tag]
|
||||
{prefix}now @mention
|
||||
{prefix}now --clear
|
||||
Description:
|
||||
Describe the subject or goal you are working on this session with, for example, `{prefix}now Maths`.
|
||||
Mention someone else to view what they are working on!
|
||||
Flags::
|
||||
clear: Remove your current tag.
|
||||
Examples:
|
||||
> {prefix}now Biology
|
||||
> {prefix}now {ctx.author.mention}
|
||||
"""
|
||||
if flags['clear']:
|
||||
if ctx.msg.mentions and is_guild_admin(ctx.author):
|
||||
# Assume an admin is trying to clear another user's tag
|
||||
for target in ctx.msg.mentions:
|
||||
lion = Lion.fetch(ctx.guild.id, target.id)
|
||||
if lion.session:
|
||||
lion.session.data.tag = None
|
||||
|
||||
if len(ctx.msg.mentions) == 1:
|
||||
await ctx.embed_reply(
|
||||
f"Cleared session tags for {ctx.msg.mentions[0].mention}."
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
f"Cleared session tags for:\n{', '.join(target.mention for target in ctx.msg.mentions)}."
|
||||
)
|
||||
else:
|
||||
# Assume the user is clearing their own session tag
|
||||
if (session := ctx.alion.session):
|
||||
session.data.tag = None
|
||||
await ctx.embed_reply(
|
||||
"Removed your session study tag!"
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
"You aren't studying right now, so there is nothing to clear!"
|
||||
)
|
||||
elif ctx.args:
|
||||
if ctx.msg.mentions:
|
||||
# Assume peeking at user's current session
|
||||
|
||||
# Smoll easter egg
|
||||
target = ctx.msg.mentions[0]
|
||||
if target == ctx.guild.me:
|
||||
student_count, guild_count = ctx.client.data.current_sessions.select_one_where(
|
||||
select_columns=("COUNT(*) AS studying_count", "COUNT(DISTINCT(guildid)) AS guild_count"),
|
||||
)
|
||||
if ctx.alion.session:
|
||||
if (tag := ctx.alion.session.data.tag):
|
||||
tail = f"Good luck with your **{tag}**!"
|
||||
else:
|
||||
tail = "Good luck with your study, I believe in you!"
|
||||
else:
|
||||
tail = "Do you want to join? Hop in a study channel and let's get to work!"
|
||||
return await ctx.embed_reply(
|
||||
"Thanks for asking!\n"
|
||||
f"I'm just helping out the **{student_count}** "
|
||||
f"dedicated people currently working across **{guild_count}** fun communities!\n"
|
||||
f"{tail}"
|
||||
)
|
||||
|
||||
lion = Lion.fetch(ctx.guild.id, target.id)
|
||||
if not lion.session:
|
||||
await ctx.embed_reply(
|
||||
f"{target.mention} isn't working right now!"
|
||||
)
|
||||
else:
|
||||
duration = lion.session.duration
|
||||
if duration > 3600:
|
||||
dur_str = "{}h {}m".format(
|
||||
int(duration // 3600),
|
||||
int((duration % 3600) // 60)
|
||||
)
|
||||
else:
|
||||
dur_str = "{} minutes".format(int((duration % 3600) // 60))
|
||||
|
||||
if not lion.session.data.tag:
|
||||
await ctx.embed_reply(
|
||||
f"{target.mention} has been working in <#{lion.session.data.channelid}> for **{dur_str}**!"
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
f"{target.mention} has been working on **{lion.session.data.tag}**"
|
||||
f" in <#{lion.session.data.channelid}> for **{dur_str}**!"
|
||||
)
|
||||
else:
|
||||
# Assume setting tag
|
||||
tag = ctx.args
|
||||
|
||||
if not (session := ctx.alion.session):
|
||||
return await ctx.error_reply(
|
||||
"You aren't working right now! Join a study channel and try again!"
|
||||
)
|
||||
|
||||
if len(tag) > MAX_TAG_LENGTH:
|
||||
return await ctx.error_reply(
|
||||
f"Please keep your tag under `{MAX_TAG_LENGTH}` characters long!"
|
||||
)
|
||||
|
||||
old_tag = session.data.tag
|
||||
session.data.tag = tag
|
||||
if old_tag:
|
||||
await ctx.embed_reply(
|
||||
f"You have updated your session study tag. Good luck with **{tag}**!"
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
"You have set your session study tag!\nIt will be reset when you leave, or join another channel.\n"
|
||||
f"Good luck with **{tag}**!"
|
||||
)
|
||||
else:
|
||||
# View current session, stats, and guide.
|
||||
if (session := ctx.alion.session):
|
||||
duration = session.duration
|
||||
if duration > 3600:
|
||||
dur_str = "{}h {}m".format(
|
||||
int(duration // 3600),
|
||||
int((duration % 3600) // 60)
|
||||
)
|
||||
else:
|
||||
dur_str = "{} minutes".format(int((duration % 3600) / 60))
|
||||
if not session.data.tag:
|
||||
await ctx.embed_reply(
|
||||
f"You have been working in <#{session.data.channelid}> for **{dur_str}**!\n"
|
||||
f"Describe what you are working on with "
|
||||
f"`{ctx.best_prefix}now <tag>`, e.g. `{ctx.best_prefix}now Maths`"
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
f"You have been working on **{session.data.tag}**"
|
||||
f" in <#{session.data.channelid}> for **{dur_str}**!"
|
||||
)
|
||||
else:
|
||||
await ctx.embed_reply(
|
||||
f"Join a study channel and describe what you are working on with e.g. `{ctx.best_prefix}now Maths`"
|
||||
)
|
||||
|
||||
# TODO: Favourite tags listing
|
||||
# Get tag history ranking top 5
|
||||
# If there are any, display top 5
|
||||
# Otherwise do nothing
|
||||
...
|
||||
86
bot/modules/pending-rewrite/study/tracking/data.py
Normal file
86
bot/modules/pending-rewrite/study/tracking/data.py
Normal file
@@ -0,0 +1,86 @@
|
||||
from psycopg2.extras import execute_values
|
||||
|
||||
from data import Table, RowTable, tables
|
||||
from utils.lib import FieldEnum
|
||||
|
||||
|
||||
untracked_channels = Table('untracked_channels')
|
||||
|
||||
|
||||
class SessionChannelType(FieldEnum):
|
||||
"""
|
||||
The possible session channel types.
|
||||
"""
|
||||
# NOTE: "None" stands for Unknown, and the STANDARD description should be replaced with the channel name
|
||||
STANDARD = 'STANDARD', "Standard"
|
||||
ACCOUNTABILITY = 'ACCOUNTABILITY', "Accountability Room"
|
||||
RENTED = 'RENTED', "Private Room"
|
||||
EXTERNAL = 'EXTERNAL', "Unknown"
|
||||
|
||||
|
||||
session_history = Table('session_history')
|
||||
current_sessions = RowTable(
|
||||
'current_sessions',
|
||||
('guildid', 'userid', 'channelid', 'channel_type',
|
||||
'rating', 'tag',
|
||||
'start_time',
|
||||
'live_duration', 'live_start',
|
||||
'stream_duration', 'stream_start',
|
||||
'video_duration', 'video_start',
|
||||
'hourly_coins', 'hourly_live_coins'),
|
||||
('guildid', 'userid'),
|
||||
cache={} # Keep all current sessions in cache
|
||||
)
|
||||
|
||||
|
||||
@current_sessions.save_query
|
||||
def close_study_session(guildid, userid):
|
||||
"""
|
||||
Close a member's current session if it exists and update the member cache.
|
||||
"""
|
||||
# Execute the `close_study_session` database function
|
||||
with current_sessions.conn as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.callproc('close_study_session', (guildid, userid))
|
||||
rows = cursor.fetchall()
|
||||
# The row has been deleted, remove the from current sessions cache
|
||||
current_sessions.row_cache.pop((guildid, userid), None)
|
||||
# Use the function output to update the member cache
|
||||
tables.lions._make_rows(*rows)
|
||||
|
||||
|
||||
@session_history.save_query
|
||||
def study_time_since(guildid, userid, timestamp):
|
||||
"""
|
||||
Retrieve the total member study time (in seconds) since the given timestamp.
|
||||
Includes the current session, if it exists.
|
||||
"""
|
||||
with session_history.conn as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.callproc('study_time_since', (guildid, userid, timestamp))
|
||||
rows = cursor.fetchall()
|
||||
return (rows[0][0] if rows else None) or 0
|
||||
|
||||
|
||||
@session_history.save_query
|
||||
def study_times_since(guildid, userid, *timestamps):
|
||||
"""
|
||||
Retrieve the total member study time (in seconds) since the given timestamps.
|
||||
Includes the current session, if it exists.
|
||||
"""
|
||||
with session_history.conn as conn:
|
||||
cursor = conn.cursor()
|
||||
data = execute_values(
|
||||
cursor,
|
||||
"""
|
||||
SELECT study_time_since(t.guildid, t.userid, t.timestamp)
|
||||
FROM (VALUES %s)
|
||||
AS t (guildid, userid, timestamp)
|
||||
""",
|
||||
[(guildid, userid, timestamp) for timestamp in timestamps],
|
||||
fetch=True
|
||||
)
|
||||
return data
|
||||
|
||||
|
||||
members_totals = Table('members_totals')
|
||||
504
bot/modules/pending-rewrite/study/tracking/session_tracker.py
Normal file
504
bot/modules/pending-rewrite/study/tracking/session_tracker.py
Normal file
@@ -0,0 +1,504 @@
|
||||
import asyncio
|
||||
import discord
|
||||
import logging
|
||||
import traceback
|
||||
from typing import Dict
|
||||
from collections import defaultdict
|
||||
|
||||
from utils.lib import utc_now
|
||||
from data import tables
|
||||
from data.conditions import THIS_SHARD
|
||||
from core import Lion
|
||||
from meta import client
|
||||
|
||||
from ..module import module
|
||||
from .data import current_sessions, SessionChannelType
|
||||
from .settings import untracked_channels, hourly_reward, hourly_live_bonus
|
||||
|
||||
|
||||
class Session:
|
||||
"""
|
||||
A `Session` describes an ongoing study session by a single guild member.
|
||||
A member is counted as studying when they are in a tracked voice channel.
|
||||
|
||||
This class acts as an opaque interface to the corresponding `sessions` data row.
|
||||
"""
|
||||
__slots__ = (
|
||||
'guildid',
|
||||
'userid',
|
||||
'_expiry_task'
|
||||
)
|
||||
# Global cache of ongoing sessions
|
||||
sessions: Dict[int, Dict[int, 'Session']] = defaultdict(dict)
|
||||
|
||||
# Global cache of members pending session start (waiting for daily cap reset)
|
||||
members_pending: Dict[int, Dict[int, asyncio.Task]] = defaultdict(dict)
|
||||
|
||||
def __init__(self, guildid, userid):
|
||||
self.guildid = guildid
|
||||
self.userid = userid
|
||||
|
||||
self._expiry_task: asyncio.Task = None
|
||||
|
||||
@classmethod
|
||||
def get(cls, guildid, userid):
|
||||
"""
|
||||
Fetch the current session for the provided member.
|
||||
If there is no current session, returns `None`.
|
||||
"""
|
||||
return cls.sessions[guildid].get(userid, None)
|
||||
|
||||
@classmethod
|
||||
def start(cls, member: discord.Member, state: discord.VoiceState):
|
||||
"""
|
||||
Start a new study session for the provided member.
|
||||
"""
|
||||
guildid = member.guild.id
|
||||
userid = member.id
|
||||
now = utc_now()
|
||||
|
||||
if userid in cls.sessions[guildid]:
|
||||
raise ValueError("A session for this member already exists!")
|
||||
|
||||
# If the user is study capped, schedule the session start for the next day
|
||||
if (lion := Lion.fetch(guildid, userid)).remaining_study_today <= 10:
|
||||
if pending := cls.members_pending[guildid].pop(userid, None):
|
||||
pending.cancel()
|
||||
task = asyncio.create_task(cls._delayed_start(guildid, userid, member, state))
|
||||
cls.members_pending[guildid][userid] = task
|
||||
client.log(
|
||||
"Member (uid:{}) in (gid:{}) is study capped, "
|
||||
"delaying session start for {} seconds until start of next day.".format(
|
||||
userid, guildid, lion.remaining_in_day
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
level=logging.DEBUG
|
||||
)
|
||||
return
|
||||
|
||||
# TODO: More reliable channel type determination
|
||||
if state.channel.id in tables.rented.row_cache:
|
||||
channel_type = SessionChannelType.RENTED
|
||||
elif state.channel.category and state.channel.category.id == lion.guild_settings.accountability_category.data:
|
||||
channel_type = SessionChannelType.ACCOUNTABILITY
|
||||
else:
|
||||
channel_type = SessionChannelType.STANDARD
|
||||
|
||||
current_sessions.create_row(
|
||||
guildid=guildid,
|
||||
userid=userid,
|
||||
channelid=state.channel.id,
|
||||
channel_type=channel_type,
|
||||
start_time=now,
|
||||
live_start=now if (state.self_video or state.self_stream) else None,
|
||||
stream_start=now if state.self_stream else None,
|
||||
video_start=now if state.self_video else None,
|
||||
hourly_coins=hourly_reward.get(guildid).value,
|
||||
hourly_live_coins=hourly_live_bonus.get(guildid).value
|
||||
)
|
||||
session = cls(guildid, userid).activate()
|
||||
client.log(
|
||||
"Started session: {}".format(session.data),
|
||||
context="SESSION_TRACKER",
|
||||
level=logging.DEBUG,
|
||||
)
|
||||
|
||||
@classmethod
|
||||
async def _delayed_start(cls, guildid, userid, *args):
|
||||
delay = Lion.fetch(guildid, userid).remaining_in_day
|
||||
try:
|
||||
await asyncio.sleep(delay)
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
else:
|
||||
cls.start(*args)
|
||||
|
||||
@property
|
||||
def key(self):
|
||||
"""
|
||||
RowTable Session identification key.
|
||||
"""
|
||||
return (self.guildid, self.userid)
|
||||
|
||||
@property
|
||||
def lion(self):
|
||||
"""
|
||||
The Lion member object associated with this member.
|
||||
"""
|
||||
return Lion.fetch(self.guildid, self.userid)
|
||||
|
||||
@property
|
||||
def data(self):
|
||||
"""
|
||||
Row of the `current_sessions` table corresponding to this session.
|
||||
"""
|
||||
return current_sessions.fetch(self.key)
|
||||
|
||||
@property
|
||||
def duration(self):
|
||||
"""
|
||||
Current duration of the session.
|
||||
"""
|
||||
return (utc_now() - self.data.start_time).total_seconds()
|
||||
|
||||
@property
|
||||
def coins_earned(self):
|
||||
"""
|
||||
Number of coins earned so far.
|
||||
"""
|
||||
data = self.data
|
||||
|
||||
coins = self.duration * data.hourly_coins
|
||||
coins += data.live_duration * data.hourly_live_coins
|
||||
if data.live_start:
|
||||
coins += (utc_now() - data.live_start).total_seconds() * data.hourly_live_coins
|
||||
return coins // 3600
|
||||
|
||||
def activate(self):
|
||||
"""
|
||||
Activate the study session.
|
||||
This adds the session to the studying members cache,
|
||||
and schedules the session expiry, based on the daily study cap.
|
||||
"""
|
||||
# Add to the active cache
|
||||
self.sessions[self.guildid][self.userid] = self
|
||||
|
||||
# Schedule the session expiry
|
||||
self.schedule_expiry()
|
||||
|
||||
# Return self for easy chaining
|
||||
return self
|
||||
|
||||
def schedule_expiry(self):
|
||||
"""
|
||||
Schedule session termination when the user reaches the maximum daily study time.
|
||||
"""
|
||||
asyncio.create_task(self._schedule_expiry())
|
||||
|
||||
async def _schedule_expiry(self):
|
||||
# Cancel any existing expiry
|
||||
if self._expiry_task and not self._expiry_task.done():
|
||||
self._expiry_task.cancel()
|
||||
|
||||
# Wait for the maximum session length
|
||||
self._expiry_task = asyncio.create_task(asyncio.sleep(self.lion.remaining_study_today))
|
||||
try:
|
||||
await self._expiry_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
else:
|
||||
if self.lion.remaining_study_today <= 10:
|
||||
# End the session
|
||||
# Note that the user will not automatically start a new session when the day starts
|
||||
# TODO: Notify user? Disconnect them?
|
||||
client.log(
|
||||
"Session for (uid:{}) in (gid:{}) reached daily guild study cap.\n{}".format(
|
||||
self.userid, self.guildid, self.data
|
||||
),
|
||||
context="SESSION_TRACKER"
|
||||
)
|
||||
self.finish()
|
||||
else:
|
||||
# It's possible the expiry time was pushed forwards while waiting
|
||||
# If so, reschedule
|
||||
self.schedule_expiry()
|
||||
|
||||
def finish(self):
|
||||
"""
|
||||
Close the study session.
|
||||
"""
|
||||
# Note that save_live_status doesn't need to be called here
|
||||
# The database saving procedure will account for the values.
|
||||
current_sessions.queries.close_study_session(*self.key)
|
||||
|
||||
# Remove session from active cache
|
||||
self.sessions[self.guildid].pop(self.userid, None)
|
||||
|
||||
# Cancel any existing expiry task
|
||||
if self._expiry_task and not self._expiry_task.done():
|
||||
self._expiry_task.cancel()
|
||||
|
||||
def save_live_status(self, state: discord.VoiceState):
|
||||
"""
|
||||
Update the saved live status of the member.
|
||||
"""
|
||||
has_video = state.self_video
|
||||
has_stream = state.self_stream
|
||||
is_live = has_video or has_stream
|
||||
|
||||
now = utc_now()
|
||||
data = self.data
|
||||
|
||||
with data.batch_update():
|
||||
# Update video session stats
|
||||
if data.video_start:
|
||||
data.video_duration += (now - data.video_start).total_seconds()
|
||||
data.video_start = now if has_video else None
|
||||
|
||||
# Update stream session stats
|
||||
if data.stream_start:
|
||||
data.stream_duration += (now - data.stream_start).total_seconds()
|
||||
data.stream_start = now if has_stream else None
|
||||
|
||||
# Update overall live session stats
|
||||
if data.live_start:
|
||||
data.live_duration += (now - data.live_start).total_seconds()
|
||||
data.live_start = now if is_live else None
|
||||
|
||||
|
||||
async def session_voice_tracker(client, member, before, after):
|
||||
"""
|
||||
Voice update event dispatcher for study session tracking.
|
||||
"""
|
||||
if member.bot:
|
||||
return
|
||||
|
||||
guild = member.guild
|
||||
Lion.fetch(guild.id, member.id).update_saved_data(member)
|
||||
session = Session.get(guild.id, member.id)
|
||||
|
||||
if before.channel == after.channel:
|
||||
# Voice state change without moving channel
|
||||
if session and ((before.self_video != after.self_video) or (before.self_stream != after.self_stream)):
|
||||
# Live status has changed!
|
||||
session.save_live_status(after)
|
||||
else:
|
||||
# Member changed channel
|
||||
# End the current session and start a new one, if applicable
|
||||
if session:
|
||||
if (scid := session.data.channelid) and (not before.channel or scid != before.channel.id):
|
||||
client.log(
|
||||
"The previous voice state for "
|
||||
"member {member.name} (uid:{member.id}) in {guild.name} (gid:{guild.id}) "
|
||||
"does not match their current study session!\n"
|
||||
"Session channel is (cid:{scid}), but the previous channel is {previous}.".format(
|
||||
member=member,
|
||||
guild=member.guild,
|
||||
scid=scid,
|
||||
previous="{0.name} (cid:{0.id})".format(before.channel) if before.channel else "None"
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
level=logging.ERROR
|
||||
)
|
||||
client.log(
|
||||
"Ending study session for {member.name} (uid:{member.id}) "
|
||||
"in {member.guild.id} (gid:{member.guild.id}) since they left the voice channel.\n{session}".format(
|
||||
member=member,
|
||||
session=session.data
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
post=False
|
||||
)
|
||||
# End the current session
|
||||
session.finish()
|
||||
elif pending := Session.members_pending[guild.id].pop(member.id, None):
|
||||
client.log(
|
||||
"Cancelling pending study session for {member.name} (uid:{member.id}) "
|
||||
"in {member.guild.name} (gid:{member.guild.id}) since they left the voice channel.".format(
|
||||
member=member
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
post=False
|
||||
)
|
||||
pending.cancel()
|
||||
|
||||
if after.channel:
|
||||
blacklist = client.user_blacklist()
|
||||
guild_blacklist = client.objects['ignored_members'][guild.id]
|
||||
untracked = untracked_channels.get(guild.id).data
|
||||
start_session = (
|
||||
(after.channel.id not in untracked)
|
||||
and (member.id not in blacklist)
|
||||
and (member.id not in guild_blacklist)
|
||||
)
|
||||
if start_session:
|
||||
# Start a new session for the member
|
||||
client.log(
|
||||
"Starting a new voice channel study session for {member.name} (uid:{member.id}) "
|
||||
"in {member.guild.name} (gid:{member.guild.id}).".format(
|
||||
member=member,
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
post=False
|
||||
)
|
||||
session = Session.start(member, after)
|
||||
|
||||
|
||||
async def leave_guild_sessions(client, guild):
|
||||
"""
|
||||
`guild_leave` hook.
|
||||
Close all sessions in the guild when we leave.
|
||||
"""
|
||||
sessions = list(Session.sessions[guild.id].values())
|
||||
for session in sessions:
|
||||
session.finish()
|
||||
client.log(
|
||||
"Left {} (gid:{}) and closed {} ongoing study sessions.".format(guild.name, guild.id, len(sessions)),
|
||||
context="SESSION_TRACKER"
|
||||
)
|
||||
|
||||
|
||||
async def join_guild_sessions(client, guild):
|
||||
"""
|
||||
`guild_join` hook.
|
||||
Refresh all sessions for the guild when we rejoin.
|
||||
"""
|
||||
# Delete existing current sessions, which should have been closed when we left
|
||||
# It is possible we were removed from the guild during an outage
|
||||
current_sessions.delete_where(guildid=guild.id)
|
||||
|
||||
untracked = untracked_channels.get(guild.id).data
|
||||
members = [
|
||||
member
|
||||
for channel in guild.voice_channels
|
||||
for member in channel.members
|
||||
if channel.members and channel.id not in untracked and not member.bot
|
||||
]
|
||||
for member in members:
|
||||
client.log(
|
||||
"Starting new session for '{}' (uid: {}) in '{}' (cid: {}) of '{}' (gid: {})".format(
|
||||
member.name,
|
||||
member.id,
|
||||
member.voice.channel.name,
|
||||
member.voice.channel.id,
|
||||
member.guild.name,
|
||||
member.guild.id
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
level=logging.INFO,
|
||||
post=False
|
||||
)
|
||||
Session.start(member, member.voice)
|
||||
|
||||
# Log newly started sessions
|
||||
client.log(
|
||||
"Joined {} (gid:{}) and started {} new study sessions from current voice channel members.".format(
|
||||
guild.name,
|
||||
guild.id,
|
||||
len(members)
|
||||
),
|
||||
context="SESSION_TRACKER",
|
||||
)
|
||||
|
||||
|
||||
async def _init_session_tracker(client):
|
||||
"""
|
||||
Load ongoing saved study sessions into the session cache,
|
||||
update them depending on the current voice states,
|
||||
and attach the voice event handler.
|
||||
"""
|
||||
# Ensure the client caches are ready and guilds are chunked
|
||||
await client.wait_until_ready()
|
||||
|
||||
# Pre-cache the untracked channels
|
||||
await untracked_channels.launch_task(client)
|
||||
|
||||
# Log init start and define logging counters
|
||||
client.log(
|
||||
"Loading ongoing study sessions.",
|
||||
context="SESSION_INIT",
|
||||
level=logging.DEBUG
|
||||
)
|
||||
resumed = 0
|
||||
ended = 0
|
||||
|
||||
# Grab all ongoing sessions from data
|
||||
rows = current_sessions.fetch_rows_where(guildid=THIS_SHARD)
|
||||
|
||||
# Iterate through, resume or end as needed
|
||||
for row in rows:
|
||||
if (guild := client.get_guild(row.guildid)) is not None and row.channelid is not None:
|
||||
try:
|
||||
# Load the Session
|
||||
session = Session(row.guildid, row.userid)
|
||||
|
||||
# Find the channel and member voice state
|
||||
voice = None
|
||||
if channel := guild.get_channel(row.channelid):
|
||||
voice = next((member.voice for member in channel.members if member.id == row.userid), None)
|
||||
|
||||
# Resume or end as required
|
||||
if voice and voice.channel:
|
||||
client.log(
|
||||
"Resuming ongoing session: {}".format(row),
|
||||
context="SESSION_INIT",
|
||||
level=logging.DEBUG
|
||||
)
|
||||
session.activate()
|
||||
session.save_live_status(voice)
|
||||
resumed += 1
|
||||
else:
|
||||
client.log(
|
||||
"Ending already completed session: {}".format(row),
|
||||
context="SESSION_INIT",
|
||||
level=logging.DEBUG
|
||||
)
|
||||
session.finish()
|
||||
ended += 1
|
||||
except Exception:
|
||||
# Fatal error
|
||||
client.log(
|
||||
"Fatal error occurred initialising session: {}\n{}".format(row, traceback.format_exc()),
|
||||
context="SESSION_INIT",
|
||||
level=logging.CRITICAL
|
||||
)
|
||||
module.ready = False
|
||||
return
|
||||
|
||||
# Log resumed sessions
|
||||
client.log(
|
||||
"Resumed {} ongoing study sessions, and ended {}.".format(resumed, ended),
|
||||
context="SESSION_INIT",
|
||||
level=logging.INFO
|
||||
)
|
||||
|
||||
# Now iterate through members of all tracked voice channels
|
||||
# Start sessions if they don't already exist
|
||||
tracked_channels = [
|
||||
channel
|
||||
for guild in client.guilds
|
||||
for channel in guild.voice_channels
|
||||
if channel.members and channel.id not in untracked_channels.get(guild.id).data
|
||||
]
|
||||
new_members = [
|
||||
member
|
||||
for channel in tracked_channels
|
||||
for member in channel.members
|
||||
if not member.bot and not Session.get(member.guild.id, member.id)
|
||||
]
|
||||
for member in new_members:
|
||||
client.log(
|
||||
"Starting new session for '{}' (uid: {}) in '{}' (cid: {}) of '{}' (gid: {})".format(
|
||||
member.name,
|
||||
member.id,
|
||||
member.voice.channel.name,
|
||||
member.voice.channel.id,
|
||||
member.guild.name,
|
||||
member.guild.id
|
||||
),
|
||||
context="SESSION_INIT",
|
||||
level=logging.DEBUG
|
||||
)
|
||||
Session.start(member, member.voice)
|
||||
|
||||
# Log newly started sessions
|
||||
client.log(
|
||||
"Started {} new study sessions from current voice channel members.".format(len(new_members)),
|
||||
context="SESSION_INIT",
|
||||
level=logging.INFO
|
||||
)
|
||||
|
||||
# Now that we are in a valid initial state, attach the session event handler
|
||||
client.add_after_event("voice_state_update", session_voice_tracker)
|
||||
client.add_after_event("guild_remove", leave_guild_sessions)
|
||||
client.add_after_event("guild_join", join_guild_sessions)
|
||||
|
||||
|
||||
@module.launch_task
|
||||
async def launch_session_tracker(client):
|
||||
"""
|
||||
Launch the study session initialiser.
|
||||
Doesn't block on the client being ready.
|
||||
"""
|
||||
client.objects['sessions'] = Session.sessions
|
||||
asyncio.create_task(_init_session_tracker(client))
|
||||
143
bot/modules/pending-rewrite/study/tracking/settings.py
Normal file
143
bot/modules/pending-rewrite/study/tracking/settings.py
Normal file
@@ -0,0 +1,143 @@
|
||||
import settings
|
||||
from settings import GuildSettings
|
||||
from wards import guild_admin
|
||||
|
||||
from .data import untracked_channels
|
||||
|
||||
|
||||
@GuildSettings.attach_setting
|
||||
class untracked_channels(settings.ChannelList, settings.ListData, settings.Setting):
|
||||
category = "Study Tracking"
|
||||
|
||||
attr_name = 'untracked_channels'
|
||||
|
||||
_table_interface = untracked_channels
|
||||
_setting = settings.VoiceChannel
|
||||
|
||||
_id_column = 'guildid'
|
||||
_data_column = 'channelid'
|
||||
|
||||
write_ward = guild_admin
|
||||
display_name = "untracked_channels"
|
||||
desc = "Channels to ignore for study time tracking."
|
||||
|
||||
_force_unique = True
|
||||
|
||||
long_desc = (
|
||||
"Time spent in these voice channels won't add study time or lioncoins to the member."
|
||||
)
|
||||
|
||||
# Flat cache, no need to expire objects
|
||||
_cache = {}
|
||||
|
||||
@property
|
||||
def success_response(self):
|
||||
if self.value:
|
||||
return "The untracked channels have been updated:\n{}".format(self.formatted)
|
||||
else:
|
||||
return "Study time will now be counted in all channels."
|
||||
|
||||
@classmethod
|
||||
async def launch_task(cls, client):
|
||||
"""
|
||||
Launch initialisation step for the `untracked_channels` setting.
|
||||
|
||||
Pre-fill cache for the guilds with currently active voice channels.
|
||||
"""
|
||||
active_guildids = [
|
||||
guild.id
|
||||
for guild in client.guilds
|
||||
if any(channel.members for channel in guild.voice_channels)
|
||||
]
|
||||
if active_guildids:
|
||||
cache = {guildid: [] for guildid in active_guildids}
|
||||
rows = cls._table_interface.select_where(
|
||||
guildid=active_guildids
|
||||
)
|
||||
for row in rows:
|
||||
cache[row['guildid']].append(row['channelid'])
|
||||
cls._cache.update(cache)
|
||||
client.log(
|
||||
"Cached {} untracked channels for {} active guilds.".format(
|
||||
len(rows),
|
||||
len(cache)
|
||||
),
|
||||
context="UNTRACKED_CHANNELS"
|
||||
)
|
||||
|
||||
|
||||
@GuildSettings.attach_setting
|
||||
class hourly_reward(settings.Integer, settings.GuildSetting):
|
||||
category = "Study Tracking"
|
||||
|
||||
attr_name = "hourly_reward"
|
||||
_data_column = "study_hourly_reward"
|
||||
|
||||
display_name = "hourly_reward"
|
||||
desc = "Number of LionCoins given per hour of study."
|
||||
|
||||
_default = 50
|
||||
_max = 32767
|
||||
|
||||
long_desc = (
|
||||
"Each spent in a voice channel will reward this number of LionCoins."
|
||||
)
|
||||
_accepts = "An integer number of LionCoins to reward."
|
||||
|
||||
@property
|
||||
def success_response(self):
|
||||
return "Members will be rewarded `{}` LionCoins per hour of study.".format(self.formatted)
|
||||
|
||||
|
||||
@GuildSettings.attach_setting
|
||||
class hourly_live_bonus(settings.Integer, settings.GuildSetting):
|
||||
category = "Study Tracking"
|
||||
|
||||
attr_name = "hourly_live_bonus"
|
||||
_data_column = "study_hourly_live_bonus"
|
||||
|
||||
display_name = "hourly_live_bonus"
|
||||
desc = "Number of extra LionCoins given for a full hour of streaming (via go live or video)."
|
||||
|
||||
_default = 150
|
||||
_max = 32767
|
||||
|
||||
long_desc = (
|
||||
"LionCoin bonus earnt for every hour a member streams in a voice channel, including video. "
|
||||
"This is in addition to the standard `hourly_reward`."
|
||||
)
|
||||
_accepts = "An integer number of LionCoins to reward."
|
||||
|
||||
@property
|
||||
def success_response(self):
|
||||
return "Members will be rewarded an extra `{}` LionCoins per hour if they stream.".format(self.formatted)
|
||||
|
||||
|
||||
@GuildSettings.attach_setting
|
||||
class daily_study_cap(settings.Duration, settings.GuildSetting):
|
||||
category = "Study Tracking"
|
||||
|
||||
attr_name = "daily_study_cap"
|
||||
_data_column = "daily_study_cap"
|
||||
|
||||
display_name = "daily_study_cap"
|
||||
desc = "Maximum amount of recorded study time per member per day."
|
||||
|
||||
_default = 16 * 60 * 60
|
||||
_default_multiplier = 60 * 60
|
||||
|
||||
_max = 25 * 60 * 60
|
||||
|
||||
long_desc = (
|
||||
"The maximum amount of study time that can be recorded for a member per day, "
|
||||
"intended to remove system encouragement for unhealthy or obsessive behaviour.\n"
|
||||
"The member may study for longer, but their sessions will not be tracked. "
|
||||
"The start and end of the day are determined by the member's configured timezone."
|
||||
)
|
||||
|
||||
@property
|
||||
def success_response(self):
|
||||
# Refresh expiry for all sessions in the guild
|
||||
[session.schedule_expiry() for session in self.client.objects['sessions'][self.id].values()]
|
||||
|
||||
return "The maximum tracked daily study time is now {}.".format(self.formatted)
|
||||
109
bot/modules/pending-rewrite/study/tracking/time_tracker.py
Normal file
109
bot/modules/pending-rewrite/study/tracking/time_tracker.py
Normal file
@@ -0,0 +1,109 @@
|
||||
import itertools
|
||||
import traceback
|
||||
import logging
|
||||
import asyncio
|
||||
from time import time
|
||||
|
||||
from meta import client
|
||||
from core import Lion
|
||||
|
||||
from ..module import module
|
||||
from .settings import untracked_channels, hourly_reward, hourly_live_bonus
|
||||
|
||||
|
||||
last_scan = {} # guildid -> timestamp
|
||||
|
||||
|
||||
def _scan(guild):
|
||||
"""
|
||||
Scan the tracked voice channels and add time and coins to each user.
|
||||
"""
|
||||
# Current timestamp
|
||||
now = time()
|
||||
|
||||
# Get last scan timestamp
|
||||
try:
|
||||
last = last_scan[guild.id]
|
||||
except KeyError:
|
||||
return
|
||||
finally:
|
||||
last_scan[guild.id] = now
|
||||
|
||||
# Calculate time since last scan
|
||||
interval = now - last
|
||||
|
||||
# Discard if it has been more than 20 minutes (discord outage?)
|
||||
if interval > 60 * 20:
|
||||
return
|
||||
|
||||
untracked = untracked_channels.get(guild.id).data
|
||||
guild_hourly_reward = hourly_reward.get(guild.id).data
|
||||
guild_hourly_live_bonus = hourly_live_bonus.get(guild.id).data
|
||||
|
||||
channel_members = (
|
||||
channel.members for channel in guild.voice_channels if channel.id not in untracked
|
||||
)
|
||||
|
||||
members = itertools.chain(*channel_members)
|
||||
# TODO filter out blacklisted users
|
||||
|
||||
blacklist = client.user_blacklist()
|
||||
guild_blacklist = client.objects['ignored_members'][guild.id]
|
||||
|
||||
for member in members:
|
||||
if member.bot:
|
||||
continue
|
||||
if member.id in blacklist or member.id in guild_blacklist:
|
||||
continue
|
||||
lion = Lion.fetch(guild.id, member.id)
|
||||
|
||||
# Add time
|
||||
lion.addTime(interval, flush=False)
|
||||
|
||||
# Add coins
|
||||
hour_reward = guild_hourly_reward
|
||||
if member.voice.self_stream or member.voice.self_video:
|
||||
hour_reward += guild_hourly_live_bonus
|
||||
|
||||
lion.addCoins(hour_reward * interval / (3600), flush=False, bonus=True)
|
||||
|
||||
|
||||
async def _study_tracker():
|
||||
"""
|
||||
Scanner launch loop.
|
||||
"""
|
||||
while True:
|
||||
while not client.is_ready():
|
||||
await asyncio.sleep(1)
|
||||
|
||||
await asyncio.sleep(5)
|
||||
|
||||
# Launch scanners on each guild
|
||||
for guild in client.guilds:
|
||||
# Short wait to pass control to other asyncio tasks if they need it
|
||||
await asyncio.sleep(0)
|
||||
try:
|
||||
# Scan the guild
|
||||
_scan(guild)
|
||||
except Exception:
|
||||
# Unknown exception. Catch it so the loop doesn't die.
|
||||
client.log(
|
||||
"Error while scanning guild '{}'(gid:{})! "
|
||||
"Exception traceback follows.\n{}".format(
|
||||
guild.name,
|
||||
guild.id,
|
||||
traceback.format_exc()
|
||||
),
|
||||
context="VOICE_ACTIVITY_SCANNER",
|
||||
level=logging.ERROR
|
||||
)
|
||||
|
||||
|
||||
@module.launch_task
|
||||
async def launch_study_tracker(client):
|
||||
# First pre-load the untracked channels
|
||||
await untracked_channels.launch_task(client)
|
||||
asyncio.create_task(_study_tracker())
|
||||
|
||||
|
||||
# TODO: Logout handler, sync
|
||||
Reference in New Issue
Block a user