remove discrim and school week

Author: SharpBit

core/routes.py

@@ -1,17 +1,12 @@
 import asyncio
 import random
-import smtplib
 import string
-from datetime import date
-from email.message import EmailMessage
-from email.mime.text import MIMEText
 
 from sanic import Blueprint, response
 from sanic.exceptions import Forbidden, NotFound, ServerError
 from sanic.request import Request
 
-from core.utils import (add_message, disable_xss, get_school_week,
-                        login_required, open_db_connection, render_template)
+from core.utils import add_message, disable_xss, login_required, open_db_connection, render_template
 
 root = Blueprint('root')
 
@@ -53,15 +48,15 @@ async def callback(request: Request):
     if user.get('avatar'):
         avatar = f"https://cdn.discordapp.com/avatars/{user['id']}/{user['avatar']}.png"
     else:  # in case of default avatar users
-        avatar = f"https://cdn.discordapp.com/embed/avatars/{user['discriminator'] % 5}.png"
+        avatar = f"https://cdn.discordapp.com/embed/avatars/{random.randint(0, 5)}.png"
 
     async with open_db_connection(request.app) as conn:
         await conn.executemany(
-            '''INSERT INTO users(id, name, discrim, avatar) VALUES ($1, $2, $3, $4)
-            ON CONFLICT (id) DO UPDATE SET id=$1, name=$2, discrim=$3, avatar=$4''',
+            '''INSERT INTO users(id, name, avatar) VALUES ($1, $2, $3)
+            ON CONFLICT (id) DO UPDATE SET id=$1, name=$2, avatar=$3''',
             [
-                (user['id'], user['username'], user['discriminator'], avatar),
-                (user['id'], user['username'], user['discriminator'], avatar)
+                (user['id'], user['username'], avatar),
+                (user['id'], user['username'], avatar)
             ]
         )
 
@@ -182,72 +177,3 @@ async def brawlstats_tests_proxy(request: Request, endpoint: str):
             return response.json(await resp.json(), status=resp.status)
     except asyncio.TimeoutError:
         raise ServerError('Request failed', status_code=503)
-
-@root.get('/schoolweek')
-async def schoolweektoday(request: Request):
-    return response.redirect(f'/schoolweek/{date.today()}')
-
-@root.get('/schoolweek/<requested_date_str>')
-async def schoolweek(request: Request, requested_date_str: str):
-    requested_date = date(*map(int, requested_date_str.split('-')))
-    first_day = date(2020, 9, 8)
-    if not first_day <= requested_date <= date(2021, 3, 11):
-        raise NotFound(f'Requested URL {request.path} not found. Maybe try a date between 9/8/2020 and 3/11/2021?')
-
-    week_fmt = await get_school_week(requested_date, first_day, week=True)
-
-    return await render_template(
-        template='schoolweek',
-        request=request,
-        week=week_fmt,
-        requested_date=requested_date,
-        title='School Week',
-        description='This week\'s maroon and gray A and B days.'
-    )
-
-
-@root.post('/schoolweek/subscribe')
-# @authorized()
-async def email_subscribe(request):
-    try:
-        email = request.form['email'][0]
-    except KeyError:
-        return add_message(request, 'error', 'Enter an email in the field.', '/schoolweek')
-
-    async with open_db_connection(request.app) as conn:
-        existing = await conn.fetchrow('SELECT * FROM mailing_list WHERE email = $1', email)
-        if existing:
-            return add_message(request, 'error', 'Email already subscribed.', '/schoolweek')
-
-    msg = EmailMessage()
-    msg['Subject'] = 'Thank you for subscribing to GCHS Daily Updates!'
-    msg['From'] = request.app.config.CUSTOM_EMAIL
-    msg['To'] = email
-    secure = 's' if not request.app.config.DEV else ''
-    body = MIMEText(
-        f"If this wasn't you, click <a href=\"http{secure}://{request.app.config.DOMAIN}"
-        f"/schoolweek/unsubscribe/{email}\">here</a> to unsubscribe.", 'html')
-    msg.set_content(body)
-
-    with smtplib.SMTP_SSL('smtp.gmail.com', 465) as smtp:
-        smtp.login(request.app.config.NOREPLY_EMAIL, request.app.config.EMAIL_APP_PASSWORD)
-
-        smtp.send_message(msg)
-
-    async with open_db_connection(request.app) as conn:
-        await conn.execute('INSERT INTO mailing_list(email) VALUES ($1)', email)
-
-    return add_message(request, 'success', 'Your email has been added to the mailing list.', '/schoolweek')
-
-@root.get('/schoolweek/unsubscribe/<email>')
-async def email_unsubscribe(request, email):
-    async with open_db_connection(request.app) as conn:
-        await conn.execute('DELETE FROM mailing_list WHERE email = $1', email)
-    return add_message(request, 'success', 'Your email has been removed from mailing list.', '/schoolweek')
-
-@root.get('/japanese-conjugation-practice')
-async def jap_conj(request):
-    return await render_template(
-        template='jap-conj',
-        request=request
-    )

core/templates/layout.html

@@ -45,7 +45,7 @@
               {% if logged_in %}
                 <div class="dropdown">
                   <button class="btn dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-                    <img src="{{ avatar }}" style="border-radius: 50%;" alt="avatar" height="25" width="25">    {{ username }}#{{ discrim }}
+                    <img src="{{ avatar }}" style="border-radius: 50%;" alt="avatar" height="25" width="25">    {{ username }}
                   </button>
                   <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                     <a class="dropdown-item" href="/dashboard">Dashboard</a>

core/utils.py

@@ -1,13 +1,5 @@
-import asyncio
-import smtplib
-import traceback
 from aiohttp import ClientSession
 from contextlib import asynccontextmanager
-from datetime import date, datetime
-from datetime import time as dt_time
-from datetime import timedelta
-from email.message import EmailMessage
-from email.mime.text import MIMEText
 from functools import wraps
 
 import asyncpg
@@ -96,7 +88,6 @@ async def render_template(template: str, request: Request, **context) -> HTTPRes
             user = await conn.fetchrow('SELECT * FROM users WHERE id = $1', request.ctx.session['id'])
         context['avatar'] = user['avatar']
         context['username'] = user['name']
-        context['discrim'] = user['discrim']
     context['messages'] = request.ctx.session['messages']
 
     html_content = template.render(**context)
@@ -132,167 +123,3 @@ async def decorated_function(request, *args, **kwargs):
             return response.json({'error': True, 'message': 'Unauthorized'}, status=401)
         return decorated_function
     return decorator
-
-
-def daterange(start_date: date, end_date: date) -> list:
-    """Creates a list of dates from the start date to end date, inclusive"""
-    day_count = (end_date - start_date).days + 1
-    return [start_date + timedelta(days=i) for i in range(day_count)]
-
-def thisweek(today: date) -> list:
-    """Gets a list of dates for this week"""
-    if 0 <= today.weekday() <= 4:
-        # Monday to Friday
-        monday = today - timedelta(days=today.weekday())  # Last Monday
-    else:
-        monday = today - timedelta(days=today.weekday() - 7)
-    friday = monday + timedelta(days=4)
-
-    return daterange(monday, friday)
-
-async def get_school_week(requested_date: date, first_day: date, week=True):
-    no_school = [
-        date(2020, 9, 28),  # Yom Kippur
-        date(2020, 10, 12),  # Columbus day
-        date(2020, 11, 3),  # Election day
-        date(2020, 11, 11),  # Veteran's day
-        *daterange(date(2020, 11, 25), date(2020, 11, 27)),  # Thanksgiving break
-        *daterange(date(2020, 12, 24), date(2021, 1, 1)),  # Holiday break
-        date(2021, 1, 18),  # Martin Luther King Day
-        *daterange(date(2021, 2, 15), date(2021, 2, 19))  # Winter break
-    ]
-    special_days = [
-        date(2020, 10, 2),
-        date(2021, 2, 1),  # Snow day 2 (first snow day didn't affect A/B days)
-        date(2021, 2, 9),  # Idk why they messed up the days in the first place only to mess it up to "fix" it again
-        date(2021, 2, 24),  # dumb schedule again
-        date(2021, 3, 12)  # no more hybrid schedule, just fix the last day of the week
-    ]
-
-    all_days = []
-    day_map = {
-        1: 'A',
-        0: 'B'
-    }
-
-    next_friday = thisweek(requested_date)[-1]
-    elapsed_dates = daterange(first_day, next_friday)
-    mondays = [d for d in elapsed_dates if d.weekday() == 0 and d not in no_school]
-    cohort_day = 'maroon'
-
-    for d in elapsed_dates:
-        if d in no_school:
-            continue
-        dow = d.weekday()
-        if dow in (5, 6):
-            continue
-        if dow in (1, 3):
-            cohort_day = 'maroon'
-        elif dow in (2, 4):
-            cohort_day = 'gray'
-        elif dow == 0:
-            # Mondays
-            if d not in mondays:
-                continue
-            if mondays.index(d) % 2 == 0:
-                cohort_day = 'maroon'
-            else:
-                cohort_day = 'gray'
-
-        try:
-            prev_day = [day for day in all_days if day['cohort'] == cohort_day][-1]['day']
-        except IndexError:
-            # We are adding 1 for the first day of each cohort so we "start" with a B (0) day
-            prev_day = 0
-
-        if d in special_days:
-            # Skip a day
-            all_days.append({
-                'cohort': cohort_day,
-                'date': d,
-                'day': prev_day + 2})
-        else:
-            all_days.append({
-                'cohort': cohort_day,
-                'date': d,
-                'day': prev_day + 1})
-
-    this_week = thisweek(requested_date)
-
-    if week:
-        week_fmt = []
-        for day in this_week:
-            try:
-                day_info = list(filter(lambda d: d['date'] == day, all_days))[0]
-            except IndexError:
-                week_fmt.append(f"{day.strftime('%a %m/%d')}<br>NO SCHOOL")
-            else:
-                week_fmt.append(
-                    f"{day.strftime('%a %m/%d')}<br>{day_info['cohort'].title()} {day_map[day_info['day'] % 2]} day"
-                )
-        return week_fmt
-
-    try:
-        day_info = list(filter(lambda d: d['date'] == requested_date, all_days))[0]
-    except IndexError:
-        # No school
-        return None
-    day_info['day'] = day_map[day_info['day'] % 2]
-    return day_info
-
-async def handle_daily_emails(app):
-    """Send out an email at a specified time every weekday"""
-    today = date.today()
-    # Saturday/Sunday
-    if today.weekday() in (5, 6):
-        today = today - timedelta(days=today.weekday() - 7)  # Not actually today, next monday
-    next_email = datetime.combine(today, dt_time(7, 0, 0))
-
-    # Past the time today, send "tomorrow"
-    if next_email < datetime.now():
-        next_email = datetime.combine(today + timedelta(days=1), dt_time(7, 0, 0))
-
-    delta = (next_email - datetime.now()).seconds
-    await asyncio.sleep(delta)
-
-    today = date.today()  # next day after sleeping
-    if today.weekday() in (5, 6):
-        # Could be here if the func was called after the time on Friday
-        return app.add_task(handle_daily_emails)
-
-    today_info = await get_school_week(today, date(2020, 9, 8), week=False)
-    if today_info is None:
-        # No school
-        await asyncio.sleep(1)
-        return app.add_task(handle_daily_emails)
-
-    async with open_db_connection(app) as conn:
-        emails = await conn.fetch('SELECT * FROM mailing_list')
-
-    messages = []
-    for email in emails:
-        msg = EmailMessage()
-        msg['Subject'] = f"GCHS Daily Email Notification  for {today.strftime('%m/%d/%Y')}"
-        msg['From'] = app.config.CUSTOM_EMAIL
-        msg['To'] = email
-        body = MIMEText(
-            f"Today, {today.strftime('%m/%d/%Y')}, is a {today_info['cohort'].title()} {today_info['day']} day.<br><br>"
-            f"Click <a href=\"http{'s' if not app.config.DEV else ''}://{app.config.DOMAIN}"
-            f"/schoolweek/unsubscribe/{msg['To']}\">here</a> to unsubscribe.", 'html')
-
-        msg.set_content(body)
-        messages.append(msg)
-
-    with smtplib.SMTP_SSL('smtp.gmail.com', 465) as smtp:
-        try:
-            smtp.login(app.config.NOREPLY_EMAIL, app.config.EMAIL_APP_PASSWORD)
-        except smtplib.SMTPAuthenticationError:
-            # Prevent failure of email scheduling if Google's servers crash (like on 12/14/20)
-            print(traceback.format_exc())
-        else:
-            for msg in messages:
-                smtp.send_message(msg)
-
-    # Prevent it from sending twice
-    await asyncio.sleep(1)
-    app.add_task(handle_daily_emails)