From 37b1aca048eb51dda750ed031afba22922a8197c Mon Sep 17 00:00:00 2001
From: iou1name <iou1name@national.shitposting.agency>
Date: Mon, 20 Aug 2018 06:57:36 -0400
Subject: [PATCH] chat messages get saved to database, all timestamps localized

---
 jinja2/base.html                            |  6 ++---
 quest/events.py                             | 21 ++++++++++++-----
 quest/jinja2/quest/quest.html               | 16 ++++++-------
 quest/migrations/0003_message.py            | 26 +++++++++++++++++++++
 quest/migrations/0004_auto_20180817_0724.py | 20 ++++++++++++++++
 quest/migrations/0005_auto_20180817_0739.py | 20 ++++++++++++++++
 quest/migrations/0006_auto_20180817_0921.py | 18 ++++++++++++++
 quest/models.py                             | 13 +++++++++++
 quest/static/quest.js                       |  2 +-
 quest/views.py                              |  3 ++-
 titivillus/jinja2.py                        |  2 ++
 titivillus/settings.py                      |  2 +-
 12 files changed, 129 insertions(+), 20 deletions(-)
 create mode 100644 quest/migrations/0003_message.py
 create mode 100644 quest/migrations/0004_auto_20180817_0724.py
 create mode 100644 quest/migrations/0005_auto_20180817_0739.py
 create mode 100644 quest/migrations/0006_auto_20180817_0921.py

diff --git a/jinja2/base.html b/jinja2/base.html
index b144b79..7660b6f 100644
--- a/jinja2/base.html
+++ b/jinja2/base.html
@@ -37,13 +37,13 @@
 		<li><a onclick="toggleHeader();" href="javascript:void(0);">⤓</a></li>
 	</ul>
 	{#<br /> <!-- TODO: make this more exact. -->#}
-	<div id="messages">
-		<ul class="messages">
+	<div id="pageMessages">
+		<ul class="pageMessages">
 			{% for message in get_messages(request) %}
 			<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
 			{% endfor %}
 		</ul>
 	</div>
-	<div id="content">{% block content %}{% endblock %}	</div>
+	<div id="content">{% block content %}{% endblock %}</div>
 </body>
 </html>
diff --git a/quest/events.py b/quest/events.py
index 1767596..6d27439 100644
--- a/quest/events.py
+++ b/quest/events.py
@@ -8,26 +8,35 @@ import types
 
 import bleach
 
+from quest.models import Message, Quest
+
 def message(socket, data):
 	"""
 	Gets called when the server receives a 'message' event.
 	"""
+	# TODO: validation
 	message = data.get('message')
+	quest_id = data.get('quest_id')
 
 	message = message.strip()
 	if not message:
 		return
 	tags = ["b", "code", "i", "s"]
 	message = bleach.clean(message, tags=tags)
-	message_id = 1
-	date = int(time.time())
-	name = "Anonymous"
+	user = socket.scope['user']
+
+	m = Message(
+		quest=Quest.objects.get(id=quest_id),
+		message=message)
+	if user.username:
+		m.user = user
+	m.save()
 
 	data = {}
-	data['message_id'] = message_id
+	data['message_id'] = m.id
 	data['message'] = message
-	data['date'] = date
-	data['name'] = name
+	data['date'] = int(time.time())
+	data['name'] = user.username
 	socket.send('message', data)
 
 
diff --git a/quest/jinja2/quest/quest.html b/quest/jinja2/quest/quest.html
index 8b35916..f56aab5 100644
--- a/quest/jinja2/quest/quest.html
+++ b/quest/jinja2/quest/quest.html
@@ -39,7 +39,7 @@
 				<div class="questPost pollPost{% if post == posts|last %} activePost{% endif %}">
 				{% endif %}
 					<div class="questPostMeta">
-						{{ post.timestamp.strftime('%Y-%m-%d %H:%M') }}
+						{{ localtime(post.timestamp).strftime('%Y-%m-%d %H:%M') }}
 						{% if request.user == quest.owner %}
 						{% if post.post_type == "text" %}
 						<br /><a href="javascript:void(0);" id="editPost-{{ post.id }}" onclick="edit_post({{ post.id }})">Edit</a> 
@@ -140,17 +140,17 @@
 			<h1>Chat</h1>
 			<div id="chatWindow">
 				{% autoescape false %}
-				{# for message in messages %}
-				<div id="msg-{{ message[0] }}" class="message">
+				{% for message in messages %}
+				<div id="msg-{{ message.id }}" class="message">
 					<div class="messageHeader">
-						<span class="messageName">Anonymous</span>
-						<span class="messageDate">{{ message[3] | strftime }}</span>
-						<span class="messageID">No.<a href="javascript:quote('{{ message[0] }}')">{{ message[0] }}</a></span>
+						<span class="messageName">{{ message.user.username or 'Anonymous' }}</span>
+						<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
+						<span class="messageID">No.<a href="javascript:quote('{{ message }}')">{{ message.id }}</a></span>
 					</div>
-					<div class="messageContent">{{ message[4] }}</div>
+					<div class="messageContent">{{ message.message }}</div>
 				</div>
 				<hr>
-				{% endfor #}
+				{% endfor %}
 				{% endautoescape %}
 			</div>
 			<div id="messageTextDiv"><textarea id="messageTextArea"></textarea></div>
diff --git a/quest/migrations/0003_message.py b/quest/migrations/0003_message.py
new file mode 100644
index 0000000..f393c10
--- /dev/null
+++ b/quest/migrations/0003_message.py
@@ -0,0 +1,26 @@
+# Generated by Django 2.1 on 2018-08-17 11:19
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('quest', '0002_auto_20180812_1612'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Message',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(auto_now=True)),
+                ('message', models.TextField(max_length=512)),
+                ('quest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quest.Quest')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/quest/migrations/0004_auto_20180817_0724.py b/quest/migrations/0004_auto_20180817_0724.py
new file mode 100644
index 0000000..99f276f
--- /dev/null
+++ b/quest/migrations/0004_auto_20180817_0724.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.1 on 2018-08-17 11:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quest', '0003_message'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='user',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/quest/migrations/0005_auto_20180817_0739.py b/quest/migrations/0005_auto_20180817_0739.py
new file mode 100644
index 0000000..2975aac
--- /dev/null
+++ b/quest/migrations/0005_auto_20180817_0739.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.1 on 2018-08-17 11:39
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quest', '0004_auto_20180817_0724'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/quest/migrations/0006_auto_20180817_0921.py b/quest/migrations/0006_auto_20180817_0921.py
new file mode 100644
index 0000000..58b5193
--- /dev/null
+++ b/quest/migrations/0006_auto_20180817_0921.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-08-17 13:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quest', '0005_auto_20180817_0739'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='message',
+            old_name='date',
+            new_name='timestamp',
+        ),
+    ]
diff --git a/quest/models.py b/quest/models.py
index 72cbe43..0a76838 100644
--- a/quest/models.py
+++ b/quest/models.py
@@ -40,3 +40,16 @@ class PageTitle(models.Model):
 
 	def __str__(self):
 		return self.title
+
+class Message(models.Model):
+	"""
+	Represents a chat message.
+	"""
+	quest = models.ForeignKey(Quest, on_delete=models.CASCADE)
+	user = models.ForeignKey(
+		settings.AUTH_USER_MODEL,
+		on_delete=models.CASCADE,
+		blank=True,
+		null=True)
+	timestamp = models.DateTimeField(auto_now=True)
+	message = models.TextField(max_length=512)
diff --git a/quest/static/quest.js b/quest/static/quest.js
index 19fc59d..4d4d080 100644
--- a/quest/static/quest.js
+++ b/quest/static/quest.js
@@ -47,7 +47,7 @@ function load() {
 			mtarea.value = '';
 			if (text == '') { return; }
 			document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
-			socket.send('message', {message: text});
+			socket.send('message', {message: text, quest_id: quest_id});
 		}
 	});
 }
diff --git a/quest/views.py b/quest/views.py
index 7a12b80..ff26a65 100644
--- a/quest/views.py
+++ b/quest/views.py
@@ -20,6 +20,7 @@ def quest(request, quest_id, page_num=1):
 	Arbituary quest page view.
 	"""
 	quest = Quest.objects.get(id=quest_id)
+	messages = quest.message_set.all()
 	posts = quest.post_set.all()
-	context = {'quest': quest, 'posts': posts, 'page_num': page_num}
+	context = {'quest': quest, 'posts': posts, 'messages': messages, 'page_num': page_num}
 	return render(request, 'quest/quest.html', context)
diff --git a/titivillus/jinja2.py b/titivillus/jinja2.py
index 18108fc..34bba17 100644
--- a/titivillus/jinja2.py
+++ b/titivillus/jinja2.py
@@ -5,6 +5,7 @@ Custom Jinja2 environment.
 import jinja2
 from django.urls import reverse
 from django.contrib import messages
+from django.utils.timezone import template_localtime
 from django.contrib.staticfiles.storage import staticfiles_storage
 
 def environment(**options):
@@ -21,5 +22,6 @@ def environment(**options):
 		'url': reverse,
 		'static': staticfiles_storage.url,
 		'get_messages': messages.get_messages,
+		'localtime': template_localtime,
 	})
 	return env
diff --git a/titivillus/settings.py b/titivillus/settings.py
index f3a0906..b54c630 100644
--- a/titivillus/settings.py
+++ b/titivillus/settings.py
@@ -119,7 +119,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'America/New_York'
+TIME_ZONE = 'America/Chicago'
 
 USE_I18N = False