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

files/classes/comment.py

@@ -356,13 +356,14 @@ class Comment(Base):
 
 			if v and v.shadowbanned and v.id == self.author_id and 86400 > time.time() - self.created_utc > 60:
 				ti = max(int((time.time() - self.created_utc)/60), 1)
-				maxupvotes = min(ti, 31)
+				maxupvotes = min(ti, 6)
 				rand = randint(0, maxupvotes)
 				if self.upvotes < rand:
-					amount = randint(0, 3)
-					self.upvotes += amount
-					g.db.add(self)
-					g.db.commit()
+					amount = randint(0, 1)
+					if amount == 1:
+						self.upvotes += amount
+						g.db.add(self)
+						g.db.commit()
 
 		for c in self.options:
 			body += f'<div class="custom-control"><input type="checkbox" class="custom-control-input" id="{c.id}" name="option"'

files/classes/submission.py

@@ -373,14 +373,15 @@ class Submission(Base):
 
 		if v and v.shadowbanned and v.id == self.author_id and 86400 > time.time() - self.created_utc > 20:
 			ti = max(int((time.time() - self.created_utc)/60), 1)
-			maxupvotes = min(ti, 27)
+			maxupvotes = min(ti, 7)
 			rand = random.randint(0, maxupvotes)
 			if self.upvotes < rand:
-				amount = random.randint(0, 3)
-				self.views += amount*random.randint(3, 5)
-				self.upvotes += amount
-				g.db.add(self)
-				g.db.commit()
+				amount = random.randint(0, 1)
+				if amount == 1:
+					self.views += amount*random.randint(3, 5)
+					self.upvotes += amount
+					g.db.add(self)
+					g.db.commit()
 
 		for c in self.options:
 			body += f'<div class="custom-control"><input type="checkbox" class="custom-control-input" id="{c.id}" name="option"'

files/classes/user.py

@@ -215,7 +215,7 @@ class User(Base):
 
 		return g.db.query(UserBlock).filter(
 			or_(and_(UserBlock.user_id == self.id, UserBlock.target_id == other.id), and_(
-				UserBlock.user_id == other.id, UserBlock.target_id == self.id))).one_or_none()
+				UserBlock.user_id == other.id, UserBlock.target_id == self.id))).first()
 
 	def validate_2fa(self, token):
 

files/classes/wordle.py

@@ -1,4 +1,5 @@
 import random
+from os import environ
 
 def format_guesses(guesses):
     return " -> ".join(guesses)
@@ -9,7 +10,7 @@ def format_all(guesses, status, answer):
 
 class Wordle:
     def __init__(self, g):
-        self.word_list = ['tariq', 'sneed', 'drama', 'chuck', 'bussy', 'which', 'their', 'would', 'there', 'could', 'other', 'about', 'great', 'these', 'after', 'first', 'never', 'where', 'those', 'shall', 'being', 'might', 'every', 'think', 'under', 'found', 'still', 'while', 'again', 'place', 'young', 'years', 'three', 'right', 'house', 'whole', 'world', 'thing', 'night', 'going', 'heard', 'heart', 'among', 'asked', 'small', 'woman', 'whose', 'quite', 'words', 'given', 'taken', 'hands', 'until', 'since', 'light']
+        self.word_list = environ.get('WORDLE').split(' ')
         self.command_word = "!wordle"
         self.db = g.db
 
@@ -29,11 +30,6 @@ class Wordle:
             guesses = []
         count = len(guesses)
 
-        if (guess.lower() == answer):
-            status = "won"
-        elif (count == 5):
-            status = "lost"
-
         if (guess != None and len(guess) == 5 and status == "active"):
             result = ["🟥"]*5
             pos = 0 # letter position
@@ -49,4 +45,8 @@ class Wordle:
                 pos += 1 # add 1 to the letter position
             guesses.append("/".join(result))
             
+
+        if (guess.lower() == answer): status = "won"
+        elif (count == 5): status = "lost"
+
         from_comment.wordle_result = format_all(guesses, status, answer)

schema.sql

@@ -300,8 +300,13 @@ CREATE TABLE public.comments (
     ghost boolean,
     slots_result character varying(32),
     blackjack_result character varying(855),
+<<<<<<< HEAD
     treasure_amount character varying(10),
     wordle_result character varying(97)
+=======
+    wordle_result character varying(3000),
+    treasure_amount character varying(10)
+>>>>>>> a8b07ed2052cb58cda182e2567efde8d9fdf4aca
 );
 
 

snappy_Drama.txt

@@ -3417,4 +3417,8 @@ Stay freaky & respectful friends! 😈💁🏽‍♂️
 I've read it and to put it simply: I'm disgusted by some of the text. And especially when it was revealed that the alt-right "drama" website was involved in the research, my suspicions came true. The text is nothing but smelling coming from some pretentious intellectual dark web teenager fan-fiction writer. Unfortunately.
 
 {[para]}
-I have over 40 videos up loaded of Japanese women pooping and having diarrhea in their pants or in the toilet! Email me for more!!
+I have over 40 videos up loaded of Japanese women pooping and having diarrhea in their pants or in the toilet! Email me for more!!
+{[para]}
+When my girlfriend finally asked what my more extreme opinions were a while back because she knew I harboured them, I finally went on a calm but well articulated rant about Jews and diversity for maybe an hour and a half, she just listened. Showed her a 25 minute documentary explaining in detail all the good Hitler did for Germany and why he was loved. Overall I spoke for about two hours on my belief in segregation, black crime stats, race and IQ differences, the ruling Jews who push everything, child abandonment by race, spousal abusive rates by race, my hate and disgust with LGBTQ culture and more not knowing if she would hate me and leave.
+
+Fast forward, she is insanely intoxicated with me, hints and outright says frequently she wants lots of kids with me, wants to embrace traditional roles, church, all of that. So I assume being a strong man firm in your beliefs and being able to explain those beliefs well and guide others makes women’s eggs ache