From 3d9f7163fc50b3bacfc26e5bd09eebdd41214f46 Mon Sep 17 00:00:00 2001
From: ctrl-os <wonderfulchicken1@gmail.com>
Date: Thu, 15 Sep 2022 19:36:50 -0700
Subject: [PATCH 1/2] Update dependencies, working version modified secrets.py
 to use dotenv for easier cloud deployment Add slash commands

---
 .gitignore            |   4 +-
 bot.py                |   1 -
 cogs/admin.py         |  10 +-
 cogs/config.py        |  23 +-
 cogs/db_api.py        |   4 +-
 cogs/eval.py          |  11 +-
 cogs/help.py          |  12 +-
 cogs/poll_controls.py |  55 ++--
 essentials/secrets.py |  12 +
 models/phvr8a.afm     | 612 ++++++++++++++++++++++++++++++++++++++++++
 models/poll.py        |  21 +-
 pollmaster.icon.webp  | Bin 0 -> 3204 bytes
 pollmaster.jpg        | Bin 0 -> 4490 bytes
 pollmaster.py         |  45 +++-
 requirements.txt      |  30 +--
 utils/afm.py          | 442 ++++++++++++++++++++++++++++++
 16 files changed, 1181 insertions(+), 101 deletions(-)
 create mode 100644 essentials/secrets.py
 create mode 100644 models/phvr8a.afm
 create mode 100644 pollmaster.icon.webp
 create mode 100644 pollmaster.jpg
 create mode 100644 utils/afm.py

diff --git a/.gitignore b/.gitignore
index 02c3087..cdc7ff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ export/
 *.pyc
 
 #backup
-backup/
\ No newline at end of file
+backup/
+
+.env
\ No newline at end of file
diff --git a/bot.py b/bot.py
index d123924..47141b3 100644
--- a/bot.py
+++ b/bot.py
@@ -50,7 +50,6 @@ def __init__(self, **kwargs):
             self.load_extension(ext)
 
         self.message_cache = MessageCache(self)
-        self.member_cache = MemberCache()
         self.refresh_blocked = {}
         self.refresh_queue = {}
 
diff --git a/cogs/admin.py b/cogs/admin.py
index ab62502..81b3185 100644
--- a/cogs/admin.py
+++ b/cogs/admin.py
@@ -22,7 +22,7 @@ async def cog_command_error(self, ctx, error):
         else:
             logger.warning(error)
 
-    @commands.command(aliases=['r'])
+    @commands.hybrid_command(aliases=['r'], description="Reloads cogs")
     async def reload(self, ctx, *, cog):
         if cog == 'c':
             cog = 'poll_controls'
@@ -31,7 +31,7 @@ async def reload(self, ctx, *, cog):
 
         reply = ''
         try:
-            self.bot.reload_extension('cogs.'+cog)
+            await self.bot.reload_extension('cogs.'+cog)
             reply = f'Extension "cogs.{cog}" successfully reloaded.'
         except commands.ExtensionNotFound:
             reply = f'Extension "cogs.{cog}" not found.'
@@ -42,7 +42,7 @@ async def reload(self, ctx, *, cog):
         except commands.ExtensionNotLoaded:
             reply = f'Extension "cogs.{cog}" is not loaded... trying to load it. '
             try:
-                self.bot.load_extension('cogs.'+cog)
+                await self.bot.load_extension('cogs.'+cog)
             except commands.ExtensionAlreadyLoaded:
                 reply += f'Could not load or reload extension since it is already loaded...'
             except commands.ExtensionNotFound:
@@ -54,7 +54,7 @@ async def reload(self, ctx, *, cog):
             await ctx.send(reply)
 
 
-def setup(bot):
+async def setup(bot):
     global logger
     logger = logging.getLogger('discord')
-    bot.add_cog(Admin(bot))
\ No newline at end of file
+    await bot.add_cog(Admin(bot))
\ No newline at end of file
diff --git a/cogs/config.py b/cogs/config.py
index 0bc13b4..c400814 100644
--- a/cogs/config.py
+++ b/cogs/config.py
@@ -1,14 +1,15 @@
 import logging
 from discord.ext import commands
+from discord import app_commands
+from discord import Role
 
 class Config(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
 
-    @commands.command()
+    @commands.hybrid_command(name="prefix", description="""Set a custom prefix for the server.""")
     @commands.has_permissions(manage_guild=True)
-    async def prefix(self, ctx, *, pre):
-        """Set a custom prefix for the server."""
+    async def prefix(self, ctx, *, pre:str):
         server = ctx.message.guild
         if pre.endswith('\w'):
             pre = pre[:-2]+' '
@@ -25,10 +26,9 @@ async def prefix(self, ctx, *, pre):
         self.bot.pre[str(server.id)] = str(pre)
         await ctx.send(msg)
 
-    @commands.command()
+    @commands.hybrid_command(name="adminrole", description="Set or show the Admin Role. Members with this role can create polls and manage ALL polls.")
     @commands.has_permissions(manage_guild=True)
-    async def adminrole(self, ctx, *, role=None):
-        """Set or show the Admin Role. Members with this role can create polls and manage ALL polls. Parameter: <role> (optional)"""
+    async def adminrole(self, ctx, *, role: Role = None):
         server = ctx.message.guild
 
         if not role:
@@ -47,11 +47,10 @@ async def adminrole(self, ctx, *, role=None):
         else:
             await ctx.send(f'Server role `{role}` not found.')
 
-    @commands.command()
+    @commands.hybrid_command(name="userrole", description="Set or show the User Role. Members with this role can create polls and manage their own polls.")
     @commands.has_permissions(manage_guild=True)
-    async def userrole(self, ctx, *, role=None):
-        """Set or show the User Role. Members with this role can create polls and manage their own polls. 
-        Parameter: <role> (optional)"""
+    async def userrole(self, ctx, *, role: Role=None):
+        
         server = ctx.message.guild
 
         if not role:
@@ -71,7 +70,7 @@ async def userrole(self, ctx, *, role=None):
             await ctx.send(f'Server role `{role}` not found.')
 
 
-def setup(bot):
+async def setup(bot):
     global logger
     logger = logging.getLogger('discord')
-    bot.add_cog(Config(bot))
\ No newline at end of file
+    await bot.add_cog(Config(bot))
\ No newline at end of file
diff --git a/cogs/db_api.py b/cogs/db_api.py
index 5b28758..6adec36 100644
--- a/cogs/db_api.py
+++ b/cogs/db_api.py
@@ -34,7 +34,7 @@ async def update_stats(self):
             logger.exception('Failed to post server count\n{}: {}'.format(type(e).__name__, e))
 
 
-def setup(bot):
+async def setup(bot):
     global logger
     logger = logging.getLogger('discord')
-    bot.add_cog(DiscordBotsOrgAPI(bot))
+    await bot.add_cog(DiscordBotsOrgAPI(bot))
diff --git a/cogs/eval.py b/cogs/eval.py
index a5d0ecc..3bc2210 100644
--- a/cogs/eval.py
+++ b/cogs/eval.py
@@ -6,13 +6,14 @@
 from contextlib import redirect_stdout
 
 from discord.ext import commands
+from discord import app_commands
 
 
 class Eval(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
 
-    @commands.command()
+    @commands.hybrid_command(name="eval", description="""Evaluates a code""")
     @commands.is_owner()
     async def evall(self, ctx, *, body: str):
         self.bot.eval_wait = True
@@ -29,10 +30,10 @@ async def evall(self, ctx, *, body: str):
         finally:
             self.bot.eval_wait = False
 
-    @commands.command(hidden=True, name='eval')
+    @commands.hybrid_command(hidden=True, name='eval', description="""Evaluates a code""")
     @commands.is_owner()
     async def _eval(self, ctx, *, body: str):
-        """Evaluates a code"""
+        
 
         env = {
             'bot': self.bot,
@@ -78,5 +79,5 @@ async def _eval(self, ctx, *, body: str):
                 await ctx.send(f'```py\n{value}{ret}\n```')
 
 
-def setup(bot):
-    bot.add_cog(Eval(bot))
\ No newline at end of file
+async def setup(bot):
+    await bot.add_cog(Eval(bot))
\ No newline at end of file
diff --git a/cogs/help.py b/cogs/help.py
index c368dd8..a8e117d 100644
--- a/cogs/help.py
+++ b/cogs/help.py
@@ -3,6 +3,7 @@
 
 import discord
 from discord.ext import commands
+from discord import app_commands
 
 from essentials.multi_server import get_server_pre, ask_for_server
 from essentials.settings import SETTINGS
@@ -43,7 +44,6 @@ def check(rct, usr):
             return reaction
 
     def get_help_embed(self, page, pre):
-
         title = f' Pollmaster Help - React with an emoji to learn more about a topic!'
         embed = discord.Embed(title='', description='', colour=SETTINGS.color)
         embed.set_author(name=title, icon_url=SETTINGS.author_icon)
@@ -235,8 +235,10 @@ def get_help_embed(self, page, pre):
 
         return embed
 
-    @commands.command()
-    async def help(self, ctx):
+    # @commands.hybrid_command(name="pmhelp",description="Display commands")
+    
+    @commands.hybrid_command(name="help", description="Display commands")
+    async def pmhelp(self, ctx):
         server = await ask_for_server(self.bot, ctx.message)
         if not server:
             return
@@ -365,7 +367,7 @@ async def on_message(self, message):
                 await channel.send(status_msg)
 
 
-def setup(bot):
+async def setup(bot):
     global logger
     logger = logging.getLogger('discord')
-    bot.add_cog(Help(bot))
+    await bot.add_cog(Help(bot))
diff --git a/cogs/poll_controls.py b/cogs/poll_controls.py
index a0b18e1..f220365 100644
--- a/cogs/poll_controls.py
+++ b/cogs/poll_controls.py
@@ -10,7 +10,7 @@
 import pytz
 from bson import ObjectId
 from discord.ext import tasks, commands
-
+from discord import app_commands
 from essentials.exceptions import StopWizard
 from essentials.multi_server import get_server_pre, ask_for_server, ask_for_channel
 from essentials.settings import SETTINGS
@@ -191,7 +191,7 @@ async def say_embed(self, ctx, say_text='', title='Pollmaster', footer_text=None
     #     p = await Poll.load_from_db(self.bot, str(server.id), 'test', ctx=ctx)
     #     print(await Vote.load_number_of_voters_for_poll(self.bot, p.id))
 
-    @commands.command()
+    @commands.hybrid_command(name="activate")
     async def activate(self, ctx, *, short=None):
         """Activate a prepared poll. Parameter: <label>"""
         server = await ask_for_server(self.bot, ctx.message, short)
@@ -228,7 +228,7 @@ async def activate(self, ctx, *, short=None):
                 await self.say_error(ctx, error)
                 await ctx.invoke(self.show, 'prepared')
 
-    @commands.command()
+    @commands.hybrid_command(name="delete")
     async def delete(self, ctx, *, short=None):
         """Delete a poll. Parameter: <label>"""
         server = await ask_for_server(self.bot, ctx.message, short)
@@ -267,7 +267,7 @@ async def delete(self, ctx, *, short=None):
                 footer = f'Type {pre}show to display all polls'
                 await self.say_error(ctx, error, footer)
 
-    @commands.command()
+    @commands.hybrid_command(name="close")
     async def close(self, ctx, *, short=None):
         """Close a poll. Parameter: <label>"""
         server = await ask_for_server(self.bot, ctx.message, short)
@@ -301,7 +301,7 @@ async def close(self, ctx, *, short=None):
                 await self.say_error(ctx, error)
                 await ctx.invoke(self.show)
 
-    @commands.command()
+    @commands.hybrid_command(name="copy")
     async def copy(self, ctx, *, short=None):
         """Copy a poll. Parameter: <label>"""
         server = await ask_for_server(self.bot, ctx.message, short)
@@ -326,7 +326,7 @@ async def copy(self, ctx, *, short=None):
                 await self.say_error(ctx, error)
                 await ctx.invoke(self.show)
 
-    @commands.command()
+    @commands.hybrid_command(name="export")
     async def export(self, ctx, *, short=None):
         """Export a poll. Parameter: <label>"""
         server = await ask_for_server(self.bot, ctx.message, short)
@@ -368,7 +368,7 @@ async def export(self, ctx, *, short=None):
                 await self.say_error(ctx, error)
                 await ctx.invoke(self.show)
 
-    @commands.command()
+    @commands.hybrid_command(name="show")
     async def show(self, ctx, short='open', start=0):
         """Show a list of open polls or show a specific poll.
         Parameters: "open" (default), "closed", "prepared" or <label>"""
@@ -417,7 +417,7 @@ def item_fct(i, item):
                 footer = f'Type {pre}show to display all polls'
                 await self.say_error(ctx, error, footer)
 
-    @commands.command()
+    @commands.hybrid_command(name="draw")
     async def draw(self, ctx, short=None, opt=None):
         server = await ask_for_server(self.bot, ctx.message, short)
         if not server:
@@ -465,7 +465,7 @@ async def draw(self, ctx, short=None, opt=None):
             # print(voter_list)
             winner_id = random.choice(voter_list)
             # winner = server.get_member(int(winner_id))
-            winner = await self.bot.member_cache.get(server, int(winner_id))
+            winner = self.bot.get_user(int(winner_id))
             if not winner:
                 error = f'Invalid winner drawn (id: {winner_id}).'
                 await self.say_error(ctx, error)
@@ -478,7 +478,7 @@ async def draw(self, ctx, short=None, opt=None):
             await self.say_error(ctx, error)
             await ctx.invoke(self.show)
 
-    @commands.command()
+    @commands.hybrid_command(name="cmd")
     async def cmd(self, ctx, *, cmd=None):
         """The old, command style way paired with the wizard."""
         # await self.say_embed(ctx, say_text='This command is temporarily disabled.')
@@ -570,7 +570,7 @@ async def route(poll):
             logger.error("ERROR IN pm!cmd")
             logger.exception(error)
 
-    @commands.command()
+    @commands.hybrid_command(name="quick")
     async def quick(self, ctx, *, cmd=None):
         """Create a quick poll with just a question and some options. Parameters: <Question> (optional)"""
         server = await ask_for_server(self.bot, ctx.message)
@@ -592,7 +592,7 @@ async def route(poll):
         if poll:
             await poll.post_embed(poll.channel)
 
-    @commands.command()
+    @commands.hybrid_command(name="prepare")
     async def prepare(self, ctx, *, cmd=None):
         """Prepare a poll to use later. Parameters: <Question> (optional)"""
         server = await ask_for_server(self.bot, ctx.message)
@@ -616,7 +616,7 @@ async def route(poll):
         if poll:
             await poll.post_embed(ctx.message.author)
 
-    @commands.command()
+    @commands.hybrid_command(name="advanced")
     async def advanced(self, ctx, *, cmd=None):
         """Poll with more options. Parameters: <Question> (optional)"""
         server = await ask_for_server(self.bot, ctx.message)
@@ -639,7 +639,7 @@ async def route(poll):
         if poll:
             await poll.post_embed(poll.channel)
 
-    @commands.command()
+    @commands.hybrid_command(name="new")
     async def new(self, ctx, *, cmd=None):
         """Start the poll wizard to create a new poll step by step. Parameters: <Question> (optional)"""
         server = await ask_for_server(self.bot, ctx.message)
@@ -723,10 +723,10 @@ async def on_raw_reaction_remove(self, data):
         if isinstance(channel, discord.TextChannel):
             server = channel.guild
             # user = server.get_member(user_id)
-            user = await self.bot.member_cache.get(server, user_id)
+            user = self.bot.get_user(user_id)
             message = self.bot.message_cache.get(message_id)
             if message is None:
-                message = await channel.fetch_message(id=message_id)
+                message = await channel.fetch_message(message_id)
                 self.bot.message_cache.put(message_id, message)
             label = self.get_label(message)
             if not label:
@@ -735,7 +735,7 @@ async def on_raw_reaction_remove(self, data):
             user = await self.bot.fetch_user(user_id)  # only do this once
             message = self.bot.message_cache.get(message_id)
             if message is None:
-                message = await channel.fetch_message(id=message_id)
+                message = await channel.fetch_message(message_id)
                 self.bot.message_cache.put(message_id, message)
             label = self.get_label(message)
             if not label:
@@ -750,7 +750,7 @@ async def on_raw_reaction_remove(self, data):
             channel = self.bot.get_channel(channel_id)
             message = self.bot.message_cache.get(message_id)
             if message is None:
-                message = await channel.fetch_message(id=message_id)
+                message = await channel.fetch_message(message_id)
                 self.bot.message_cache.put(message_id, message)
             label = self.get_label(message)
             if not label:
@@ -789,7 +789,7 @@ async def on_raw_reaction_add(self, data):
             message = self.bot.message_cache.get(message_id)
             if message is None:
                 try:
-                    message = await channel.fetch_message(id=message_id)
+                    message = await channel.fetch_message(message_id)
                 except discord.errors.Forbidden:
                     # Ignore Missing Access error
                     return
@@ -801,7 +801,7 @@ async def on_raw_reaction_add(self, data):
             user = await self.bot.fetch_user(user_id)  # only do this once
             message = self.bot.message_cache.get(message_id)
             if message is None:
-                message = await channel.fetch_message(id=message_id)
+                message = await channel.fetch_message(message_id)
                 self.bot.message_cache.put(message_id, message)
             label = self.get_label(message)
             if not label:
@@ -815,7 +815,7 @@ async def on_raw_reaction_add(self, data):
             channel = self.bot.get_channel(channel_id)
             message = self.bot.message_cache.get(message_id)
             if message is None:
-                message = await channel.fetch_message(id=message_id)
+                message = await channel.fetch_message(message_id)
                 self.bot.message_cache.put(message_id, message)
             label = self.get_label(message)
             if not label:
@@ -854,9 +854,12 @@ async def on_raw_reaction_add(self, data):
             embed.set_author(name=f" >> {p.short}", icon_url=SETTINGS.author_icon)
 
             # created by
-            created_by = await self.bot.member_cache.get(server, int(p.author.id))
+            if (p.author != None):
+                created_by = self.bot.get_user(int(p.author.id))
+            else:
+                created_by = "<Deleted User>"
             # created_by = server.get_member(int(p.author.id))
-            embed.add_field(name=f'Created by:', value=f'{created_by if created_by else "<Deleted User>"}',
+            embed.add_field(name=f'Created by:', value=f'{created_by}',
                             inline=False)
 
             # vote rights
@@ -925,7 +928,7 @@ async def on_raw_reaction_add(self, data):
                     c = 0
                     for vote in p.full_votes:
                         # member = server.get_member(int(vote.user_id))
-                        member: discord.Member = await self.bot.member_cache.get(server, int(vote.user_id))
+                        member: discord.Member = self.bot.get_user(int(vote.user_id))
                         if not member or vote.choice != i:
                             continue
                         c += 1
@@ -1001,7 +1004,7 @@ async def on_raw_reaction_add(self, data):
             await p.vote(member, emoji.name, message)
 
 
-def setup(bot):
+async def setup(bot):
     global logger
     logger = logging.getLogger('discord')
-    bot.add_cog(PollControls(bot))
+    await bot.add_cog(PollControls(bot))
diff --git a/essentials/secrets.py b/essentials/secrets.py
new file mode 100644
index 0000000..3b789a9
--- /dev/null
+++ b/essentials/secrets.py
@@ -0,0 +1,12 @@
+import os
+from dotenv import load_dotenv
+load_dotenv(".env")
+
+class Secrets:
+    def __init__(self):
+        self.dbl_token = ''  # DBL token (only needed for public bot)
+        self.mongo_db =  os.getenv('MONGO_URL')
+        self.bot_token = os.getenv('pollmaster_token') # official discord bot token
+        self.mode = 'development' # or production
+
+SECRETS = Secrets()
\ No newline at end of file
diff --git a/models/phvr8a.afm b/models/phvr8a.afm
new file mode 100644
index 0000000..4b04c24
--- /dev/null
+++ b/models/phvr8a.afm
@@ -0,0 +1,612 @@
+StartFontMetrics 2.0
+Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All rights reserved.
+Comment Creation Date: Thu Mar 15 08:58:00 1990
+Comment UniqueID 28352
+Comment VMusage 26389 33281
+FontName Helvetica
+FullName Helvetica
+FamilyName Helvetica
+Weight Medium
+ItalicAngle 0
+IsFixedPitch false
+FontBBox -166 -225 1000 931
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.006
+Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All rights reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries.
+EncodingScheme AdobeStandardEncoding
+CapHeight 718
+XHeight 523
+Ascender 718
+Descender -207
+StartCharMetrics 228
+C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 278 ; N exclam ; B 90 0 187 718 ;
+C 34 ; WX 355 ; N quotedbl ; B 70 463 285 718 ;
+C 35 ; WX 556 ; N numbersign ; B 28 0 529 688 ;
+C 36 ; WX 556 ; N dollar ; B 32 -115 520 775 ;
+C 37 ; WX 889 ; N percent ; B 39 -19 850 703 ;
+C 38 ; WX 667 ; N ampersand ; B 44 -15 645 718 ;
+C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
+C 40 ; WX 333 ; N parenleft ; B 68 -207 299 733 ;
+C 41 ; WX 333 ; N parenright ; B 34 -207 265 733 ;
+C 42 ; WX 389 ; N asterisk ; B 39 431 349 718 ;
+C 43 ; WX 584 ; N plus ; B 39 0 545 505 ;
+C 44 ; WX 278 ; N comma ; B 87 -147 191 106 ;
+C 45 ; WX 333 ; N hyphen ; B 44 232 289 322 ;
+C 46 ; WX 278 ; N period ; B 87 0 191 106 ;
+C 47 ; WX 278 ; N slash ; B -17 -19 295 737 ;
+C 48 ; WX 556 ; N zero ; B 37 -19 519 703 ;
+C 49 ; WX 556 ; N one ; B 101 0 359 703 ;
+C 50 ; WX 556 ; N two ; B 26 0 507 703 ;
+C 51 ; WX 556 ; N three ; B 34 -19 522 703 ;
+C 52 ; WX 556 ; N four ; B 25 0 523 703 ;
+C 53 ; WX 556 ; N five ; B 32 -19 514 688 ;
+C 54 ; WX 556 ; N six ; B 38 -19 518 703 ;
+C 55 ; WX 556 ; N seven ; B 37 0 523 688 ;
+C 56 ; WX 556 ; N eight ; B 38 -19 517 703 ;
+C 57 ; WX 556 ; N nine ; B 42 -19 514 703 ;
+C 58 ; WX 278 ; N colon ; B 87 0 191 516 ;
+C 59 ; WX 278 ; N semicolon ; B 87 -147 191 516 ;
+C 60 ; WX 584 ; N less ; B 48 11 536 495 ;
+C 61 ; WX 584 ; N equal ; B 39 115 545 390 ;
+C 62 ; WX 584 ; N greater ; B 48 11 536 495 ;
+C 63 ; WX 556 ; N question ; B 56 0 492 727 ;
+C 64 ; WX 1015 ; N at ; B 147 -19 868 737 ;
+C 65 ; WX 667 ; N A ; B 14 0 654 718 ;
+C 66 ; WX 667 ; N B ; B 74 0 627 718 ;
+C 67 ; WX 722 ; N C ; B 44 -19 681 737 ;
+C 68 ; WX 722 ; N D ; B 81 0 674 718 ;
+C 69 ; WX 667 ; N E ; B 86 0 616 718 ;
+C 70 ; WX 611 ; N F ; B 86 0 583 718 ;
+C 71 ; WX 778 ; N G ; B 48 -19 704 737 ;
+C 72 ; WX 722 ; N H ; B 77 0 646 718 ;
+C 73 ; WX 278 ; N I ; B 91 0 188 718 ;
+C 74 ; WX 500 ; N J ; B 17 -19 428 718 ;
+C 75 ; WX 667 ; N K ; B 76 0 663 718 ;
+C 76 ; WX 556 ; N L ; B 76 0 537 718 ;
+C 77 ; WX 833 ; N M ; B 73 0 761 718 ;
+C 78 ; WX 722 ; N N ; B 76 0 646 718 ;
+C 79 ; WX 778 ; N O ; B 39 -19 739 737 ;
+C 80 ; WX 667 ; N P ; B 86 0 622 718 ;
+C 81 ; WX 778 ; N Q ; B 39 -56 739 737 ;
+C 82 ; WX 722 ; N R ; B 88 0 684 718 ;
+C 83 ; WX 667 ; N S ; B 49 -19 620 737 ;
+C 84 ; WX 611 ; N T ; B 14 0 597 718 ;
+C 85 ; WX 722 ; N U ; B 79 -19 644 718 ;
+C 86 ; WX 667 ; N V ; B 20 0 647 718 ;
+C 87 ; WX 944 ; N W ; B 16 0 928 718 ;
+C 88 ; WX 667 ; N X ; B 19 0 648 718 ;
+C 89 ; WX 667 ; N Y ; B 14 0 653 718 ;
+C 90 ; WX 611 ; N Z ; B 23 0 588 718 ;
+C 91 ; WX 278 ; N bracketleft ; B 63 -196 250 722 ;
+C 92 ; WX 278 ; N backslash ; B -17 -19 295 737 ;
+C 93 ; WX 278 ; N bracketright ; B 28 -196 215 722 ;
+C 94 ; WX 469 ; N asciicircum ; B -14 264 483 688 ;
+C 95 ; WX 556 ; N underscore ; B 0 -125 556 -75 ;
+C 96 ; WX 222 ; N quoteleft ; B 65 470 169 725 ;
+C 97 ; WX 556 ; N a ; B 36 -15 530 538 ;
+C 98 ; WX 556 ; N b ; B 58 -15 517 718 ;
+C 99 ; WX 500 ; N c ; B 30 -15 477 538 ;
+C 100 ; WX 556 ; N d ; B 35 -15 499 718 ;
+C 101 ; WX 556 ; N e ; B 40 -15 516 538 ;
+C 102 ; WX 278 ; N f ; B 14 0 262 728 ; L i fi ; L l fl ;
+C 103 ; WX 556 ; N g ; B 40 -220 499 538 ;
+C 104 ; WX 556 ; N h ; B 65 0 491 718 ;
+C 105 ; WX 222 ; N i ; B 67 0 155 718 ;
+C 106 ; WX 222 ; N j ; B -16 -210 155 718 ;
+C 107 ; WX 500 ; N k ; B 67 0 501 718 ;
+C 108 ; WX 222 ; N l ; B 67 0 155 718 ;
+C 109 ; WX 833 ; N m ; B 65 0 769 538 ;
+C 110 ; WX 556 ; N n ; B 65 0 491 538 ;
+C 111 ; WX 556 ; N o ; B 35 -14 521 538 ;
+C 112 ; WX 556 ; N p ; B 58 -207 517 538 ;
+C 113 ; WX 556 ; N q ; B 35 -207 494 538 ;
+C 114 ; WX 333 ; N r ; B 77 0 332 538 ;
+C 115 ; WX 500 ; N s ; B 32 -15 464 538 ;
+C 116 ; WX 278 ; N t ; B 14 -7 257 669 ;
+C 117 ; WX 556 ; N u ; B 68 -15 489 523 ;
+C 118 ; WX 500 ; N v ; B 8 0 492 523 ;
+C 119 ; WX 722 ; N w ; B 14 0 709 523 ;
+C 120 ; WX 500 ; N x ; B 11 0 490 523 ;
+C 121 ; WX 500 ; N y ; B 11 -214 489 523 ;
+C 122 ; WX 500 ; N z ; B 31 0 469 523 ;
+C 123 ; WX 334 ; N braceleft ; B 42 -196 292 722 ;
+C 124 ; WX 260 ; N bar ; B 94 -19 167 737 ;
+C 125 ; WX 334 ; N braceright ; B 42 -196 292 722 ;
+C 126 ; WX 584 ; N asciitilde ; B 61 180 523 326 ;
+C 161 ; WX 333 ; N exclamdown ; B 118 -195 215 523 ;
+C 162 ; WX 556 ; N cent ; B 51 -115 513 623 ;
+C 163 ; WX 556 ; N sterling ; B 33 -16 539 718 ;
+C 164 ; WX 167 ; N fraction ; B -166 -19 333 703 ;
+C 165 ; WX 556 ; N yen ; B 3 0 553 688 ;
+C 166 ; WX 556 ; N florin ; B -11 -207 501 737 ;
+C 167 ; WX 556 ; N section ; B 43 -191 512 737 ;
+C 168 ; WX 556 ; N currency ; B 28 99 528 603 ;
+C 169 ; WX 191 ; N quotesingle ; B 59 463 132 718 ;
+C 170 ; WX 333 ; N quotedblleft ; B 38 470 307 725 ;
+C 171 ; WX 556 ; N guillemotleft ; B 97 108 459 446 ;
+C 172 ; WX 333 ; N guilsinglleft ; B 88 108 245 446 ;
+C 173 ; WX 333 ; N guilsinglright ; B 88 108 245 446 ;
+C 174 ; WX 500 ; N fi ; B 14 0 434 728 ;
+C 175 ; WX 500 ; N fl ; B 14 0 432 728 ;
+C 177 ; WX 556 ; N endash ; B 0 240 556 313 ;
+C 178 ; WX 556 ; N dagger ; B 43 -159 514 718 ;
+C 179 ; WX 556 ; N daggerdbl ; B 43 -159 514 718 ;
+C 180 ; WX 278 ; N periodcentered ; B 77 190 202 315 ;
+C 182 ; WX 537 ; N paragraph ; B 18 -173 497 718 ;
+C 183 ; WX 350 ; N bullet ; B 18 202 333 517 ;
+C 184 ; WX 222 ; N quotesinglbase ; B 53 -149 157 106 ;
+C 185 ; WX 333 ; N quotedblbase ; B 26 -149 295 106 ;
+C 186 ; WX 333 ; N quotedblright ; B 26 463 295 718 ;
+C 187 ; WX 556 ; N guillemotright ; B 97 108 459 446 ;
+C 188 ; WX 1000 ; N ellipsis ; B 115 0 885 106 ;
+C 189 ; WX 1000 ; N perthousand ; B 7 -19 994 703 ;
+C 191 ; WX 611 ; N questiondown ; B 91 -201 527 525 ;
+C 193 ; WX 333 ; N grave ; B 14 593 211 734 ;
+C 194 ; WX 333 ; N acute ; B 122 593 319 734 ;
+C 195 ; WX 333 ; N circumflex ; B 21 593 312 734 ;
+C 196 ; WX 333 ; N tilde ; B -4 606 337 722 ;
+C 197 ; WX 333 ; N macron ; B 10 627 323 684 ;
+C 198 ; WX 333 ; N breve ; B 13 595 321 731 ;
+C 199 ; WX 333 ; N dotaccent ; B 121 604 212 706 ;
+C 200 ; WX 333 ; N dieresis ; B 40 604 293 706 ;
+C 202 ; WX 333 ; N ring ; B 75 572 259 756 ;
+C 203 ; WX 333 ; N cedilla ; B 45 -225 259 0 ;
+C 205 ; WX 333 ; N hungarumlaut ; B 31 593 409 734 ;
+C 206 ; WX 333 ; N ogonek ; B 73 -225 287 0 ;
+C 207 ; WX 333 ; N caron ; B 21 593 312 734 ;
+C 208 ; WX 1000 ; N emdash ; B 0 240 1000 313 ;
+C 225 ; WX 1000 ; N AE ; B 8 0 951 718 ;
+C 227 ; WX 370 ; N ordfeminine ; B 24 304 346 737 ;
+C 232 ; WX 556 ; N Lslash ; B -20 0 537 718 ;
+C 233 ; WX 778 ; N Oslash ; B 39 -19 740 737 ;
+C 234 ; WX 1000 ; N OE ; B 36 -19 965 737 ;
+C 235 ; WX 365 ; N ordmasculine ; B 25 304 341 737 ;
+C 241 ; WX 889 ; N ae ; B 36 -15 847 538 ;
+C 245 ; WX 278 ; N dotlessi ; B 95 0 183 523 ;
+C 248 ; WX 222 ; N lslash ; B -20 0 242 718 ;
+C 249 ; WX 611 ; N oslash ; B 28 -22 537 545 ;
+C 250 ; WX 944 ; N oe ; B 35 -15 902 538 ;
+C 251 ; WX 611 ; N germandbls ; B 67 -15 571 728 ;
+C -1 ; WX 611 ; N Zcaron ; B 23 0 588 929 ;
+C -1 ; WX 500 ; N ccedilla ; B 30 -225 477 538 ;
+C -1 ; WX 500 ; N ydieresis ; B 11 -214 489 706 ;
+C -1 ; WX 556 ; N atilde ; B 36 -15 530 722 ;
+C -1 ; WX 278 ; N icircumflex ; B -6 0 285 734 ;
+C -1 ; WX 333 ; N threesuperior ; B 5 270 325 703 ;
+C -1 ; WX 556 ; N ecircumflex ; B 40 -15 516 734 ;
+C -1 ; WX 556 ; N thorn ; B 58 -207 517 718 ;
+C -1 ; WX 556 ; N egrave ; B 40 -15 516 734 ;
+C -1 ; WX 333 ; N twosuperior ; B 4 281 323 703 ;
+C -1 ; WX 556 ; N eacute ; B 40 -15 516 734 ;
+C -1 ; WX 556 ; N otilde ; B 35 -14 521 722 ;
+C -1 ; WX 667 ; N Aacute ; B 14 0 654 929 ;
+C -1 ; WX 556 ; N ocircumflex ; B 35 -14 521 734 ;
+C -1 ; WX 500 ; N yacute ; B 11 -214 489 734 ;
+C -1 ; WX 556 ; N udieresis ; B 68 -15 489 706 ;
+C -1 ; WX 834 ; N threequarters ; B 45 -19 810 703 ;
+C -1 ; WX 556 ; N acircumflex ; B 36 -15 530 734 ;
+C -1 ; WX 722 ; N Eth ; B 0 0 674 718 ;
+C -1 ; WX 556 ; N edieresis ; B 40 -15 516 706 ;
+C -1 ; WX 556 ; N ugrave ; B 68 -15 489 734 ;
+C -1 ; WX 1000 ; N trademark ; B 46 306 903 718 ;
+C -1 ; WX 556 ; N ograve ; B 35 -14 521 734 ;
+C -1 ; WX 500 ; N scaron ; B 32 -15 464 734 ;
+C -1 ; WX 278 ; N Idieresis ; B 13 0 266 901 ;
+C -1 ; WX 556 ; N uacute ; B 68 -15 489 734 ;
+C -1 ; WX 556 ; N agrave ; B 36 -15 530 734 ;
+C -1 ; WX 556 ; N ntilde ; B 65 0 491 722 ;
+C -1 ; WX 556 ; N aring ; B 36 -15 530 756 ;
+C -1 ; WX 500 ; N zcaron ; B 31 0 469 734 ;
+C -1 ; WX 278 ; N Icircumflex ; B -6 0 285 929 ;
+C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ;
+C -1 ; WX 556 ; N ucircumflex ; B 68 -15 489 734 ;
+C -1 ; WX 667 ; N Ecircumflex ; B 86 0 616 929 ;
+C -1 ; WX 278 ; N Iacute ; B 91 0 292 929 ;
+C -1 ; WX 722 ; N Ccedilla ; B 44 -225 681 737 ;
+C -1 ; WX 778 ; N Odieresis ; B 39 -19 739 901 ;
+C -1 ; WX 667 ; N Scaron ; B 49 -19 620 929 ;
+C -1 ; WX 667 ; N Edieresis ; B 86 0 616 901 ;
+C -1 ; WX 278 ; N Igrave ; B -13 0 188 929 ;
+C -1 ; WX 556 ; N adieresis ; B 36 -15 530 706 ;
+C -1 ; WX 778 ; N Ograve ; B 39 -19 739 929 ;
+C -1 ; WX 667 ; N Egrave ; B 86 0 616 929 ;
+C -1 ; WX 667 ; N Ydieresis ; B 14 0 653 901 ;
+C -1 ; WX 737 ; N registered ; B -14 -19 752 737 ;
+C -1 ; WX 778 ; N Otilde ; B 39 -19 739 917 ;
+C -1 ; WX 834 ; N onequarter ; B 73 -19 756 703 ;
+C -1 ; WX 722 ; N Ugrave ; B 79 -19 644 929 ;
+C -1 ; WX 722 ; N Ucircumflex ; B 79 -19 644 929 ;
+C -1 ; WX 667 ; N Thorn ; B 86 0 622 718 ;
+C -1 ; WX 584 ; N divide ; B 39 -19 545 524 ;
+C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ;
+C -1 ; WX 722 ; N Uacute ; B 79 -19 644 929 ;
+C -1 ; WX 778 ; N Ocircumflex ; B 39 -19 739 929 ;
+C -1 ; WX 584 ; N logicalnot ; B 39 108 545 390 ;
+C -1 ; WX 667 ; N Aring ; B 14 0 654 931 ;
+C -1 ; WX 278 ; N idieresis ; B 13 0 266 706 ;
+C -1 ; WX 278 ; N iacute ; B 95 0 292 734 ;
+C -1 ; WX 556 ; N aacute ; B 36 -15 530 734 ;
+C -1 ; WX 584 ; N plusminus ; B 39 0 545 506 ;
+C -1 ; WX 584 ; N multiply ; B 39 0 545 506 ;
+C -1 ; WX 722 ; N Udieresis ; B 79 -19 644 901 ;
+C -1 ; WX 584 ; N minus ; B 39 216 545 289 ;
+C -1 ; WX 333 ; N onesuperior ; B 43 281 222 703 ;
+C -1 ; WX 667 ; N Eacute ; B 86 0 616 929 ;
+C -1 ; WX 667 ; N Acircumflex ; B 14 0 654 929 ;
+C -1 ; WX 737 ; N copyright ; B -14 -19 752 737 ;
+C -1 ; WX 667 ; N Agrave ; B 14 0 654 929 ;
+C -1 ; WX 556 ; N odieresis ; B 35 -14 521 706 ;
+C -1 ; WX 556 ; N oacute ; B 35 -14 521 734 ;
+C -1 ; WX 400 ; N degree ; B 54 411 346 703 ;
+C -1 ; WX 278 ; N igrave ; B -13 0 184 734 ;
+C -1 ; WX 556 ; N mu ; B 68 -207 489 523 ;
+C -1 ; WX 778 ; N Oacute ; B 39 -19 739 929 ;
+C -1 ; WX 556 ; N eth ; B 35 -15 522 737 ;
+C -1 ; WX 667 ; N Adieresis ; B 14 0 654 901 ;
+C -1 ; WX 667 ; N Yacute ; B 14 0 653 929 ;
+C -1 ; WX 260 ; N brokenbar ; B 94 -19 167 737 ;
+C -1 ; WX 834 ; N onehalf ; B 43 -19 773 703 ;
+EndCharMetrics
+StartKernData
+StartKernPairs 250
+
+KPX A y -40
+KPX A w -40
+KPX A v -40
+KPX A u -30
+KPX A Y -100
+KPX A W -50
+KPX A V -70
+KPX A U -50
+KPX A T -120
+KPX A Q -30
+KPX A O -30
+KPX A G -30
+KPX A C -30
+
+KPX B period -20
+KPX B comma -20
+KPX B U -10
+
+KPX C period -30
+KPX C comma -30
+
+KPX D period -70
+KPX D comma -70
+KPX D Y -90
+KPX D W -40
+KPX D V -70
+KPX D A -40
+
+KPX F r -45
+KPX F period -150
+KPX F o -30
+KPX F e -30
+KPX F comma -150
+KPX F a -50
+KPX F A -80
+
+KPX J u -20
+KPX J period -30
+KPX J comma -30
+KPX J a -20
+KPX J A -20
+
+KPX K y -50
+KPX K u -30
+KPX K o -40
+KPX K e -40
+KPX K O -50
+
+KPX L y -30
+KPX L quoteright -160
+KPX L quotedblright -140
+KPX L Y -140
+KPX L W -70
+KPX L V -110
+KPX L T -110
+
+KPX O period -40
+KPX O comma -40
+KPX O Y -70
+KPX O X -60
+KPX O W -30
+KPX O V -50
+KPX O T -40
+KPX O A -20
+
+KPX P period -180
+KPX P o -50
+KPX P e -50
+KPX P comma -180
+KPX P a -40
+KPX P A -120
+
+KPX Q U -10
+
+KPX R Y -50
+KPX R W -30
+KPX R V -50
+KPX R U -40
+KPX R T -30
+KPX R O -20
+
+KPX S period -20
+KPX S comma -20
+
+KPX T y -120
+KPX T w -120
+KPX T u -120
+KPX T semicolon -20
+KPX T r -120
+KPX T period -120
+KPX T o -120
+KPX T hyphen -140
+KPX T e -120
+KPX T comma -120
+KPX T colon -20
+KPX T a -120
+KPX T O -40
+KPX T A -120
+
+KPX U period -40
+KPX U comma -40
+KPX U A -40
+
+KPX V u -70
+KPX V semicolon -40
+KPX V period -125
+KPX V o -80
+KPX V hyphen -80
+KPX V e -80
+KPX V comma -125
+KPX V colon -40
+KPX V a -70
+KPX V O -40
+KPX V G -40
+KPX V A -80
+
+KPX W y -20
+KPX W u -30
+KPX W period -80
+KPX W o -30
+KPX W hyphen -40
+KPX W e -30
+KPX W comma -80
+KPX W a -40
+KPX W O -20
+KPX W A -50
+
+KPX Y u -110
+KPX Y semicolon -60
+KPX Y period -140
+KPX Y o -140
+KPX Y i -20
+KPX Y hyphen -140
+KPX Y e -140
+KPX Y comma -140
+KPX Y colon -60
+KPX Y a -140
+KPX Y O -85
+KPX Y A -110
+
+KPX a y -30
+KPX a w -20
+KPX a v -20
+
+KPX b y -20
+KPX b v -20
+KPX b u -20
+KPX b period -40
+KPX b l -20
+KPX b comma -40
+KPX b b -10
+
+KPX c k -20
+KPX c comma -15
+
+KPX colon space -50
+
+KPX comma quoteright -100
+KPX comma quotedblright -100
+
+KPX e y -20
+KPX e x -30
+KPX e w -20
+KPX e v -30
+KPX e period -15
+KPX e comma -15
+
+KPX f quoteright 50
+KPX f quotedblright 60
+KPX f period -30
+KPX f o -30
+KPX f e -30
+KPX f dotlessi -28
+KPX f comma -30
+KPX f a -30
+
+KPX g r -10
+
+KPX h y -30
+
+KPX k o -20
+KPX k e -20
+
+KPX m y -15
+KPX m u -10
+
+KPX n y -15
+KPX n v -20
+KPX n u -10
+
+KPX o y -30
+KPX o x -30
+KPX o w -15
+KPX o v -15
+KPX o period -40
+KPX o comma -40
+
+KPX oslash z -55
+KPX oslash y -70
+KPX oslash x -85
+KPX oslash w -70
+KPX oslash v -70
+KPX oslash u -55
+KPX oslash t -55
+KPX oslash s -55
+KPX oslash r -55
+KPX oslash q -55
+KPX oslash period -95
+KPX oslash p -55
+KPX oslash o -55
+KPX oslash n -55
+KPX oslash m -55
+KPX oslash l -55
+KPX oslash k -55
+KPX oslash j -55
+KPX oslash i -55
+KPX oslash h -55
+KPX oslash g -55
+KPX oslash f -55
+KPX oslash e -55
+KPX oslash d -55
+KPX oslash comma -95
+KPX oslash c -55
+KPX oslash b -55
+KPX oslash a -55
+
+KPX p y -30
+KPX p period -35
+KPX p comma -35
+
+KPX period space -60
+KPX period quoteright -100
+KPX period quotedblright -100
+
+KPX quotedblright space -40
+
+KPX quoteleft quoteleft -57
+
+KPX quoteright space -70
+KPX quoteright s -50
+KPX quoteright r -50
+KPX quoteright quoteright -57
+KPX quoteright d -50
+
+KPX r y 30
+KPX r v 30
+KPX r u 15
+KPX r t 40
+KPX r semicolon 30
+KPX r period -50
+KPX r p 30
+KPX r n 25
+KPX r m 25
+KPX r l 15
+KPX r k 15
+KPX r i 15
+KPX r comma -50
+KPX r colon 30
+KPX r a -10
+
+KPX s w -30
+KPX s period -15
+KPX s comma -15
+
+KPX semicolon space -50
+
+KPX space quoteleft -60
+KPX space quotedblleft -30
+KPX space Y -90
+KPX space W -40
+KPX space V -50
+KPX space T -50
+
+KPX v period -80
+KPX v o -25
+KPX v e -25
+KPX v comma -80
+KPX v a -25
+
+KPX w period -60
+KPX w o -10
+KPX w e -10
+KPX w comma -60
+KPX w a -15
+
+KPX x e -30
+
+KPX y period -100
+KPX y o -20
+KPX y e -20
+KPX y comma -100
+KPX y a -20
+
+KPX z o -15
+KPX z e -15
+EndKernPairs
+EndKernData
+StartComposites 58
+CC Aacute 2 ; PCC A 0 0 ; PCC acute 167 195 ;
+CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 167 195 ;
+CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 195 ;
+CC Agrave 2 ; PCC A 0 0 ; PCC grave 167 195 ;
+CC Aring 2 ; PCC A 0 0 ; PCC ring 167 175 ;
+CC Atilde 2 ; PCC A 0 0 ; PCC tilde 167 195 ;
+CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 195 0 ;
+CC Eacute 2 ; PCC E 0 0 ; PCC acute 167 195 ;
+CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 167 195 ;
+CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 167 195 ;
+CC Egrave 2 ; PCC E 0 0 ; PCC grave 167 195 ;
+CC Iacute 2 ; PCC I 0 0 ; PCC acute -27 195 ;
+CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex -27 195 ;
+CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis -27 195 ;
+CC Igrave 2 ; PCC I 0 0 ; PCC grave -27 195 ;
+CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 205 195 ;
+CC Oacute 2 ; PCC O 0 0 ; PCC acute 223 195 ;
+CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 223 195 ;
+CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 223 195 ;
+CC Ograve 2 ; PCC O 0 0 ; PCC grave 223 195 ;
+CC Otilde 2 ; PCC O 0 0 ; PCC tilde 223 195 ;
+CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 195 ;
+CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 195 ;
+CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 195 195 ;
+CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 195 195 ;
+CC Ugrave 2 ; PCC U 0 0 ; PCC grave 195 195 ;
+CC Yacute 2 ; PCC Y 0 0 ; PCC acute 167 195 ;
+CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 167 195 ;
+CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 195 ;
+CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ;
+CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ;
+CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ;
+CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ;
+CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ;
+CC atilde 2 ; PCC a 0 0 ; PCC tilde 102 0 ;
+CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 84 0 ;
+CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ;
+CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ;
+CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ;
+CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ;
+CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ;
+CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ;
+CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ;
+CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ;
+CC ntilde 2 ; PCC n 0 0 ; PCC tilde 102 0 ;
+CC oacute 2 ; PCC o 0 0 ; PCC acute 112 0 ;
+CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 112 0 ;
+CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ;
+CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ;
+CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ;
+CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ;
+CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ;
+CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ;
+CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 112 0 ;
+CC ugrave 2 ; PCC u 0 0 ; PCC grave 112 0 ;
+CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ;
+CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ;
+CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ;
+EndComposites
+EndFontMetrics
\ No newline at end of file
diff --git a/models/poll.py b/models/poll.py
index 7cb01a2..3fc1f62 100644
--- a/models/poll.py
+++ b/models/poll.py
@@ -14,8 +14,7 @@
 import pytz
 import regex
 from bson import ObjectId
-from matplotlib import rcParams
-from matplotlib.afm import AFM
+from utils.afm import AFM
 from pytz import UnknownTimeZoneError
 from unidecode import unidecode
 
@@ -29,8 +28,10 @@
 
 # Helvetica is the closest font to Whitney (discord uses Whitney) in afm
 # This is used to estimate text width and adjust the layout of the embeds
-afm_fname = os.path.join(rcParams['datapath'], 'fonts', 'afm', 'phvr8a.afm')
-with open(afm_fname, 'rb') as fh:
+script_dir = os.path.dirname(__file__) #<-- absolute dir the script is in
+rel_path = "phvr8a.afm"
+
+with open(script_dir + "/" + rel_path, 'rb') as fh:
     afm = AFM(fh)
 
 # A-Z Emojis for Discord
@@ -1002,7 +1003,7 @@ async def to_export(self):
 
             for user_id in self.unique_participants:
                 # member = self.server.get_member(int(user_id))
-                member = await self.bot.member_cache.get(self.server, int(user_id))
+                member = self.bot.get_user(int(user_id))
 
                 if not member:
                     name = "<Deleted User>"
@@ -1045,7 +1046,7 @@ async def to_export(self):
 
             for user_id in self.unique_participants:
                 # member = self.server.get_member(int(user_id))
-                member = await self.bot.member_cache.get(self.server, int(user_id))
+                member = self.bot.get_user(int(user_id))
                 if not member:
                     name = "<Deleted User>"
                 else:
@@ -1124,8 +1125,8 @@ async def from_dict(self, d):
         self.id = ObjectId(str(d['_id']))
         self.server = self.bot.get_guild(int(d['server_id']))
         self.channel = self.bot.get_channel(int(d['channel_id']))
-        if self.server:
-            self.author = await self.bot.member_cache.get(self.server, int(d['author']))
+        if self.server != None:
+            self.author = self.bot.get_user(int(d['author']))
             # self.author = self.server.get_member(int(d['author']))
         else:
             self.author = None
@@ -1226,6 +1227,8 @@ async def load_full_votes(self):
         if not self.full_votes:
             self.full_votes = await Vote.load_all_votes_for_poll(self.bot, self.id)
 
+
+
     def add_field_custom(self, name, value, embed):
         """this is used to estimate the width of text and add empty embed fields for a cleaner report
         cursor_pos is used to track if we are at the start of a new line in the report. Each line has max 2 slots for info.
@@ -1482,7 +1485,7 @@ async def vote(self, user, option, message):
                 weight = max(valid_weights)
 
         # unvote for anon and hidden count
-        if self.anonymous or self.hide_count:
+        if self.anonymous or self.hide_count and user != None:
             vote = await Vote.load_from_db(self.bot, self.id, user.id, choice)
             if vote:
                 await vote.delete_from_db()
diff --git a/pollmaster.icon.webp b/pollmaster.icon.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9179aa65028bac417b494f51a79bd4e9d95ea32b
GIT binary patch
literal 3204
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

literal 0
HcmV?d00001

diff --git a/pollmaster.jpg b/pollmaster.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2a7079bab94959241505ac2e874ea63c697cc8b6
GIT binary patch
literal 4490
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
P|Mw$6nTF%d-OT?0;7Kz|

literal 0
HcmV?d00001

diff --git a/pollmaster.py b/pollmaster.py
index 2b6ad16..c31e0c6 100644
--- a/pollmaster.py
+++ b/pollmaster.py
@@ -1,6 +1,7 @@
 import json
 import sys
 import traceback
+import asyncio
 
 import aiohttp
 import discord
@@ -14,6 +15,8 @@
 from essentials.multi_server import get_pre
 from essentials.settings import SETTINGS
 
+syncOnce = False
+
 bot_config = {
     'command_prefix': get_pre,
     'case_insensitive': True,
@@ -23,14 +26,22 @@
     'fetch_offline_members': False,
     'max_messages': 15000
 }
-
-bot = commands.AutoShardedBot(**bot_config)
+intents = discord.Intents.default()
+intents.messages = True
+intents.members = True
+intents.reactions = True
+intents.message_content = True
+intents.guilds = True
+intents.presences = True
+bot = commands.AutoShardedBot(**bot_config, intents=intents)
 bot.remove_command('help')
 
+
 bot.message_cache = MessageCache(bot)
 bot.refresh_blocked = {}
 bot.refresh_queue = {}
 
+
 # logger
 # create logger with 'spam_application'
 logger = logging.getLogger('discord')
@@ -50,9 +61,9 @@
 logger.addHandler(ch)
 
 extensions = ['cogs.config', 'cogs.poll_controls', 'cogs.help', 'cogs.db_api', 'cogs.admin']
-for ext in extensions:
-    bot.load_extension(ext)
-
+async def setup(bot):
+    for ext in extensions:
+        await bot.load_extension(ext)
 
 @bot.event
 async def on_message(message):
@@ -74,13 +85,14 @@ async def on_message(message):
 
 @bot.event
 async def on_ready():
+    global syncOnce
+    await bot.wait_until_ready()
+    if not syncOnce:
+        await bot.tree.sync()
+        syncOnce = True
+    
     bot.owner = await bot.fetch_user(SETTINGS.owner_id)
 
-    mongo = AsyncIOMotorClient(SETTINGS.mongo_db)
-    bot.db = mongo.pollmaster
-    bot.session = aiohttp.ClientSession()
-    print(bot.db)
-
     # load emoji list
     with open('utils/emoji-compact.json', encoding='utf-8') as emojson:
         bot.emoji_dict = json.load(emojson)
@@ -162,4 +174,15 @@ async def on_guild_join(server):
         )
         bot.pre[str(server.id)] = 'pm!'
 
-bot.run(SETTINGS.bot_token)
+async def main():
+    async with bot:
+        mongo = AsyncIOMotorClient(SETTINGS.mongo_db)
+        bot.db = mongo.pollmaster
+        bot.session = aiohttp.ClientSession()
+        await setup(bot)
+        await bot.start(SETTINGS.bot_token)
+
+asyncio.run(main())
+
+
+
diff --git a/requirements.txt b/requirements.txt
index 57c52af..c49e244 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,13 @@
-aiohttp==3.7.2
-async-timeout==3.0.1
-asyncpg==0.21.0
-attrs==20.2.0
-certifi==2020.6.20
-chardet==3.0.4
-cycler==0.10.0
+aiohttp==3.7.4
 dateparser==0.7.4
-dblpy==0.3.4
-discord.py==1.5.1
-idna==2.10
-idna-ssl==1.1.0
-kiwisolver==1.3.0
-matplotlib==3.2.1
+dblpy==0.4.0
+discord.py==2.0.1
 motor==2.3.0
-multidict==5.0.0
-numpy==1.19.2
-pymongo==3.11.0
-pyparsing==2.4.7
-python-dateutil==2.8.1
 pytz==2020.1
-ratelimiter==1.2.0.post0
 regex==2020.10.23
 requests==2.24.0
-six==1.15.0
-typing-extensions==3.7.4.3
-tzlocal==2.1
 Unidecode==1.1.1
-urllib3==1.25.11
 websockets==8.1
-yarl==1.4.2
+python-dotenv==0.20.0
+multidict==4.5.0
+pymongo==3.11.0
\ No newline at end of file
diff --git a/utils/afm.py b/utils/afm.py
new file mode 100644
index 0000000..8ee6cd7
--- /dev/null
+++ b/utils/afm.py
@@ -0,0 +1,442 @@
+from collections import namedtuple
+import logging
+import re
+
+
+_log = logging.getLogger(__name__)
+
+
+def _to_int(x):
+    # Some AFM files have floats where we are expecting ints -- there is
+    # probably a better way to handle this (support floats, round rather than
+    # truncate).  But I don't know what the best approach is now and this
+    # change to _to_int should at least prevent Matplotlib from crashing on
+    # these.  JDH (2009-11-06)
+    return int(float(x))
+
+
+
+def _to_float(x):
+    # Some AFM files use "," instead of "." as decimal separator -- this
+    # shouldn't be ambiguous (unless someone is wicked enough to use "," as
+    # thousands separator...).
+    if isinstance(x, bytes):
+        # Encoding doesn't really matter -- if we have codepoints >127 the call
+        # to float() will error anyways.
+        x = x.decode('latin-1')
+    return float(x.replace(',', '.'))
+
+
+def _to_str(x):
+    return x.decode('utf8')
+
+
+def _to_list_of_ints(s):
+    s = s.replace(b',', b' ')
+    return [_to_int(val) for val in s.split()]
+
+
+def _to_list_of_floats(s):
+    return [_to_float(val) for val in s.split()]
+
+
+def _to_bool(s):
+    if s.lower().strip() in (b'false', b'0', b'no'):
+        return False
+    else:
+        return True
+
+
+def _parse_header(fh):
+    """
+    Read the font metrics header (up to the char metrics) and returns
+    a dictionary mapping *key* to *val*.  *val* will be converted to the
+    appropriate python type as necessary; e.g.:
+        * 'False'->False
+        * '0'->0
+        * '-168 -218 1000 898'-> [-168, -218, 1000, 898]
+    Dictionary keys are
+      StartFontMetrics, FontName, FullName, FamilyName, Weight,
+      ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition,
+      UnderlineThickness, Version, Notice, EncodingScheme, CapHeight,
+      XHeight, Ascender, Descender, StartCharMetrics
+    """
+    header_converters = {
+        b'StartFontMetrics': _to_float,
+        b'FontName': _to_str,
+        b'FullName': _to_str,
+        b'FamilyName': _to_str,
+        b'Weight': _to_str,
+        b'ItalicAngle': _to_float,
+        b'IsFixedPitch': _to_bool,
+        b'FontBBox': _to_list_of_ints,
+        b'UnderlinePosition': _to_float,
+        b'UnderlineThickness': _to_float,
+        b'Version': _to_str,
+        # Some AFM files have non-ASCII characters (which are not allowed by
+        # the spec).  Given that there is actually no public API to even access
+        # this field, just return it as straight bytes.
+        b'Notice': lambda x: x,
+        b'EncodingScheme': _to_str,
+        b'CapHeight': _to_float,  # Is the second version a mistake, or
+        b'Capheight': _to_float,  # do some AFM files contain 'Capheight'? -JKS
+        b'XHeight': _to_float,
+        b'Ascender': _to_float,
+        b'Descender': _to_float,
+        b'StdHW': _to_float,
+        b'StdVW': _to_float,
+        b'StartCharMetrics': _to_int,
+        b'CharacterSet': _to_str,
+        b'Characters': _to_int,
+    }
+    d = {}
+    first_line = True
+    for line in fh:
+        line = line.rstrip()
+        if line.startswith(b'Comment'):
+            continue
+        lst = line.split(b' ', 1)
+        key = lst[0]
+        if first_line:
+            # AFM spec, Section 4: The StartFontMetrics keyword
+            # [followed by a version number] must be the first line in
+            # the file, and the EndFontMetrics keyword must be the
+            # last non-empty line in the file.  We just check the
+            # first header entry.
+            if key != b'StartFontMetrics':
+                raise RuntimeError('Not an AFM file')
+            first_line = False
+        if len(lst) == 2:
+            val = lst[1]
+        else:
+            val = b''
+        try:
+            converter = header_converters[key]
+        except KeyError:
+            _log.error('Found an unknown keyword in AFM header (was %r)' % key)
+            continue
+        try:
+            d[key] = converter(val)
+        except ValueError:
+            _log.error('Value error parsing header in AFM: %s, %s', key, val)
+            continue
+        if key == b'StartCharMetrics':
+            break
+    else:
+        raise RuntimeError('Bad parse')
+    return d
+
+
+CharMetrics = namedtuple('CharMetrics', 'width, name, bbox')
+CharMetrics.__doc__ = """
+    Represents the character metrics of a single character.
+    Notes
+    -----
+    The fields do currently only describe a subset of character metrics
+    information defined in the AFM standard.
+    """
+CharMetrics.width.__doc__ = """The character width (WX)."""
+CharMetrics.name.__doc__ = """The character name (N)."""
+CharMetrics.bbox.__doc__ = """
+    The bbox of the character (B) as a tuple (*llx*, *lly*, *urx*, *ury*)."""
+
+
+def _parse_char_metrics(fh):
+    """
+    Parse the given filehandle for character metrics information and return
+    the information as dicts.
+    It is assumed that the file cursor is on the line behind
+    'StartCharMetrics'.
+    Returns
+    -------
+    ascii_d : dict
+         A mapping "ASCII num of the character" to `.CharMetrics`.
+    name_d : dict
+         A mapping "character name" to `.CharMetrics`.
+    Notes
+    -----
+    This function is incomplete per the standard, but thus far parses
+    all the sample afm files tried.
+    """
+    required_keys = {'C', 'WX', 'N', 'B'}
+
+    ascii_d = {}
+    name_d = {}
+    for line in fh:
+        # We are defensively letting values be utf8. The spec requires
+        # ascii, but there are non-compliant fonts in circulation
+        line = _to_str(line.rstrip())  # Convert from byte-literal
+        if line.startswith('EndCharMetrics'):
+            return ascii_d, name_d
+        # Split the metric line into a dictionary, keyed by metric identifiers
+        vals = dict(s.strip().split(' ', 1) for s in line.split(';') if s)
+        # There may be other metrics present, but only these are needed
+        if not required_keys.issubset(vals):
+            raise RuntimeError('Bad char metrics line: %s' % line)
+        num = _to_int(vals['C'])
+        wx = _to_float(vals['WX'])
+        name = vals['N']
+        bbox = _to_list_of_floats(vals['B'])
+        bbox = list(map(int, bbox))
+        metrics = CharMetrics(wx, name, bbox)
+        # Workaround: If the character name is 'Euro', give it the
+        # corresponding character code, according to WinAnsiEncoding (see PDF
+        # Reference).
+        if name == 'Euro':
+            num = 128
+        elif name == 'minus':
+            num = ord("\N{MINUS SIGN}")  # 0x2212
+        if num != -1:
+            ascii_d[num] = metrics
+        name_d[name] = metrics
+    raise RuntimeError('Bad parse')
+
+
+def _parse_kern_pairs(fh):
+    """
+    Return a kern pairs dictionary; keys are (*char1*, *char2*) tuples and
+    values are the kern pair value.  For example, a kern pairs line like
+    ``KPX A y -50``
+    will be represented as::
+      d[ ('A', 'y') ] = -50
+    """
+
+    line = next(fh)
+    if not line.startswith(b'StartKernPairs'):
+        raise RuntimeError('Bad start of kern pairs data: %s' % line)
+
+    d = {}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith(b'EndKernPairs'):
+            next(fh)  # EndKernData
+            return d
+        vals = line.split()
+        if len(vals) != 4 or vals[0] != b'KPX':
+            raise RuntimeError('Bad kern pairs line: %s' % line)
+        c1, c2, val = _to_str(vals[1]), _to_str(vals[2]), _to_float(vals[3])
+        d[(c1, c2)] = val
+    raise RuntimeError('Bad kern pairs parse')
+
+
+CompositePart = namedtuple('CompositePart', 'name, dx, dy')
+CompositePart.__doc__ = """
+    Represents the information on a composite element of a composite char."""
+CompositePart.name.__doc__ = """Name of the part, e.g. 'acute'."""
+CompositePart.dx.__doc__ = """x-displacement of the part from the origin."""
+CompositePart.dy.__doc__ = """y-displacement of the part from the origin."""
+
+
+def _parse_composites(fh):
+    """
+    Parse the given filehandle for composites information return them as a
+    dict.
+    It is assumed that the file cursor is on the line behind 'StartComposites'.
+    Returns
+    -------
+    dict
+        A dict mapping composite character names to a parts list. The parts
+        list is a list of `.CompositePart` entries describing the parts of
+        the composite.
+    Examples
+    --------
+    A composite definition line::
+      CC Aacute 2 ; PCC A 0 0 ; PCC acute 160 170 ;
+    will be represented as::
+      composites['Aacute'] = [CompositePart(name='A', dx=0, dy=0),
+                              CompositePart(name='acute', dx=160, dy=170)]
+    """
+    composites = {}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith(b'EndComposites'):
+            return composites
+        vals = line.split(b';')
+        cc = vals[0].split()
+        name, _num_parts = cc[1], _to_int(cc[2])
+        pccParts = []
+        for s in vals[1:-1]:
+            pcc = s.split()
+            part = CompositePart(pcc[1], _to_float(pcc[2]), _to_float(pcc[3]))
+            pccParts.append(part)
+        composites[name] = pccParts
+
+    raise RuntimeError('Bad composites parse')
+
+
+def _parse_optional(fh):
+    """
+    Parse the optional fields for kern pair data and composites.
+    Returns
+    -------
+    kern_data : dict
+        A dict containing kerning information. May be empty.
+        See `._parse_kern_pairs`.
+    composites : dict
+        A dict containing composite information. May be empty.
+        See `._parse_composites`.
+    """
+    optional = {
+        b'StartKernData': _parse_kern_pairs,
+        b'StartComposites':  _parse_composites,
+        }
+
+    d = {b'StartKernData': {},
+         b'StartComposites': {}}
+    for line in fh:
+        line = line.rstrip()
+        if not line:
+            continue
+        key = line.split()[0]
+
+        if key in optional:
+            d[key] = optional[key](fh)
+
+    return d[b'StartKernData'], d[b'StartComposites']
+
+
+class AFM:
+
+    def __init__(self, fh):
+        """Parse the AFM file in file object *fh*."""
+        self._header = _parse_header(fh)
+        self._metrics, self._metrics_by_name = _parse_char_metrics(fh)
+        self._kern, self._composite = _parse_optional(fh)
+
+    def get_bbox_char(self, c, isord=False):
+        if not isord:
+            c = ord(c)
+        return self._metrics[c].bbox
+
+    def string_width_height(self, s):
+        """
+        Return the string width (including kerning) and string height
+        as a (*w*, *h*) tuple.
+        """
+        if not len(s):
+            return 0, 0
+        total_width = 0
+        namelast = None
+        miny = 1e9
+        maxy = 0
+        for c in s:
+            if c == '\n':
+                continue
+            wx, name, bbox = self._metrics[ord(c)]
+
+            total_width += wx + self._kern.get((namelast, name), 0)
+            l, b, w, h = bbox
+            miny = min(miny, b)
+            maxy = max(maxy, b + h)
+
+            namelast = name
+
+        return total_width, maxy - miny
+
+    def get_name_char(self, c, isord=False):
+        """Get the name of the character, i.e., ';' is 'semicolon'."""
+        if not isord:
+            c = ord(c)
+        return self._metrics[c].name
+
+    def get_width_char(self, c, isord=False):
+        """
+        Get the width of the character from the character metric WX field.
+        """
+        if not isord:
+            c = ord(c)
+        return self._metrics[c].width
+
+    def get_width_from_char_name(self, name):
+        """Get the width of the character from a type1 character name."""
+        return self._metrics_by_name[name].width
+
+    def get_height_char(self, c, isord=False):
+        """Get the bounding box (ink) height of character *c* (space is 0)."""
+        if not isord:
+            c = ord(c)
+        return self._metrics[c].bbox[-1]
+
+    def get_kern_dist(self, c1, c2):
+        """
+        Return the kerning pair distance (possibly 0) for chars *c1* and *c2*.
+        """
+        name1, name2 = self.get_name_char(c1), self.get_name_char(c2)
+        return self.get_kern_dist_from_name(name1, name2)
+
+    def get_kern_dist_from_name(self, name1, name2):
+        """
+        Return the kerning pair distance (possibly 0) for chars
+        *name1* and *name2*.
+        """
+        return self._kern.get((name1, name2), 0)
+
+    def get_fontname(self):
+        """Return the font name, e.g., 'Times-Roman'."""
+        return self._header[b'FontName']
+
+    @property
+    def postscript_name(self):  # For consistency with FT2Font.
+        return self.get_fontname()
+
+    def get_fullname(self):
+        """Return the font full name, e.g., 'Times-Roman'."""
+        name = self._header.get(b'FullName')
+        if name is None:  # use FontName as a substitute
+            name = self._header[b'FontName']
+        return name
+
+    def get_familyname(self):
+        """Return the font family name, e.g., 'Times'."""
+        name = self._header.get(b'FamilyName')
+        if name is not None:
+            return name
+
+        # FamilyName not specified so we'll make a guess
+        name = self.get_fullname()
+        extras = (r'(?i)([ -](regular|plain|italic|oblique|bold|semibold|'
+                  r'light|ultralight|extra|condensed))+$')
+        return re.sub(extras, '', name)
+
+    @property
+    def family_name(self):
+        """The font family name, e.g., 'Times'."""
+        return self.get_familyname()
+
+    def get_weight(self):
+        """Return the font weight, e.g., 'Bold' or 'Roman'."""
+        return self._header[b'Weight']
+
+    def get_angle(self):
+        """Return the fontangle as float."""
+        return self._header[b'ItalicAngle']
+
+    def get_capheight(self):
+        """Return the cap height as float."""
+        return self._header[b'CapHeight']
+
+    def get_xheight(self):
+        """Return the xheight as float."""
+        return self._header[b'XHeight']
+
+    def get_underline_thickness(self):
+        """Return the underline thickness as float."""
+        return self._header[b'UnderlineThickness']
+
+    def get_horizontal_stem_width(self):
+        """
+        Return the standard horizontal stem width as float, or *None* if
+        not specified in AFM file.
+        """
+        return self._header.get(b'StdHW', None)
+
+    def get_vertical_stem_width(self):
+        """
+        Return the standard vertical stem width as float, or *None* if
+        not specified in AFM file.
+        """
+        return self._header.get(b'StdVW', None)
\ No newline at end of file

From ddab8ad40addaf57fb23be551a1ae7b65a5c8ec6 Mon Sep 17 00:00:00 2001
From: ctrl-os <wonderfulchicken1@gmail.com>
Date: Thu, 15 Sep 2022 19:45:07 -0700
Subject: [PATCH 2/2] Remove dotenv

---
 bot.py                |   1 +
 essentials/secrets.py |  12 -
 models/phvr8a.afm     | 612 ------------------------------------------
 models/poll.py        |  10 +-
 pollmaster.icon.webp  | Bin 3204 -> 0 bytes
 pollmaster.jpg        | Bin 4490 -> 0 bytes
 requirements.txt      |   2 +-
 utils/afm.py          | 442 ------------------------------
 8 files changed, 6 insertions(+), 1073 deletions(-)
 delete mode 100644 essentials/secrets.py
 delete mode 100644 models/phvr8a.afm
 delete mode 100644 pollmaster.icon.webp
 delete mode 100644 pollmaster.jpg
 delete mode 100644 utils/afm.py

diff --git a/bot.py b/bot.py
index 47141b3..d123924 100644
--- a/bot.py
+++ b/bot.py
@@ -50,6 +50,7 @@ def __init__(self, **kwargs):
             self.load_extension(ext)
 
         self.message_cache = MessageCache(self)
+        self.member_cache = MemberCache()
         self.refresh_blocked = {}
         self.refresh_queue = {}
 
diff --git a/essentials/secrets.py b/essentials/secrets.py
deleted file mode 100644
index 3b789a9..0000000
--- a/essentials/secrets.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-from dotenv import load_dotenv
-load_dotenv(".env")
-
-class Secrets:
-    def __init__(self):
-        self.dbl_token = ''  # DBL token (only needed for public bot)
-        self.mongo_db =  os.getenv('MONGO_URL')
-        self.bot_token = os.getenv('pollmaster_token') # official discord bot token
-        self.mode = 'development' # or production
-
-SECRETS = Secrets()
\ No newline at end of file
diff --git a/models/phvr8a.afm b/models/phvr8a.afm
deleted file mode 100644
index 4b04c24..0000000
--- a/models/phvr8a.afm
+++ /dev/null
@@ -1,612 +0,0 @@
-StartFontMetrics 2.0
-Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All rights reserved.
-Comment Creation Date: Thu Mar 15 08:58:00 1990
-Comment UniqueID 28352
-Comment VMusage 26389 33281
-FontName Helvetica
-FullName Helvetica
-FamilyName Helvetica
-Weight Medium
-ItalicAngle 0
-IsFixedPitch false
-FontBBox -166 -225 1000 931
-UnderlinePosition -100
-UnderlineThickness 50
-Version 001.006
-Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated.  All rights reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries.
-EncodingScheme AdobeStandardEncoding
-CapHeight 718
-XHeight 523
-Ascender 718
-Descender -207
-StartCharMetrics 228
-C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 278 ; N exclam ; B 90 0 187 718 ;
-C 34 ; WX 355 ; N quotedbl ; B 70 463 285 718 ;
-C 35 ; WX 556 ; N numbersign ; B 28 0 529 688 ;
-C 36 ; WX 556 ; N dollar ; B 32 -115 520 775 ;
-C 37 ; WX 889 ; N percent ; B 39 -19 850 703 ;
-C 38 ; WX 667 ; N ampersand ; B 44 -15 645 718 ;
-C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
-C 40 ; WX 333 ; N parenleft ; B 68 -207 299 733 ;
-C 41 ; WX 333 ; N parenright ; B 34 -207 265 733 ;
-C 42 ; WX 389 ; N asterisk ; B 39 431 349 718 ;
-C 43 ; WX 584 ; N plus ; B 39 0 545 505 ;
-C 44 ; WX 278 ; N comma ; B 87 -147 191 106 ;
-C 45 ; WX 333 ; N hyphen ; B 44 232 289 322 ;
-C 46 ; WX 278 ; N period ; B 87 0 191 106 ;
-C 47 ; WX 278 ; N slash ; B -17 -19 295 737 ;
-C 48 ; WX 556 ; N zero ; B 37 -19 519 703 ;
-C 49 ; WX 556 ; N one ; B 101 0 359 703 ;
-C 50 ; WX 556 ; N two ; B 26 0 507 703 ;
-C 51 ; WX 556 ; N three ; B 34 -19 522 703 ;
-C 52 ; WX 556 ; N four ; B 25 0 523 703 ;
-C 53 ; WX 556 ; N five ; B 32 -19 514 688 ;
-C 54 ; WX 556 ; N six ; B 38 -19 518 703 ;
-C 55 ; WX 556 ; N seven ; B 37 0 523 688 ;
-C 56 ; WX 556 ; N eight ; B 38 -19 517 703 ;
-C 57 ; WX 556 ; N nine ; B 42 -19 514 703 ;
-C 58 ; WX 278 ; N colon ; B 87 0 191 516 ;
-C 59 ; WX 278 ; N semicolon ; B 87 -147 191 516 ;
-C 60 ; WX 584 ; N less ; B 48 11 536 495 ;
-C 61 ; WX 584 ; N equal ; B 39 115 545 390 ;
-C 62 ; WX 584 ; N greater ; B 48 11 536 495 ;
-C 63 ; WX 556 ; N question ; B 56 0 492 727 ;
-C 64 ; WX 1015 ; N at ; B 147 -19 868 737 ;
-C 65 ; WX 667 ; N A ; B 14 0 654 718 ;
-C 66 ; WX 667 ; N B ; B 74 0 627 718 ;
-C 67 ; WX 722 ; N C ; B 44 -19 681 737 ;
-C 68 ; WX 722 ; N D ; B 81 0 674 718 ;
-C 69 ; WX 667 ; N E ; B 86 0 616 718 ;
-C 70 ; WX 611 ; N F ; B 86 0 583 718 ;
-C 71 ; WX 778 ; N G ; B 48 -19 704 737 ;
-C 72 ; WX 722 ; N H ; B 77 0 646 718 ;
-C 73 ; WX 278 ; N I ; B 91 0 188 718 ;
-C 74 ; WX 500 ; N J ; B 17 -19 428 718 ;
-C 75 ; WX 667 ; N K ; B 76 0 663 718 ;
-C 76 ; WX 556 ; N L ; B 76 0 537 718 ;
-C 77 ; WX 833 ; N M ; B 73 0 761 718 ;
-C 78 ; WX 722 ; N N ; B 76 0 646 718 ;
-C 79 ; WX 778 ; N O ; B 39 -19 739 737 ;
-C 80 ; WX 667 ; N P ; B 86 0 622 718 ;
-C 81 ; WX 778 ; N Q ; B 39 -56 739 737 ;
-C 82 ; WX 722 ; N R ; B 88 0 684 718 ;
-C 83 ; WX 667 ; N S ; B 49 -19 620 737 ;
-C 84 ; WX 611 ; N T ; B 14 0 597 718 ;
-C 85 ; WX 722 ; N U ; B 79 -19 644 718 ;
-C 86 ; WX 667 ; N V ; B 20 0 647 718 ;
-C 87 ; WX 944 ; N W ; B 16 0 928 718 ;
-C 88 ; WX 667 ; N X ; B 19 0 648 718 ;
-C 89 ; WX 667 ; N Y ; B 14 0 653 718 ;
-C 90 ; WX 611 ; N Z ; B 23 0 588 718 ;
-C 91 ; WX 278 ; N bracketleft ; B 63 -196 250 722 ;
-C 92 ; WX 278 ; N backslash ; B -17 -19 295 737 ;
-C 93 ; WX 278 ; N bracketright ; B 28 -196 215 722 ;
-C 94 ; WX 469 ; N asciicircum ; B -14 264 483 688 ;
-C 95 ; WX 556 ; N underscore ; B 0 -125 556 -75 ;
-C 96 ; WX 222 ; N quoteleft ; B 65 470 169 725 ;
-C 97 ; WX 556 ; N a ; B 36 -15 530 538 ;
-C 98 ; WX 556 ; N b ; B 58 -15 517 718 ;
-C 99 ; WX 500 ; N c ; B 30 -15 477 538 ;
-C 100 ; WX 556 ; N d ; B 35 -15 499 718 ;
-C 101 ; WX 556 ; N e ; B 40 -15 516 538 ;
-C 102 ; WX 278 ; N f ; B 14 0 262 728 ; L i fi ; L l fl ;
-C 103 ; WX 556 ; N g ; B 40 -220 499 538 ;
-C 104 ; WX 556 ; N h ; B 65 0 491 718 ;
-C 105 ; WX 222 ; N i ; B 67 0 155 718 ;
-C 106 ; WX 222 ; N j ; B -16 -210 155 718 ;
-C 107 ; WX 500 ; N k ; B 67 0 501 718 ;
-C 108 ; WX 222 ; N l ; B 67 0 155 718 ;
-C 109 ; WX 833 ; N m ; B 65 0 769 538 ;
-C 110 ; WX 556 ; N n ; B 65 0 491 538 ;
-C 111 ; WX 556 ; N o ; B 35 -14 521 538 ;
-C 112 ; WX 556 ; N p ; B 58 -207 517 538 ;
-C 113 ; WX 556 ; N q ; B 35 -207 494 538 ;
-C 114 ; WX 333 ; N r ; B 77 0 332 538 ;
-C 115 ; WX 500 ; N s ; B 32 -15 464 538 ;
-C 116 ; WX 278 ; N t ; B 14 -7 257 669 ;
-C 117 ; WX 556 ; N u ; B 68 -15 489 523 ;
-C 118 ; WX 500 ; N v ; B 8 0 492 523 ;
-C 119 ; WX 722 ; N w ; B 14 0 709 523 ;
-C 120 ; WX 500 ; N x ; B 11 0 490 523 ;
-C 121 ; WX 500 ; N y ; B 11 -214 489 523 ;
-C 122 ; WX 500 ; N z ; B 31 0 469 523 ;
-C 123 ; WX 334 ; N braceleft ; B 42 -196 292 722 ;
-C 124 ; WX 260 ; N bar ; B 94 -19 167 737 ;
-C 125 ; WX 334 ; N braceright ; B 42 -196 292 722 ;
-C 126 ; WX 584 ; N asciitilde ; B 61 180 523 326 ;
-C 161 ; WX 333 ; N exclamdown ; B 118 -195 215 523 ;
-C 162 ; WX 556 ; N cent ; B 51 -115 513 623 ;
-C 163 ; WX 556 ; N sterling ; B 33 -16 539 718 ;
-C 164 ; WX 167 ; N fraction ; B -166 -19 333 703 ;
-C 165 ; WX 556 ; N yen ; B 3 0 553 688 ;
-C 166 ; WX 556 ; N florin ; B -11 -207 501 737 ;
-C 167 ; WX 556 ; N section ; B 43 -191 512 737 ;
-C 168 ; WX 556 ; N currency ; B 28 99 528 603 ;
-C 169 ; WX 191 ; N quotesingle ; B 59 463 132 718 ;
-C 170 ; WX 333 ; N quotedblleft ; B 38 470 307 725 ;
-C 171 ; WX 556 ; N guillemotleft ; B 97 108 459 446 ;
-C 172 ; WX 333 ; N guilsinglleft ; B 88 108 245 446 ;
-C 173 ; WX 333 ; N guilsinglright ; B 88 108 245 446 ;
-C 174 ; WX 500 ; N fi ; B 14 0 434 728 ;
-C 175 ; WX 500 ; N fl ; B 14 0 432 728 ;
-C 177 ; WX 556 ; N endash ; B 0 240 556 313 ;
-C 178 ; WX 556 ; N dagger ; B 43 -159 514 718 ;
-C 179 ; WX 556 ; N daggerdbl ; B 43 -159 514 718 ;
-C 180 ; WX 278 ; N periodcentered ; B 77 190 202 315 ;
-C 182 ; WX 537 ; N paragraph ; B 18 -173 497 718 ;
-C 183 ; WX 350 ; N bullet ; B 18 202 333 517 ;
-C 184 ; WX 222 ; N quotesinglbase ; B 53 -149 157 106 ;
-C 185 ; WX 333 ; N quotedblbase ; B 26 -149 295 106 ;
-C 186 ; WX 333 ; N quotedblright ; B 26 463 295 718 ;
-C 187 ; WX 556 ; N guillemotright ; B 97 108 459 446 ;
-C 188 ; WX 1000 ; N ellipsis ; B 115 0 885 106 ;
-C 189 ; WX 1000 ; N perthousand ; B 7 -19 994 703 ;
-C 191 ; WX 611 ; N questiondown ; B 91 -201 527 525 ;
-C 193 ; WX 333 ; N grave ; B 14 593 211 734 ;
-C 194 ; WX 333 ; N acute ; B 122 593 319 734 ;
-C 195 ; WX 333 ; N circumflex ; B 21 593 312 734 ;
-C 196 ; WX 333 ; N tilde ; B -4 606 337 722 ;
-C 197 ; WX 333 ; N macron ; B 10 627 323 684 ;
-C 198 ; WX 333 ; N breve ; B 13 595 321 731 ;
-C 199 ; WX 333 ; N dotaccent ; B 121 604 212 706 ;
-C 200 ; WX 333 ; N dieresis ; B 40 604 293 706 ;
-C 202 ; WX 333 ; N ring ; B 75 572 259 756 ;
-C 203 ; WX 333 ; N cedilla ; B 45 -225 259 0 ;
-C 205 ; WX 333 ; N hungarumlaut ; B 31 593 409 734 ;
-C 206 ; WX 333 ; N ogonek ; B 73 -225 287 0 ;
-C 207 ; WX 333 ; N caron ; B 21 593 312 734 ;
-C 208 ; WX 1000 ; N emdash ; B 0 240 1000 313 ;
-C 225 ; WX 1000 ; N AE ; B 8 0 951 718 ;
-C 227 ; WX 370 ; N ordfeminine ; B 24 304 346 737 ;
-C 232 ; WX 556 ; N Lslash ; B -20 0 537 718 ;
-C 233 ; WX 778 ; N Oslash ; B 39 -19 740 737 ;
-C 234 ; WX 1000 ; N OE ; B 36 -19 965 737 ;
-C 235 ; WX 365 ; N ordmasculine ; B 25 304 341 737 ;
-C 241 ; WX 889 ; N ae ; B 36 -15 847 538 ;
-C 245 ; WX 278 ; N dotlessi ; B 95 0 183 523 ;
-C 248 ; WX 222 ; N lslash ; B -20 0 242 718 ;
-C 249 ; WX 611 ; N oslash ; B 28 -22 537 545 ;
-C 250 ; WX 944 ; N oe ; B 35 -15 902 538 ;
-C 251 ; WX 611 ; N germandbls ; B 67 -15 571 728 ;
-C -1 ; WX 611 ; N Zcaron ; B 23 0 588 929 ;
-C -1 ; WX 500 ; N ccedilla ; B 30 -225 477 538 ;
-C -1 ; WX 500 ; N ydieresis ; B 11 -214 489 706 ;
-C -1 ; WX 556 ; N atilde ; B 36 -15 530 722 ;
-C -1 ; WX 278 ; N icircumflex ; B -6 0 285 734 ;
-C -1 ; WX 333 ; N threesuperior ; B 5 270 325 703 ;
-C -1 ; WX 556 ; N ecircumflex ; B 40 -15 516 734 ;
-C -1 ; WX 556 ; N thorn ; B 58 -207 517 718 ;
-C -1 ; WX 556 ; N egrave ; B 40 -15 516 734 ;
-C -1 ; WX 333 ; N twosuperior ; B 4 281 323 703 ;
-C -1 ; WX 556 ; N eacute ; B 40 -15 516 734 ;
-C -1 ; WX 556 ; N otilde ; B 35 -14 521 722 ;
-C -1 ; WX 667 ; N Aacute ; B 14 0 654 929 ;
-C -1 ; WX 556 ; N ocircumflex ; B 35 -14 521 734 ;
-C -1 ; WX 500 ; N yacute ; B 11 -214 489 734 ;
-C -1 ; WX 556 ; N udieresis ; B 68 -15 489 706 ;
-C -1 ; WX 834 ; N threequarters ; B 45 -19 810 703 ;
-C -1 ; WX 556 ; N acircumflex ; B 36 -15 530 734 ;
-C -1 ; WX 722 ; N Eth ; B 0 0 674 718 ;
-C -1 ; WX 556 ; N edieresis ; B 40 -15 516 706 ;
-C -1 ; WX 556 ; N ugrave ; B 68 -15 489 734 ;
-C -1 ; WX 1000 ; N trademark ; B 46 306 903 718 ;
-C -1 ; WX 556 ; N ograve ; B 35 -14 521 734 ;
-C -1 ; WX 500 ; N scaron ; B 32 -15 464 734 ;
-C -1 ; WX 278 ; N Idieresis ; B 13 0 266 901 ;
-C -1 ; WX 556 ; N uacute ; B 68 -15 489 734 ;
-C -1 ; WX 556 ; N agrave ; B 36 -15 530 734 ;
-C -1 ; WX 556 ; N ntilde ; B 65 0 491 722 ;
-C -1 ; WX 556 ; N aring ; B 36 -15 530 756 ;
-C -1 ; WX 500 ; N zcaron ; B 31 0 469 734 ;
-C -1 ; WX 278 ; N Icircumflex ; B -6 0 285 929 ;
-C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ;
-C -1 ; WX 556 ; N ucircumflex ; B 68 -15 489 734 ;
-C -1 ; WX 667 ; N Ecircumflex ; B 86 0 616 929 ;
-C -1 ; WX 278 ; N Iacute ; B 91 0 292 929 ;
-C -1 ; WX 722 ; N Ccedilla ; B 44 -225 681 737 ;
-C -1 ; WX 778 ; N Odieresis ; B 39 -19 739 901 ;
-C -1 ; WX 667 ; N Scaron ; B 49 -19 620 929 ;
-C -1 ; WX 667 ; N Edieresis ; B 86 0 616 901 ;
-C -1 ; WX 278 ; N Igrave ; B -13 0 188 929 ;
-C -1 ; WX 556 ; N adieresis ; B 36 -15 530 706 ;
-C -1 ; WX 778 ; N Ograve ; B 39 -19 739 929 ;
-C -1 ; WX 667 ; N Egrave ; B 86 0 616 929 ;
-C -1 ; WX 667 ; N Ydieresis ; B 14 0 653 901 ;
-C -1 ; WX 737 ; N registered ; B -14 -19 752 737 ;
-C -1 ; WX 778 ; N Otilde ; B 39 -19 739 917 ;
-C -1 ; WX 834 ; N onequarter ; B 73 -19 756 703 ;
-C -1 ; WX 722 ; N Ugrave ; B 79 -19 644 929 ;
-C -1 ; WX 722 ; N Ucircumflex ; B 79 -19 644 929 ;
-C -1 ; WX 667 ; N Thorn ; B 86 0 622 718 ;
-C -1 ; WX 584 ; N divide ; B 39 -19 545 524 ;
-C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ;
-C -1 ; WX 722 ; N Uacute ; B 79 -19 644 929 ;
-C -1 ; WX 778 ; N Ocircumflex ; B 39 -19 739 929 ;
-C -1 ; WX 584 ; N logicalnot ; B 39 108 545 390 ;
-C -1 ; WX 667 ; N Aring ; B 14 0 654 931 ;
-C -1 ; WX 278 ; N idieresis ; B 13 0 266 706 ;
-C -1 ; WX 278 ; N iacute ; B 95 0 292 734 ;
-C -1 ; WX 556 ; N aacute ; B 36 -15 530 734 ;
-C -1 ; WX 584 ; N plusminus ; B 39 0 545 506 ;
-C -1 ; WX 584 ; N multiply ; B 39 0 545 506 ;
-C -1 ; WX 722 ; N Udieresis ; B 79 -19 644 901 ;
-C -1 ; WX 584 ; N minus ; B 39 216 545 289 ;
-C -1 ; WX 333 ; N onesuperior ; B 43 281 222 703 ;
-C -1 ; WX 667 ; N Eacute ; B 86 0 616 929 ;
-C -1 ; WX 667 ; N Acircumflex ; B 14 0 654 929 ;
-C -1 ; WX 737 ; N copyright ; B -14 -19 752 737 ;
-C -1 ; WX 667 ; N Agrave ; B 14 0 654 929 ;
-C -1 ; WX 556 ; N odieresis ; B 35 -14 521 706 ;
-C -1 ; WX 556 ; N oacute ; B 35 -14 521 734 ;
-C -1 ; WX 400 ; N degree ; B 54 411 346 703 ;
-C -1 ; WX 278 ; N igrave ; B -13 0 184 734 ;
-C -1 ; WX 556 ; N mu ; B 68 -207 489 523 ;
-C -1 ; WX 778 ; N Oacute ; B 39 -19 739 929 ;
-C -1 ; WX 556 ; N eth ; B 35 -15 522 737 ;
-C -1 ; WX 667 ; N Adieresis ; B 14 0 654 901 ;
-C -1 ; WX 667 ; N Yacute ; B 14 0 653 929 ;
-C -1 ; WX 260 ; N brokenbar ; B 94 -19 167 737 ;
-C -1 ; WX 834 ; N onehalf ; B 43 -19 773 703 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 250
-
-KPX A y -40
-KPX A w -40
-KPX A v -40
-KPX A u -30
-KPX A Y -100
-KPX A W -50
-KPX A V -70
-KPX A U -50
-KPX A T -120
-KPX A Q -30
-KPX A O -30
-KPX A G -30
-KPX A C -30
-
-KPX B period -20
-KPX B comma -20
-KPX B U -10
-
-KPX C period -30
-KPX C comma -30
-
-KPX D period -70
-KPX D comma -70
-KPX D Y -90
-KPX D W -40
-KPX D V -70
-KPX D A -40
-
-KPX F r -45
-KPX F period -150
-KPX F o -30
-KPX F e -30
-KPX F comma -150
-KPX F a -50
-KPX F A -80
-
-KPX J u -20
-KPX J period -30
-KPX J comma -30
-KPX J a -20
-KPX J A -20
-
-KPX K y -50
-KPX K u -30
-KPX K o -40
-KPX K e -40
-KPX K O -50
-
-KPX L y -30
-KPX L quoteright -160
-KPX L quotedblright -140
-KPX L Y -140
-KPX L W -70
-KPX L V -110
-KPX L T -110
-
-KPX O period -40
-KPX O comma -40
-KPX O Y -70
-KPX O X -60
-KPX O W -30
-KPX O V -50
-KPX O T -40
-KPX O A -20
-
-KPX P period -180
-KPX P o -50
-KPX P e -50
-KPX P comma -180
-KPX P a -40
-KPX P A -120
-
-KPX Q U -10
-
-KPX R Y -50
-KPX R W -30
-KPX R V -50
-KPX R U -40
-KPX R T -30
-KPX R O -20
-
-KPX S period -20
-KPX S comma -20
-
-KPX T y -120
-KPX T w -120
-KPX T u -120
-KPX T semicolon -20
-KPX T r -120
-KPX T period -120
-KPX T o -120
-KPX T hyphen -140
-KPX T e -120
-KPX T comma -120
-KPX T colon -20
-KPX T a -120
-KPX T O -40
-KPX T A -120
-
-KPX U period -40
-KPX U comma -40
-KPX U A -40
-
-KPX V u -70
-KPX V semicolon -40
-KPX V period -125
-KPX V o -80
-KPX V hyphen -80
-KPX V e -80
-KPX V comma -125
-KPX V colon -40
-KPX V a -70
-KPX V O -40
-KPX V G -40
-KPX V A -80
-
-KPX W y -20
-KPX W u -30
-KPX W period -80
-KPX W o -30
-KPX W hyphen -40
-KPX W e -30
-KPX W comma -80
-KPX W a -40
-KPX W O -20
-KPX W A -50
-
-KPX Y u -110
-KPX Y semicolon -60
-KPX Y period -140
-KPX Y o -140
-KPX Y i -20
-KPX Y hyphen -140
-KPX Y e -140
-KPX Y comma -140
-KPX Y colon -60
-KPX Y a -140
-KPX Y O -85
-KPX Y A -110
-
-KPX a y -30
-KPX a w -20
-KPX a v -20
-
-KPX b y -20
-KPX b v -20
-KPX b u -20
-KPX b period -40
-KPX b l -20
-KPX b comma -40
-KPX b b -10
-
-KPX c k -20
-KPX c comma -15
-
-KPX colon space -50
-
-KPX comma quoteright -100
-KPX comma quotedblright -100
-
-KPX e y -20
-KPX e x -30
-KPX e w -20
-KPX e v -30
-KPX e period -15
-KPX e comma -15
-
-KPX f quoteright 50
-KPX f quotedblright 60
-KPX f period -30
-KPX f o -30
-KPX f e -30
-KPX f dotlessi -28
-KPX f comma -30
-KPX f a -30
-
-KPX g r -10
-
-KPX h y -30
-
-KPX k o -20
-KPX k e -20
-
-KPX m y -15
-KPX m u -10
-
-KPX n y -15
-KPX n v -20
-KPX n u -10
-
-KPX o y -30
-KPX o x -30
-KPX o w -15
-KPX o v -15
-KPX o period -40
-KPX o comma -40
-
-KPX oslash z -55
-KPX oslash y -70
-KPX oslash x -85
-KPX oslash w -70
-KPX oslash v -70
-KPX oslash u -55
-KPX oslash t -55
-KPX oslash s -55
-KPX oslash r -55
-KPX oslash q -55
-KPX oslash period -95
-KPX oslash p -55
-KPX oslash o -55
-KPX oslash n -55
-KPX oslash m -55
-KPX oslash l -55
-KPX oslash k -55
-KPX oslash j -55
-KPX oslash i -55
-KPX oslash h -55
-KPX oslash g -55
-KPX oslash f -55
-KPX oslash e -55
-KPX oslash d -55
-KPX oslash comma -95
-KPX oslash c -55
-KPX oslash b -55
-KPX oslash a -55
-
-KPX p y -30
-KPX p period -35
-KPX p comma -35
-
-KPX period space -60
-KPX period quoteright -100
-KPX period quotedblright -100
-
-KPX quotedblright space -40
-
-KPX quoteleft quoteleft -57
-
-KPX quoteright space -70
-KPX quoteright s -50
-KPX quoteright r -50
-KPX quoteright quoteright -57
-KPX quoteright d -50
-
-KPX r y 30
-KPX r v 30
-KPX r u 15
-KPX r t 40
-KPX r semicolon 30
-KPX r period -50
-KPX r p 30
-KPX r n 25
-KPX r m 25
-KPX r l 15
-KPX r k 15
-KPX r i 15
-KPX r comma -50
-KPX r colon 30
-KPX r a -10
-
-KPX s w -30
-KPX s period -15
-KPX s comma -15
-
-KPX semicolon space -50
-
-KPX space quoteleft -60
-KPX space quotedblleft -30
-KPX space Y -90
-KPX space W -40
-KPX space V -50
-KPX space T -50
-
-KPX v period -80
-KPX v o -25
-KPX v e -25
-KPX v comma -80
-KPX v a -25
-
-KPX w period -60
-KPX w o -10
-KPX w e -10
-KPX w comma -60
-KPX w a -15
-
-KPX x e -30
-
-KPX y period -100
-KPX y o -20
-KPX y e -20
-KPX y comma -100
-KPX y a -20
-
-KPX z o -15
-KPX z e -15
-EndKernPairs
-EndKernData
-StartComposites 58
-CC Aacute 2 ; PCC A 0 0 ; PCC acute 167 195 ;
-CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 167 195 ;
-CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 195 ;
-CC Agrave 2 ; PCC A 0 0 ; PCC grave 167 195 ;
-CC Aring 2 ; PCC A 0 0 ; PCC ring 167 175 ;
-CC Atilde 2 ; PCC A 0 0 ; PCC tilde 167 195 ;
-CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 195 0 ;
-CC Eacute 2 ; PCC E 0 0 ; PCC acute 167 195 ;
-CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 167 195 ;
-CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 167 195 ;
-CC Egrave 2 ; PCC E 0 0 ; PCC grave 167 195 ;
-CC Iacute 2 ; PCC I 0 0 ; PCC acute -27 195 ;
-CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex -27 195 ;
-CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis -27 195 ;
-CC Igrave 2 ; PCC I 0 0 ; PCC grave -27 195 ;
-CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 205 195 ;
-CC Oacute 2 ; PCC O 0 0 ; PCC acute 223 195 ;
-CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 223 195 ;
-CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 223 195 ;
-CC Ograve 2 ; PCC O 0 0 ; PCC grave 223 195 ;
-CC Otilde 2 ; PCC O 0 0 ; PCC tilde 223 195 ;
-CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 195 ;
-CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 195 ;
-CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 195 195 ;
-CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 195 195 ;
-CC Ugrave 2 ; PCC U 0 0 ; PCC grave 195 195 ;
-CC Yacute 2 ; PCC Y 0 0 ; PCC acute 167 195 ;
-CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 167 195 ;
-CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 195 ;
-CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ;
-CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ;
-CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ;
-CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ;
-CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ;
-CC atilde 2 ; PCC a 0 0 ; PCC tilde 102 0 ;
-CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 84 0 ;
-CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ;
-CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ;
-CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ;
-CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ;
-CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ;
-CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ;
-CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ;
-CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ;
-CC ntilde 2 ; PCC n 0 0 ; PCC tilde 102 0 ;
-CC oacute 2 ; PCC o 0 0 ; PCC acute 112 0 ;
-CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 112 0 ;
-CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ;
-CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ;
-CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ;
-CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ;
-CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ;
-CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ;
-CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 112 0 ;
-CC ugrave 2 ; PCC u 0 0 ; PCC grave 112 0 ;
-CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ;
-CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ;
-CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ;
-EndComposites
-EndFontMetrics
\ No newline at end of file
diff --git a/models/poll.py b/models/poll.py
index 3fc1f62..1a399f6 100644
--- a/models/poll.py
+++ b/models/poll.py
@@ -14,8 +14,8 @@
 import pytz
 import regex
 from bson import ObjectId
-from utils.afm import AFM
-from pytz import UnknownTimeZoneError
+from matplotlib import rcParams
+from matplotlib.afm import AFM
 from unidecode import unidecode
 
 from essentials.exceptions import *
@@ -28,10 +28,8 @@
 
 # Helvetica is the closest font to Whitney (discord uses Whitney) in afm
 # This is used to estimate text width and adjust the layout of the embeds
-script_dir = os.path.dirname(__file__) #<-- absolute dir the script is in
-rel_path = "phvr8a.afm"
-
-with open(script_dir + "/" + rel_path, 'rb') as fh:
+afm_fname = os.path.join(rcParams['datapath'], 'fonts', 'afm', 'phvr8a.afm')
+with open(afm_fname, 'rb') as fh:
     afm = AFM(fh)
 
 # A-Z Emojis for Discord
diff --git a/pollmaster.icon.webp b/pollmaster.icon.webp
deleted file mode 100644
index 9179aa65028bac417b494f51a79bd4e9d95ea32b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3204
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

diff --git a/pollmaster.jpg b/pollmaster.jpg
deleted file mode 100644
index 2a7079bab94959241505ac2e874ea63c697cc8b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4490
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
P|Mw$6nTF%d-OT?0;7Kz|

diff --git a/requirements.txt b/requirements.txt
index c49e244..13db3ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,6 @@ regex==2020.10.23
 requests==2.24.0
 Unidecode==1.1.1
 websockets==8.1
-python-dotenv==0.20.0
+matplotlib==3.2.1
 multidict==4.5.0
 pymongo==3.11.0
\ No newline at end of file
diff --git a/utils/afm.py b/utils/afm.py
deleted file mode 100644
index 8ee6cd7..0000000
--- a/utils/afm.py
+++ /dev/null
@@ -1,442 +0,0 @@
-from collections import namedtuple
-import logging
-import re
-
-
-_log = logging.getLogger(__name__)
-
-
-def _to_int(x):
-    # Some AFM files have floats where we are expecting ints -- there is
-    # probably a better way to handle this (support floats, round rather than
-    # truncate).  But I don't know what the best approach is now and this
-    # change to _to_int should at least prevent Matplotlib from crashing on
-    # these.  JDH (2009-11-06)
-    return int(float(x))
-
-
-
-def _to_float(x):
-    # Some AFM files use "," instead of "." as decimal separator -- this
-    # shouldn't be ambiguous (unless someone is wicked enough to use "," as
-    # thousands separator...).
-    if isinstance(x, bytes):
-        # Encoding doesn't really matter -- if we have codepoints >127 the call
-        # to float() will error anyways.
-        x = x.decode('latin-1')
-    return float(x.replace(',', '.'))
-
-
-def _to_str(x):
-    return x.decode('utf8')
-
-
-def _to_list_of_ints(s):
-    s = s.replace(b',', b' ')
-    return [_to_int(val) for val in s.split()]
-
-
-def _to_list_of_floats(s):
-    return [_to_float(val) for val in s.split()]
-
-
-def _to_bool(s):
-    if s.lower().strip() in (b'false', b'0', b'no'):
-        return False
-    else:
-        return True
-
-
-def _parse_header(fh):
-    """
-    Read the font metrics header (up to the char metrics) and returns
-    a dictionary mapping *key* to *val*.  *val* will be converted to the
-    appropriate python type as necessary; e.g.:
-        * 'False'->False
-        * '0'->0
-        * '-168 -218 1000 898'-> [-168, -218, 1000, 898]
-    Dictionary keys are
-      StartFontMetrics, FontName, FullName, FamilyName, Weight,
-      ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition,
-      UnderlineThickness, Version, Notice, EncodingScheme, CapHeight,
-      XHeight, Ascender, Descender, StartCharMetrics
-    """
-    header_converters = {
-        b'StartFontMetrics': _to_float,
-        b'FontName': _to_str,
-        b'FullName': _to_str,
-        b'FamilyName': _to_str,
-        b'Weight': _to_str,
-        b'ItalicAngle': _to_float,
-        b'IsFixedPitch': _to_bool,
-        b'FontBBox': _to_list_of_ints,
-        b'UnderlinePosition': _to_float,
-        b'UnderlineThickness': _to_float,
-        b'Version': _to_str,
-        # Some AFM files have non-ASCII characters (which are not allowed by
-        # the spec).  Given that there is actually no public API to even access
-        # this field, just return it as straight bytes.
-        b'Notice': lambda x: x,
-        b'EncodingScheme': _to_str,
-        b'CapHeight': _to_float,  # Is the second version a mistake, or
-        b'Capheight': _to_float,  # do some AFM files contain 'Capheight'? -JKS
-        b'XHeight': _to_float,
-        b'Ascender': _to_float,
-        b'Descender': _to_float,
-        b'StdHW': _to_float,
-        b'StdVW': _to_float,
-        b'StartCharMetrics': _to_int,
-        b'CharacterSet': _to_str,
-        b'Characters': _to_int,
-    }
-    d = {}
-    first_line = True
-    for line in fh:
-        line = line.rstrip()
-        if line.startswith(b'Comment'):
-            continue
-        lst = line.split(b' ', 1)
-        key = lst[0]
-        if first_line:
-            # AFM spec, Section 4: The StartFontMetrics keyword
-            # [followed by a version number] must be the first line in
-            # the file, and the EndFontMetrics keyword must be the
-            # last non-empty line in the file.  We just check the
-            # first header entry.
-            if key != b'StartFontMetrics':
-                raise RuntimeError('Not an AFM file')
-            first_line = False
-        if len(lst) == 2:
-            val = lst[1]
-        else:
-            val = b''
-        try:
-            converter = header_converters[key]
-        except KeyError:
-            _log.error('Found an unknown keyword in AFM header (was %r)' % key)
-            continue
-        try:
-            d[key] = converter(val)
-        except ValueError:
-            _log.error('Value error parsing header in AFM: %s, %s', key, val)
-            continue
-        if key == b'StartCharMetrics':
-            break
-    else:
-        raise RuntimeError('Bad parse')
-    return d
-
-
-CharMetrics = namedtuple('CharMetrics', 'width, name, bbox')
-CharMetrics.__doc__ = """
-    Represents the character metrics of a single character.
-    Notes
-    -----
-    The fields do currently only describe a subset of character metrics
-    information defined in the AFM standard.
-    """
-CharMetrics.width.__doc__ = """The character width (WX)."""
-CharMetrics.name.__doc__ = """The character name (N)."""
-CharMetrics.bbox.__doc__ = """
-    The bbox of the character (B) as a tuple (*llx*, *lly*, *urx*, *ury*)."""
-
-
-def _parse_char_metrics(fh):
-    """
-    Parse the given filehandle for character metrics information and return
-    the information as dicts.
-    It is assumed that the file cursor is on the line behind
-    'StartCharMetrics'.
-    Returns
-    -------
-    ascii_d : dict
-         A mapping "ASCII num of the character" to `.CharMetrics`.
-    name_d : dict
-         A mapping "character name" to `.CharMetrics`.
-    Notes
-    -----
-    This function is incomplete per the standard, but thus far parses
-    all the sample afm files tried.
-    """
-    required_keys = {'C', 'WX', 'N', 'B'}
-
-    ascii_d = {}
-    name_d = {}
-    for line in fh:
-        # We are defensively letting values be utf8. The spec requires
-        # ascii, but there are non-compliant fonts in circulation
-        line = _to_str(line.rstrip())  # Convert from byte-literal
-        if line.startswith('EndCharMetrics'):
-            return ascii_d, name_d
-        # Split the metric line into a dictionary, keyed by metric identifiers
-        vals = dict(s.strip().split(' ', 1) for s in line.split(';') if s)
-        # There may be other metrics present, but only these are needed
-        if not required_keys.issubset(vals):
-            raise RuntimeError('Bad char metrics line: %s' % line)
-        num = _to_int(vals['C'])
-        wx = _to_float(vals['WX'])
-        name = vals['N']
-        bbox = _to_list_of_floats(vals['B'])
-        bbox = list(map(int, bbox))
-        metrics = CharMetrics(wx, name, bbox)
-        # Workaround: If the character name is 'Euro', give it the
-        # corresponding character code, according to WinAnsiEncoding (see PDF
-        # Reference).
-        if name == 'Euro':
-            num = 128
-        elif name == 'minus':
-            num = ord("\N{MINUS SIGN}")  # 0x2212
-        if num != -1:
-            ascii_d[num] = metrics
-        name_d[name] = metrics
-    raise RuntimeError('Bad parse')
-
-
-def _parse_kern_pairs(fh):
-    """
-    Return a kern pairs dictionary; keys are (*char1*, *char2*) tuples and
-    values are the kern pair value.  For example, a kern pairs line like
-    ``KPX A y -50``
-    will be represented as::
-      d[ ('A', 'y') ] = -50
-    """
-
-    line = next(fh)
-    if not line.startswith(b'StartKernPairs'):
-        raise RuntimeError('Bad start of kern pairs data: %s' % line)
-
-    d = {}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        if line.startswith(b'EndKernPairs'):
-            next(fh)  # EndKernData
-            return d
-        vals = line.split()
-        if len(vals) != 4 or vals[0] != b'KPX':
-            raise RuntimeError('Bad kern pairs line: %s' % line)
-        c1, c2, val = _to_str(vals[1]), _to_str(vals[2]), _to_float(vals[3])
-        d[(c1, c2)] = val
-    raise RuntimeError('Bad kern pairs parse')
-
-
-CompositePart = namedtuple('CompositePart', 'name, dx, dy')
-CompositePart.__doc__ = """
-    Represents the information on a composite element of a composite char."""
-CompositePart.name.__doc__ = """Name of the part, e.g. 'acute'."""
-CompositePart.dx.__doc__ = """x-displacement of the part from the origin."""
-CompositePart.dy.__doc__ = """y-displacement of the part from the origin."""
-
-
-def _parse_composites(fh):
-    """
-    Parse the given filehandle for composites information return them as a
-    dict.
-    It is assumed that the file cursor is on the line behind 'StartComposites'.
-    Returns
-    -------
-    dict
-        A dict mapping composite character names to a parts list. The parts
-        list is a list of `.CompositePart` entries describing the parts of
-        the composite.
-    Examples
-    --------
-    A composite definition line::
-      CC Aacute 2 ; PCC A 0 0 ; PCC acute 160 170 ;
-    will be represented as::
-      composites['Aacute'] = [CompositePart(name='A', dx=0, dy=0),
-                              CompositePart(name='acute', dx=160, dy=170)]
-    """
-    composites = {}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        if line.startswith(b'EndComposites'):
-            return composites
-        vals = line.split(b';')
-        cc = vals[0].split()
-        name, _num_parts = cc[1], _to_int(cc[2])
-        pccParts = []
-        for s in vals[1:-1]:
-            pcc = s.split()
-            part = CompositePart(pcc[1], _to_float(pcc[2]), _to_float(pcc[3]))
-            pccParts.append(part)
-        composites[name] = pccParts
-
-    raise RuntimeError('Bad composites parse')
-
-
-def _parse_optional(fh):
-    """
-    Parse the optional fields for kern pair data and composites.
-    Returns
-    -------
-    kern_data : dict
-        A dict containing kerning information. May be empty.
-        See `._parse_kern_pairs`.
-    composites : dict
-        A dict containing composite information. May be empty.
-        See `._parse_composites`.
-    """
-    optional = {
-        b'StartKernData': _parse_kern_pairs,
-        b'StartComposites':  _parse_composites,
-        }
-
-    d = {b'StartKernData': {},
-         b'StartComposites': {}}
-    for line in fh:
-        line = line.rstrip()
-        if not line:
-            continue
-        key = line.split()[0]
-
-        if key in optional:
-            d[key] = optional[key](fh)
-
-    return d[b'StartKernData'], d[b'StartComposites']
-
-
-class AFM:
-
-    def __init__(self, fh):
-        """Parse the AFM file in file object *fh*."""
-        self._header = _parse_header(fh)
-        self._metrics, self._metrics_by_name = _parse_char_metrics(fh)
-        self._kern, self._composite = _parse_optional(fh)
-
-    def get_bbox_char(self, c, isord=False):
-        if not isord:
-            c = ord(c)
-        return self._metrics[c].bbox
-
-    def string_width_height(self, s):
-        """
-        Return the string width (including kerning) and string height
-        as a (*w*, *h*) tuple.
-        """
-        if not len(s):
-            return 0, 0
-        total_width = 0
-        namelast = None
-        miny = 1e9
-        maxy = 0
-        for c in s:
-            if c == '\n':
-                continue
-            wx, name, bbox = self._metrics[ord(c)]
-
-            total_width += wx + self._kern.get((namelast, name), 0)
-            l, b, w, h = bbox
-            miny = min(miny, b)
-            maxy = max(maxy, b + h)
-
-            namelast = name
-
-        return total_width, maxy - miny
-
-    def get_name_char(self, c, isord=False):
-        """Get the name of the character, i.e., ';' is 'semicolon'."""
-        if not isord:
-            c = ord(c)
-        return self._metrics[c].name
-
-    def get_width_char(self, c, isord=False):
-        """
-        Get the width of the character from the character metric WX field.
-        """
-        if not isord:
-            c = ord(c)
-        return self._metrics[c].width
-
-    def get_width_from_char_name(self, name):
-        """Get the width of the character from a type1 character name."""
-        return self._metrics_by_name[name].width
-
-    def get_height_char(self, c, isord=False):
-        """Get the bounding box (ink) height of character *c* (space is 0)."""
-        if not isord:
-            c = ord(c)
-        return self._metrics[c].bbox[-1]
-
-    def get_kern_dist(self, c1, c2):
-        """
-        Return the kerning pair distance (possibly 0) for chars *c1* and *c2*.
-        """
-        name1, name2 = self.get_name_char(c1), self.get_name_char(c2)
-        return self.get_kern_dist_from_name(name1, name2)
-
-    def get_kern_dist_from_name(self, name1, name2):
-        """
-        Return the kerning pair distance (possibly 0) for chars
-        *name1* and *name2*.
-        """
-        return self._kern.get((name1, name2), 0)
-
-    def get_fontname(self):
-        """Return the font name, e.g., 'Times-Roman'."""
-        return self._header[b'FontName']
-
-    @property
-    def postscript_name(self):  # For consistency with FT2Font.
-        return self.get_fontname()
-
-    def get_fullname(self):
-        """Return the font full name, e.g., 'Times-Roman'."""
-        name = self._header.get(b'FullName')
-        if name is None:  # use FontName as a substitute
-            name = self._header[b'FontName']
-        return name
-
-    def get_familyname(self):
-        """Return the font family name, e.g., 'Times'."""
-        name = self._header.get(b'FamilyName')
-        if name is not None:
-            return name
-
-        # FamilyName not specified so we'll make a guess
-        name = self.get_fullname()
-        extras = (r'(?i)([ -](regular|plain|italic|oblique|bold|semibold|'
-                  r'light|ultralight|extra|condensed))+$')
-        return re.sub(extras, '', name)
-
-    @property
-    def family_name(self):
-        """The font family name, e.g., 'Times'."""
-        return self.get_familyname()
-
-    def get_weight(self):
-        """Return the font weight, e.g., 'Bold' or 'Roman'."""
-        return self._header[b'Weight']
-
-    def get_angle(self):
-        """Return the fontangle as float."""
-        return self._header[b'ItalicAngle']
-
-    def get_capheight(self):
-        """Return the cap height as float."""
-        return self._header[b'CapHeight']
-
-    def get_xheight(self):
-        """Return the xheight as float."""
-        return self._header[b'XHeight']
-
-    def get_underline_thickness(self):
-        """Return the underline thickness as float."""
-        return self._header[b'UnderlineThickness']
-
-    def get_horizontal_stem_width(self):
-        """
-        Return the standard horizontal stem width as float, or *None* if
-        not specified in AFM file.
-        """
-        return self._header.get(b'StdHW', None)
-
-    def get_vertical_stem_width(self):
-        """
-        Return the standard vertical stem width as float, or *None* if
-        not specified in AFM file.
-        """
-        return self._header.get(b'StdVW', None)
\ No newline at end of file