Add basic HTTP API

src/pluralkit/bot/commands/misc_commands.py

@@ -6,6 +6,7 @@ from typing import List
 
 from discord.utils import oauth_url
 
+import pluralkit.utils
 from pluralkit.bot import utils
 from pluralkit.bot.commands import *
 
@@ -52,7 +53,7 @@ async def invite_link(ctx: CommandContext, args: List[str]):
 async def export(ctx: CommandContext, args: List[str]):
     members = await db.get_all_members(ctx.conn, ctx.system.id)
     accounts = await db.get_linked_accounts(ctx.conn, ctx.system.id)
-    switches = await utils.get_front_history(ctx.conn, ctx.system.id, 999999)
+    switches = await pluralkit.utils.get_front_history(ctx.conn, ctx.system.id, 999999)
 
     system = ctx.system
     data = {

src/pluralkit/bot/commands/switch_commands.py

@@ -5,6 +5,7 @@ from typing import List
 import dateparser
 import humanize
 
+import pluralkit.utils
 from pluralkit import Member
 from pluralkit.bot import utils
 from pluralkit.bot.commands import *
@@ -27,7 +28,7 @@ async def switch_member(ctx: MemberCommandContext, args: List[str]):
     # Compare requested switch IDs and existing fronter IDs to check for existing switches
     # Lists, because order matters, it makes sense to just swap fronters
     member_ids = [member.id for member in members]
-    fronter_ids = (await utils.get_fronter_ids(ctx.conn, ctx.system.id))[0]
+    fronter_ids = (await pluralkit.utils.get_fronter_ids(ctx.conn, ctx.system.id))[0]
     if member_ids == fronter_ids:
         if len(members) == 1:
             raise CommandError("{} is already fronting.".format(members[0].name))
@@ -51,7 +52,7 @@ async def switch_member(ctx: MemberCommandContext, args: List[str]):
 @command(cmd="switch out", description="Registers a switch with no one in front.", category="Switching commands")
 async def switch_out(ctx: MemberCommandContext, args: List[str]):
     # Get current fronters
-    fronters, _ = await utils.get_fronter_ids(ctx.conn, system_id=ctx.system.id)
+    fronters, _ = await pluralkit.utils.get_fronter_ids(ctx.conn, system_id=ctx.system.id)
     if not fronters:
         raise CommandError("There's already no one in front.")
 
@@ -79,7 +80,7 @@ async def switch_move(ctx: MemberCommandContext, args: List[str]):
     # Make sure it all runs in a big transaction for atomicity
     async with ctx.conn.transaction():
         # Get the last two switches to make sure the switch to move isn't before the second-last switch
-        last_two_switches = await utils.get_front_history(ctx.conn, ctx.system.id, count=2)
+        last_two_switches = await pluralkit.utils.get_front_history(ctx.conn, ctx.system.id, count=2)
         if len(last_two_switches) == 0:
             raise CommandError("There are no registered switches for this system.")
 

src/pluralkit/bot/commands/system_commands.py

@@ -4,6 +4,7 @@ from urllib.parse import urlparse
 
 import humanize
 
+import pluralkit.utils
 from pluralkit.bot import utils
 from pluralkit.bot.commands import *
 
@@ -153,7 +154,7 @@ async def system_fronter(ctx: CommandContext, args: List[str]):
         if system is None:
             raise CommandError("Can't find system \"{}\".".format(args[0]))
     
-    fronters, timestamp = await utils.get_fronters(ctx.conn, system_id=system.id)
+    fronters, timestamp = await pluralkit.utils.get_fronters(ctx.conn, system_id=system.id)
     fronter_names = [member.name for member in fronters]
 
     embed = utils.make_default_embed(None)
@@ -182,7 +183,7 @@ async def system_fronthistory(ctx: CommandContext, args: List[str]):
             raise CommandError("Can't find system \"{}\".".format(args[0]))
     
     lines = []
-    front_history = await utils.get_front_history(ctx.conn, system.id, count=10)
+    front_history = await pluralkit.utils.get_front_history(ctx.conn, system.id, count=10)
     for i, (timestamp, members) in enumerate(front_history):
         # Special case when no one's fronting
         if len(members) == 0:

src/pluralkit/bot/utils.py

@@ -1,16 +1,13 @@
-from datetime import datetime
 import logging
 import random
 import re
-from typing import List, Tuple
 import string
 
-import asyncio
-import asyncpg
 import discord
 import humanize
 
 from pluralkit import System, Member, db
+from pluralkit.utils import get_fronters
 
 logger = logging.getLogger("pluralkit.utils")
 
@@ -53,42 +50,6 @@ def parse_channel_mention(mention: str, server: discord.Server) -> discord.Chann
     except ValueError:
         return None
 
-async def get_fronter_ids(conn, system_id) -> (List[int], datetime):
-    switches = await db.front_history(conn, system_id=system_id, count=1)
-    if not switches:
-        return [], None
-    
-    if not switches[0]["members"]:
-        return [], switches[0]["timestamp"]
-    
-    return switches[0]["members"], switches[0]["timestamp"]
-
-async def get_fronters(conn, system_id) -> (List[Member], datetime):
-    member_ids, timestamp = await get_fronter_ids(conn, system_id)
-
-    # Collect in dict and then look up as list, to preserve return order
-    members = {member.id: member for member in await db.get_members(conn, member_ids)}
-    return [members[member_id] for member_id in member_ids], timestamp
-
-async def get_front_history(conn, system_id, count) -> List[Tuple[datetime, List[Member]]]:
-    # Get history from DB
-    switches = await db.front_history(conn, system_id=system_id, count=count)
-    if not switches:
-        return []
-    
-    # Get all unique IDs referenced
-    all_member_ids = {id for switch in switches for id in switch["members"]}
-    
-    # And look them up in the database into a dict
-    all_members = {member.id: member for member in await db.get_members(conn, list(all_member_ids))}
-
-    # Collect in array and return
-    out = []
-    for switch in switches:
-        timestamp = switch["timestamp"]
-        members = [all_members[id] for id in switch["members"]]
-        out.append((timestamp, members))
-    return out
 
 async def get_system_fuzzy(conn, client: discord.Client, key) -> System:
     if isinstance(key, discord.User):