Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   analyze:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout repository

Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update && apt -y upgrade && apt install -y supervisor python3-pip libenchant1c2a ffmpeg postgresql libpq-dev
+RUN apt update && apt -y upgrade && apt install -y supervisor python3-pip ffmpeg postgresql libpq-dev
 
 COPY supervisord.conf /etc/supervisord.conf
 

files/assets/css/main.css

@@ -3425,7 +3425,10 @@ small, .small {
 .profile-pic-65-wrapper  { width:  65px; height:  65px; }
 .profile-pic-75-wrapper  { width:  75px; height:  75px; }
 .profile-pic-100-wrapper { width: 100px; height: 100px; }
-.profile-pic-20-hat  { width:  20px; }
+.profile-pic-20-hat  {
+	width:  20px;
+	bottom: -2.5px;
+}
 .profile-pic-30-hat  { width:  30px; }
 .profile-pic-35-hat  { width:  35px; }
 .profile-pic-50-hat  { width:  50px; }

files/helpers/wrappers.py

@@ -80,7 +80,7 @@ def get_logged_in_user():
 	if v: v.poor = session.get('poor')
 
 	if AEVANN_ID and request.headers.get("Cf-Ipcountry") == 'EG':
-		if v and v.id != AEVANN_ID:
+		if v and not v.username.startswith('Aev'):
 			with open(f"/eg", "r+", encoding="utf-8") as f:
 				ip = request.headers.get('CF-Connecting-IP')
 				if f'@{v.username}, ' not in f.read():

files/routes/comments.py

@@ -20,12 +20,9 @@ import requests
 from shutil import copyfile
 from json import loads
 from collections import Counter
-from enchant import Dict
 import gevent
 import os
 
-d = Dict("en_US")
-
 WORDLE_COLOR_MAPPINGS = {-1: "🟥", 0: "🟨", 1: "🟩"}
 
 @app.get("/comment/<cid>")
@@ -1017,7 +1014,7 @@ def handle_wordle_action(cid, v):
 	try: guess = request.values.get("thing").strip().lower()
 	except: abort(400)
 
-	if len(guess) != 5 or not d.check(guess) and guess not in WORDLE_LIST:
+	if len(guess) != 5:
 		return {"error": "Not a valid guess!"}, 400
 
 	if status == "active":

files/templates/util/assetcache.html

@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 4012,
+	'css/main.css': 4013,
 	'css/catalog.css': 4002,
 	'css/4chan.css': 4002,
 	'css/classic.css': 4002,

requirements.txt

@@ -26,7 +26,6 @@ tldextract
 user-agents
 psycopg2-binary
 pusher_push_notifications
-pyenchant
 pytest
 youtube-dl
 yattag

ubuntu_setup.sh

@@ -4,7 +4,7 @@
 # reboot
 apt -y update
 apt -y upgrade
-apt -y install git redis-server python3-pip libenchant1c2a ffmpeg tmux nginx snapd ufw gpg-agent htop
+apt -y install git redis-server python3-pip ffmpeg tmux nginx snapd ufw gpg-agent htop
 
 git config --global credential.helper store
 cd /rDrama