From 7c18978c549b2e43254d04ef2222bdfa164ac8a3 Mon Sep 17 00:00:00 2001
From: 64617 <45166288+64617@users.noreply.github.com>
Date: Mon, 9 May 2022 10:51:27 +0800
Subject: [PATCH 1/5] default comment sorts to new

---
 files/classes/submission.py | 3 ++-
 files/routes/posts.py       | 2 +-
 files/templates/submit.html | 7 +------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index ed9e0e860..c1000cbe7 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -65,6 +65,7 @@ class Submission(Base):
 
 	def __init__(self, *args, **kwargs):
 		if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
+		if 'new' in kwargs: kwargs['new'] = True # Always default to sort by new
 		super().__init__(*args, **kwargs)
 
 	def __repr__(self):
@@ -485,4 +486,4 @@ class Submission(Base):
 		return False
 
 	@lazy
-	def active_flags(self, v): return len(self.flags(v))
\ No newline at end of file
+	def active_flags(self, v): return len(self.flags(v))
diff --git a/files/routes/posts.py b/files/routes/posts.py
index ae8e681d7..786e5b8d6 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -1112,7 +1112,7 @@ def submit_post(v, sub=None):
 		club=club,
 		author_id=v.id,
 		over_18=bool(request.values.get("over_18","")),
-		new=bool(request.values.get("new","")),
+		new=True,  # always sort as new by default
 		app_id=v.client.application.id if v.client else None,
 		is_bot = is_bot,
 		url=url,
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 30e69e235..d173d2dc3 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -166,11 +166,6 @@
 														<label class="custom-control-label" for="followers">Notify followers</label>
 												</div>
 
-												<div class="custom-control custom-checkbox">
-													<input autocomplete="off" type="checkbox" class="custom-control-input" id="new" name="new">
-													<label class="custom-control-label" for="new">Make the default comment sorting "new"</label>
-												</div>
-
 												<div class="custom-control custom-checkbox">
 														<input autocomplete="off" type="checkbox" class="custom-control-input" id="nsfw" name="over_18">
 														<label class="custom-control-label" for="nsfw">+18</label>
@@ -236,4 +231,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

From 0a37be80208d347e328badceddbe00ab630e2177 Mon Sep 17 00:00:00 2001
From: 64617 <45166288+64617@users.noreply.github.com>
Date: Mon, 9 May 2022 10:58:22 +0800
Subject: [PATCH 2/5] use default value instead of editing kwargs

---
 files/classes/submission.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index c1000cbe7..a13b442ce 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -51,7 +51,7 @@ class Submission(Base):
 	flair = Column(String)
 	ban_reason = Column(String)
 	embed_url = Column(String)
-	new = Column(Boolean)
+	new = Column(Boolean, default=True)
 
 	author = relationship("User", primaryjoin="Submission.author_id==User.id")
 	oauth_app = relationship("OauthApp", viewonly=True)
@@ -65,7 +65,6 @@ class Submission(Base):
 
 	def __init__(self, *args, **kwargs):
 		if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
-		if 'new' in kwargs: kwargs['new'] = True # Always default to sort by new
 		super().__init__(*args, **kwargs)
 
 	def __repr__(self):

From 19d54d8521c4338c4f487877f7291177fa5fed9c Mon Sep 17 00:00:00 2001
From: 64617 <45166288+64617@users.noreply.github.com>
Date: Mon, 9 May 2022 10:59:14 +0800
Subject: [PATCH 3/5] default user settings to sort all posts && comments by
 new

---
 files/classes/user.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 7913f0b41..78f5d8f0b 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -113,8 +113,8 @@ class User(Base):
 	mfa_secret = deferred(Column(String))
 	is_private = Column(Boolean, default=False)
 	stored_subscriber_count = Column(Integer, default=0)
-	defaultsortingcomments = Column(String, default="top")
-	defaultsorting = Column(String, default="hot")
+	defaultsortingcomments = Column(String, default="new")
+	defaultsorting = Column(String, default="new")
 	defaulttime = Column(String, default=defaulttimefilter)
 	is_nofollow = Column(Boolean, default=False)
 	custom_filter_list = Column(String)
@@ -636,4 +636,4 @@ class User(Base):
 	def filter_words(self):
 		l = [i.strip() for i in self.custom_filter_list.split('\n')] if self.custom_filter_list else []
 		l = [i for i in l if i]
-		return l
\ No newline at end of file
+		return l

From f6cc00ea1fbd2802b8eecc2484ede4eda179fa1a Mon Sep 17 00:00:00 2001
From: 64617 <45166288+64617@users.noreply.github.com>
Date: Mon, 9 May 2022 11:03:52 +0800
Subject: [PATCH 4/5] don't change noeol in files to make the PR cleaner

---
 files/classes/submission.py | 2 +-
 files/classes/user.py       | 2 +-
 files/templates/submit.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index a13b442ce..9208c3e99 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -485,4 +485,4 @@ class Submission(Base):
 		return False
 
 	@lazy
-	def active_flags(self, v): return len(self.flags(v))
+	def active_flags(self, v): return len(self.flags(v))
\ No newline at end of file
diff --git a/files/classes/user.py b/files/classes/user.py
index 78f5d8f0b..9af7c5be5 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -636,4 +636,4 @@ class User(Base):
 	def filter_words(self):
 		l = [i.strip() for i in self.custom_filter_list.split('\n')] if self.custom_filter_list else []
 		l = [i for i in l if i]
-		return l
+		return l
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index d173d2dc3..c2c97ac09 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -231,4 +231,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 8dc3be28fcdc13b6542a0e3035833adb293aa62f Mon Sep 17 00:00:00 2001
From: 64617 <45166288+64617@users.noreply.github.com>
Date: Mon, 9 May 2022 11:11:54 +0800
Subject: [PATCH 5/5] dont force users who dont want `new` to switch sorting
 every time they open a page (Is this the intended behaviour?)

---
 files/classes/submission.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index 9208c3e99..4a135266a 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -51,7 +51,7 @@ class Submission(Base):
 	flair = Column(String)
 	ban_reason = Column(String)
 	embed_url = Column(String)
-	new = Column(Boolean, default=True)
+	new = Column(Boolean, default=False)
 
 	author = relationship("User", primaryjoin="Submission.author_id==User.id")
 	oauth_app = relationship("OauthApp", viewonly=True)