bugfix quest_homepage javascript

homepage/jinja2/homepage/index.html

@@ -5,7 +5,7 @@
 {% endblock %}
 {% block content %}
 	<h1>Quests 'n Shiet</h1>
-	<form method="get" action="{{ url('search:index') }}">
+	<form method="get" action="{{ url('quest:index') }}">
 		<input type="text" name="title" placeholder="Search">
 		<input type="submit">
 	</form>

quest/events.py

@@ -79,21 +79,24 @@ def message(socket, data):
 		roll_msg += " = " + str(total)
 		message += '<hr class="msgSrvHr"><b>' + roll_msg + "</b>"
 
-
 	user = socket.scope['user']
+	quest = Quest.objects.get(id=socket.quest_id)
 
 	m = Message(
-		quest=Quest.objects.get(id=socket.quest_id),
+		quest=quest,
 		message=message)
 	if user.username:
 		m.user = user
 	m.save()
 
+	anonymize = (user.anonymize or quest.anonymize) and user != quest.owner
+
 	data = {}
 	data['message_id'] = m.id
 	data['message'] = message
 	data['date'] = int(time.time())
 	data['name'] = user.username
+	data['anonymize'] = anonymize
 	socket.send('message', data)
 
 	# append rolls to dicecall

quest/jinja2/quest/chat.html

@@ -0,0 +1,20 @@
+<div id="chatPane" style="display:{% if request.session.get("hide_chat") == True %}none{% else %}flex{% endif %};">
+	<h1>Chat</h1>
+	<div id="chatWindow">
+		{% autoescape false %}
+		{% for message in chat_messages %}
+		<div id="msg-{{ message.id }}" class="message">
+			<div class="messageHeader">
+				<span class="messageName">{% if quest.owner.username == message.user.username or not quest.anonymize %}{{ message.user.username or quest.anon_name }}{% else %}{{ quest.anon_name }}{% endif %}</span>
+				<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
+				<span class="messageID">No.<a href="javascript:quote('{{ message.id }}')">{{ message.id }}</a></span>
+			</div>
+			<div class="messageContent">{{ message.message }}</div>
+		</div>
+		<hr>
+		{% endfor %}
+		{% endautoescape %}
+	</div>
+	<div id="messageTextDiv"><textarea id="messageTextArea" maxlength="512"></textarea></div>
+</div>
+<div id="preview" style="display:none;"></div>

quest/jinja2/quest/quest.html

@@ -175,24 +175,5 @@
 		</div>
 		{% endif %}
 	</div>
-	<div id="chatPane" style="display:{% if request.session.get("hide_chat") == True %}none{% else %}flex{% endif %};">
-		<h1>Chat</h1>
-		<div id="chatWindow">
-			{% autoescape false %}
-			{% for message in chat_messages %}
-			<div id="msg-{{ message.id }}" class="message">
-				<div class="messageHeader">
-					<span class="messageName">{{ message.user.username or quest.anon_name }}</span>
-					<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
-					<span class="messageID">No.<a href="javascript:quote('{{ message.id }}')">{{ message.id }}</a></span>
-				</div>
-				<div class="messageContent">{{ message.message }}</div>
-			</div>
-			<hr>
-			{% endfor %}
-			{% endautoescape %}
-		</div>
-		<div id="messageTextDiv"><textarea id="messageTextArea" maxlength="512"></textarea></div>
-	</div>
-	<div id="preview" style="display:none;"></div>
+	{% include "quest/chat.html" %}
 {% endblock %}

quest/jinja2/quest/quest_homepage.html

@@ -2,10 +2,6 @@
 {% block title %}{{ quest.title }}{% endblock %}
 {% block head %}
 	<link rel="stylesheet" type="text/css" href="{{ static('quest.css') }}">
-{% endblock %}
-{% block header %}
-{% if request.user == quest.owner %}
-	<span><a href="{{ url('quest:edit_quest', args=[quest_id, page_num]) }}">Edit Quest</a></span>
 	<script>
 		const quest_id = {{ quest.id }};
 		const page_num = '{{ page_num }}';
@@ -14,6 +10,11 @@
 	</script>
 	<script type="text/javascript" src="{{ static('quest.js') }}"></script>
 	<script>window.onload = load;</script>
+	<!-- We only want the message event on this page, others will error. Hacky solution, but it will do for now. -->
+{% endblock %}
+{% block header %}
+{% if request.user == quest.owner %}
+	<span><a href="{{ url('quest:edit_quest', args=[quest_id, page_num]) }}">Edit Quest</a></span>
 {% endif %}
 	<span>
 		<select onChange="window.location.href=this.value">
@@ -77,24 +78,5 @@
 		</div>
 		{% endif %}
 	</div>
-	<div id="chatPane" style="display:{% if request.session.get("hide_chat") == True %}none{% else %}flex{% endif %};">
-		<h1>Chat</h1>
-		<div id="chatWindow">
-			{% autoescape false %}
-			{% for message in chat_messages %}
-			<div id="msg-{{ message.id }}" class="message">
-				<div class="messageHeader">
-					<span class="messageName">{{ message.user.username or quest.anon_name }}</span>
-					<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
-					<span class="messageID">No.<a href="javascript:quote('{{ message.id }}')">{{ message.id }}</a></span>
-				</div>
-				<div class="messageContent">{{ message.message }}</div>
-			</div>
-			<hr>
-			{% endfor %}
-			{% endautoescape %}
-		</div>
-		<div id="messageTextDiv"><textarea id="messageTextArea" maxlength="512"></textarea></div>
-	</div>
-	<div id="preview" style="display:none;"></div>
+	{% include "quest/chat.html" %}
 {% endblock %}

quest/migrations/0006_quest_anonymize.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.1 on 2018-10-03 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quest', '0005_auto_20181003_1217'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quest',
+            name='anonymize',
+            field=models.BooleanField(default=True),
+        ),
+    ]

quest/models.py

@@ -19,6 +19,7 @@ class Quest(models.Model):
 	live = models.BooleanField()
 	live_time = models.DateTimeField(blank=True, null=True)
 	tags = TaggableManager()
+	anonymize = models.BooleanField(default=True)
 
 
 class Message(models.Model):

quest/static/quest.js

@@ -50,7 +50,7 @@ function load() {
 /* Websocket receive */
 socket.events['message'] = function(data) {
 	let msg_str = '<div id="message-' + data.message_id + '" class="message">';
-	msg_str = '<div class="messageHeader"><span class="messageName">' + ((data.name) ? data.name : anon_name) + '</span> ';
+	msg_str = '<div class="messageHeader"><span class="messageName">' + ((data.name && !data.anonymize) ? data.name : anon_name) + '</span> ';
 	msg_str += '<span class="messageDate">' + strftime(data.date) + '</span> ';
 	msg_str += '<span class="messageID">No.<a href="javascript:quote(' + data.message_id + ')">' + data.message_id + '</a></span></div>';
 	msg_str += '<div class="messageContent">' + data.message + '</div></div><hr>';

quest/views.py

@@ -15,22 +15,20 @@ from user.models import User
 
 def index(request):
 	"""The quest page index."""
-	if request.GET:
-		author = request.GET.get('author')
-		title = request.GET.get('title')
-		tags = request.GET.get('tags')
-		if not any((author, title, tags)):
-			return
+	author = request.GET.get('author')
+	title = request.GET.get('title')
+	tags = request.GET.get('tags')
+
+	results = Quest.objects.all()
+	if author:
+		results = results.filter(
+			owner__username__unaccent__icontains=author)
+	if title:
+		results = results.filter(title__unaccent__icontains=title)
+	if tags:
+		results = results.filter(tags__name__in=tags.split())
+	results = results.distinct().order_by('-id')
 
-		results = Quest.objects.all()
-		if author:
-			results = results.filter(
-				owner__username__unaccent__icontains=author)
-		if title:
-			results = results.filter(title__unaccent__icontains=title)
-		if tags:
-			results = results.filter(tags__name__in=tags.split())
-		results = results.distinct()
 	context = locals()
 	return render(request, 'quest/index.html', context)
 

titivillus/urls.py

@@ -14,5 +14,4 @@ urlpatterns = [
 	path('login/', include('login.urls')),
 	path('logout/', include('logout.urls')),
 	path('user/', include('user.urls')),
-	path('search/', include('search.urls')),
 ]

user/migrations/0002_user_anonymize.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.1 on 2018-10-03 16:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='anonymize',
+            field=models.BooleanField(default=True, help_text="Let's be honest, your name doesn't add anything to the conversation."),
+        ),
+    ]

user/models.py

@@ -40,6 +40,11 @@ class User(AbstractUser):
 	first_name = None
 	last_name = None
 	email = models.EmailField('email address')
+	anonymize = models.BooleanField(
+		default=True,
+		help_text="Let's be honest, your name doesn't add anything to " \
+			+ "the conversation."
+	)
 
 	def get_full_name(self):
 		return None