Merge pull request #33 from Aevann1/highlight2

Highlight2

files/classes/submission.py

@@ -134,7 +134,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
 
 		return f"/post/{self.id}/{output}"
 
-	def rendered_page(self, read=None, sort=None, comment=None, comment_info=None, v=None):
+	def rendered_page(self, sort=None, last_view_utc=None, comment=None, comment_info=None, v=None):
 
 		# check for banned
 		if v and (v.admin_level >= 3 or self.author_id == v.id):
@@ -153,8 +153,8 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
 		return render_template(template,
 							   v=v,
 							   p=self,
+							   last_view_utc=last_view_utc,
 							   sort=sort,
-							   read=read,
 							   linked_comment=comment,
 							   comment_info=comment_info,
 							   render_replies=True,

files/routes/posts.py

@@ -181,11 +181,18 @@ def post_id(pid, anything=None, v=None):
 
 		post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)]
 
-	if session.get("read_comments"): read = list(set(session.get("read_comments")))
-	else: read = None
-	read_comments = [x.id for x in post.preloaded_comments]
-	if read: session["read_comments"] += read_comments
-	else: session["read_comments"] = read_comments
+	# if session.get("read_comments"): read = list(set(session.get("read_comments")))
+	# else: read = None
+
+	# unread comment highlight
+	last_view_utc = session.get(str(post.id))
+
+	if last_view_utc:
+		last_view_utc = int(last_view_utc)
+
+	session[str(post.id)] = int(time.time())
+
+	#read_comments = [x.id for x in post.preloaded_comments]
 
 	post.views += 1
 	g.db.add(post)
@@ -196,7 +203,7 @@ def post_id(pid, anything=None, v=None):
 
 	post.tree_comments()
 	if request.headers.get("Authorization"): return post.json
-	else: return post.rendered_page(v=v, read=read, sort=sort)
+	else: return post.rendered_page(v=v, last_view_utc=last_view_utc, sort=sort)
 
 
 @app.post("/edit_post/<pid>")

files/templates/comments.html

@@ -116,7 +116,7 @@
 			<div class="user-info">
 				<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.id}}')"></span>
 
-				{% if read and c.id not in read %}<i class="text-admin fas fa-circle" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Unread"></i>{% endif %}
+				{% if last_view_utc and c.created_utc > last_view_utc and not (v and v.id==c.author_id) %}<i class="text-admin fas fa-circle" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Unread"></i>{% endif %}
 
 				{% if c.awards %}
 					{% for a in c.awards[:5] %}