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

docker-compose.yml

@@ -27,7 +27,7 @@ services:
 
   postgres:
     image: postgres:12.3
-    command: ["postgres", "-c", "log_statement=all"]
+    #command: ["postgres", "-c", "log_statement=all"]
     # uncomment this if u wanna output all SQL queries to the console
     volumes:
       - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql"

files/helpers/cron.py

@@ -21,20 +21,17 @@ def cron(every_5m, every_1h, every_1d, every_1mo):
 	if every_5m:
 		lottery.check_if_end_lottery_task()
 		offsitementions.offsite_mentions_task()
-		g.db.commit()
 
 	if every_1h:
-		pass
+		awards.award_timers_bots_task()
 
 	if every_1d:
 		stats.generate_charts_task(const.SITE)
 		route_static.stats_cached()
-		awards.award_timers_bots_task()
 		sub_inactive_purge_task()
-		g.db.commit()
 
 	if every_1mo:
 		give_monthly_marseybux_task()
-		g.db.commit()
 
-	g.db.close()
+	g.db.commit()
+	g.db.close()

files/templates/header.html

@@ -158,7 +158,7 @@
 				</li>
 			
 				<li class="nav-item d-flex align-items-center justify-content-center text-center">
-					<div class="dropdown">
+					<div class="dropdown" id="header--dropdown">
 						<a class="nav-link bg-transparent py-0 pr-0" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown"
 						aria-haspopup="true" aria-expanded="false">
 						<div class="d-flex">
@@ -177,7 +177,7 @@
 							</div>
 						</div>
 					</a>
-					<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg-left shadow fade px-0">
+					<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg-left shadow fade px-0" id="header--dropdown-menu">
 					<div class="px-2">
 						<a class="dropdown-item" href="{{v.url}}"><i class="fas fa-user-circle fa-fw mr-3"></i>My
 							profile</a>

files/templates/util/assetcache.html

@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 365,
+	'css/main.css': 366,
 
 	'css/4chan.css': 61,
 	'css/classic.css': 61,
@@ -22,7 +22,7 @@ set CACHE_VER = {
 	'js/emoji_modal.js': 297,
 	'js/formatting.js': 240,
 	'js/lottery.js': 256,
-	'js/marked.js': 273,
+	'js/marked.js': 274,
 	'js/submit.js': 263,
 	'js/userpage.js': 241,
 	'js/userpage_v.js': 245,

schema.sql

@@ -733,7 +733,7 @@ CREATE TABLE public.users (
     can_gamble boolean DEFAULT true NOT NULL,
     offsitementions boolean DEFAULT false NOT NULL,
     last_active integer DEFAULT 0 NOT NULL,
-    poorcel boolean NOT NULL
+    poorcel boolean DEFAULT false NOT NULL
 );