iou1name/Titivillus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: iou1name:247fc6729ac10ede4fe7eb161b25f19479a76942
Branches Tags
iou1name:master
..
compare: iou1name:1fbc398a9a2a18960a024bb6b3af488222dc1617
Branches Tags
iou1name:master

No commits in common. "247fc6729ac10ede4fe7eb161b25f19479a76942" and "1fbc398a9a2a18960a024bb6b3af488222dc1617" have entirely different histories.
247fc6729a ... 1fbc398a9a

8 changed files with 66 additions and 117 deletions
Show Stats Expand all files Collapse all files

46
quest/events.py
View File

@ -24,9 +24,9 @@ def message(socket, data):
""" """
# TODO: validation # TODO: validation
message = data.get('message') message = data.get('message')
quest_id = data.get('quest_id')
# cleaning # cleaning
message = message[:512]
message = message.strip() message = message.strip()
if not message: if not message:
return return
@ -62,9 +62,9 @@ def message(socket, data):
try: try:
groups = [0 if d is None else int(d) for d in reg.groups()] groups = [0 if d is None else int(d) for d in reg.groups()]
dice_num, dice_sides, dice_mod = groups dice_num, dice_sides, dice_mod = groups
assert 1 <= dice_num <= 256 assert 0 < dice_num < 100
assert 1 <= dice_sides <= 256 assert 0 < dice_sides < 100
assert -65536 <= dice_mod <= 65536 assert -1000 < dice_mod < 1000
except (ValueError, AssertionError): except (ValueError, AssertionError):
return return
dice_results = [random.randint(1, dice_sides) for _ in range(dice_num)] dice_results = [random.randint(1, dice_sides) for _ in range(dice_num)]
@ -82,7 +82,7 @@ def message(socket, data):
user = socket.scope['user'] user = socket.scope['user']
m = Message( m = Message(
quest=Quest.objects.get(id=socket.quest_id), quest=Quest.objects.get(id=quest_id),
message=message) message=message)
if user.username: if user.username:
m.user = user m.user = user
@ -98,10 +98,7 @@ def message(socket, data):
# append rolls to dicecall # append rolls to dicecall
if any(map(message.startswith, ["/dice", "/roll"])): if any(map(message.startswith, ["/dice", "/roll"])):
try: try:
dc = DiceCall.objects.get( dc = DiceCall.objects.get(post__quest__id=quest_id, open=True)
post__quest__id=socket.quest_id,
open=True
)
except DiceCall.DoesNotExist: except DiceCall.DoesNotExist:
return return
dice_roll = f"{dice_num}d{dice_sides}" dice_roll = f"{dice_num}d{dice_sides}"
@ -144,6 +141,7 @@ def text_post(socket, data):
Called when the QM creates a new text post. Called when the QM creates a new text post.
""" """
# TODO: security # TODO: security
quest_id = data.get('quest_id')
post_text = data.get('text') post_text = data.get('text')
page_num = data.get('page_num') page_num = data.get('page_num')
@ -154,7 +152,7 @@ def text_post(socket, data):
# handle image # handle image
p = Post( p = Post(
quest=Quest.objects.get(id=socket.quest_id), quest=Quest.objects.get(id=quest_id),
page_num=page_num, page_num=page_num,
post_type='text', post_type='text',
post_text=post_text) post_text=post_text)
@ -172,6 +170,7 @@ def dice_post(socket, data):
""" """
Called when the QM makes a new dice post. Called when the QM makes a new dice post.
""" """
quest_id = data.get('quest_id')
page_num = data.get('page_num') page_num = data.get('page_num')
form = DiceCallForm(data) form = DiceCallForm(data)
if not form.is_valid(): if not form.is_valid():
@ -179,7 +178,7 @@ def dice_post(socket, data):
form = form.cleaned_data form = form.cleaned_data
posts = Post.objects.filter( posts = Post.objects.filter(
quest__id=socket.quest_id, post_type='dice', dicecall__open=True) quest__id=quest_id, post_type='dice', dicecall__open=True)
for post in posts: for post in posts:
post.dicecall.open = False post.dicecall.open = False
post.dicecall.save() post.dicecall.save()
@ -197,7 +196,7 @@ def dice_post(socket, data):
post_text += " vs DC" + str(form['diceChal']) post_text += " vs DC" + str(form['diceChal'])
p = Post( p = Post(
quest=Quest.objects.get(id=socket.quest_id), quest=Quest.objects.get(id=quest_id),
page_num=page_num, page_num=page_num,
post_type='dice', post_type='dice',
post_text=post_text post_text=post_text
@ -225,6 +224,7 @@ def poll_post(socket, data):
""" """
Called when the QM makes a new dice post. Called when the QM makes a new dice post.
""" """
quest_id = data.get('quest_id')
page_num = data.get('page_num') page_num = data.get('page_num')
form = PollForm(data) form = PollForm(data)
if not form.is_valid(): if not form.is_valid():
@ -232,7 +232,7 @@ def poll_post(socket, data):
form = form.cleaned_data form = form.cleaned_data
p = Post( p = Post(
quest=Quest.objects.get(id=socket.quest_id), quest=Quest.objects.get(id=quest_id),
page_num=page_num, page_num=page_num,
post_type='poll', post_type='poll',
post_text="Poll" post_text="Poll"
@ -292,6 +292,7 @@ def close_post(socket, data):
Called when the QM closes an open post. Called when the QM closes an open post.
""" """
post_id = data.get('post_id') post_id = data.get('post_id')
quest_id = data.get('quest_id')
p = Post.objects.get(id=post_id) p = Post.objects.get(id=post_id)
if data.get('post_type') == 'dice': if data.get('post_type') == 'dice':
p.dicecall.open = False p.dicecall.open = False
@ -311,10 +312,11 @@ def open_post(socket, data):
""" """
# TODO: only posts on last page can be opened # TODO: only posts on last page can be opened
post_id = data.get('post_id') post_id = data.get('post_id')
quest_id = data.get('quest_id')
p = Post.objects.get(id=post_id) p = Post.objects.get(id=post_id)
if data.get('post_type') == 'dice': if data.get('post_type') == 'dice':
posts = Post.objects.filter( posts = Post.objects.filter(
quest__id=socket.quest_id, post_type='dice', dicecall__open=True) quest__id=quest_id, post_type='dice', dicecall__open=True)
for post in posts: for post in posts:
post.dicecall.open = False post.dicecall.open = False
post.dicecall.save() post.dicecall.save()
@ -335,6 +337,7 @@ def vote(socket, data):
""" """
Called when a player votes in a poll. Called when a player votes in a poll.
""" """
quest_id = data.get('quest_id')
post_id = data.get('post_id') post_id = data.get('post_id')
option_id = data.get('option_id') option_id = data.get('option_id')
polarity = data.get('polarity') polarity = data.get('polarity')
@ -406,21 +409,6 @@ def write_in(socket, data):
socket.send('update_post', data) socket.send('update_post', data)
def new_page(socket, data):
"""
Called when the QM creates a new page.
"""
title = data.get('page_title')
quest = Quest.objects.get(id=socket.quest_id)
p = PageTitle(
quest=quest,
page_num=PageTitle.objects.filter(quest=quest).count() + 1,
title=title,
)
p.save()
events = {} events = {}
for obj in dir(): for obj in dir():
if type(locals()[obj]) == types.FunctionType: if type(locals()[obj]) == types.FunctionType:

12
quest/forms.py
View File

@ -8,14 +8,14 @@ class DiceCallForm(forms.Form):
""" """
The form for the QM making dice calls. The form for the QM making dice calls.
""" """
diceNum = forms.IntegerField(min_value=1, max_value=256) diceNum = forms.IntegerField(min_value=1, max_value=99)
diceSides = forms.IntegerField(min_value=1, max_value=65536) diceSides = forms.IntegerField(min_value=1, max_value=99)
diceMod = forms.IntegerField( diceMod = forms.IntegerField(
min_value=-65536, max_value=65536, required=False) min_value=-999, max_value=999, required=False)
diceChal = forms.IntegerField( diceChal = forms.IntegerField(
min_value=1, max_value=65536, required=False) min_value=1, max_value=999, required=False)
diceRollsTaken = forms.IntegerField( diceRollsTaken = forms.IntegerField(
min_value=1, max_value=256, required=False) min_value=1, max_value=99, required=False)
diceStrict = forms.BooleanField(required=False) diceStrict = forms.BooleanField(required=False)
@ -37,7 +37,7 @@ class PollForm(forms.Form):
continue continue
self.fields[key] = forms.CharField(max_length=200) self.fields[key] = forms.CharField(max_length=200)
class EditQuestForm(forms.Form): class EditQuest(forms.Form):
""" """
Form for the /edit_quest page. Form for the /edit_quest page.
""" """

57
quest/jinja2/quest/quest.html
View File

@ -46,13 +46,13 @@
{{ localtime(post.timestamp).strftime('%Y-%m-%d %H:%M') }} {{ localtime(post.timestamp).strftime('%Y-%m-%d %H:%M') }}
{% if request.user == quest.owner %} {% if request.user == quest.owner %}
{% if post.post_type == "text" %} {% if post.post_type == "text" %}
<br><a href="javascript:void(0);" id="editPost-{{ post.id }}" onclick="edit_post({{ post.id }})">Edit</a> <br /><a href="javascript:void(0);" id="editPost-{{ post.id }}" onclick="edit_post({{ post.id }})">Edit</a>
<a href="javascript:void(0);" id="savePost-{{ post.id }}" onclick="save_post('{{ post.id }}')" style="display:none;">Save</a> <a href="javascript:void(0);" id="savePost-{{ post.id }}" onclick="save_post('{{ post.id }}')" style="display:none;">Save</a>
{% elif post.post_type == "dice" %} {% elif post.post_type == "dice" %}
<br><a href="javascript:void(0);" id="closePost-{{ post.id }}" onclick="close_post_send({{ post.id }})"{% if not post.dicecall.open %} style="display:none;"{% endif %}>Close</a> <br /><a href="javascript:void(0);" id="closePost-{{ post.id }}" onclick="close_post_send({{ post.id }})"{% if not post.dicecall.open %} style="display:none;"{% endif %}>Close</a>
<a href="javascript:void(0);" id="openPost-{{ post.id }}" onclick="open_post_send({{ post.id }})"{% if post.dicecall.open %} style="display:none;"{% endif %}>Open</a> <a href="javascript:void(0);" id="openPost-{{ post.id }}" onclick="open_post_send({{ post.id }})"{% if post.dicecall.open %} style="display:none;"{% endif %}>Open</a>
{% elif post.post_type == "poll" %} {% elif post.post_type == "poll" %}
<br><a href="javascript:void(0);" id="closePost-{{ post.id }}" onclick="close_post_send({{ post.id }})"{% if not post.poll.open %} style="display:none;"{% endif %}>Close</a> <br /><a href="javascript:void(0);" id="closePost-{{ post.id }}" onclick="close_post_send({{ post.id }})"{% if not post.poll.open %} style="display:none;"{% endif %}>Close</a>
<a href="javascript:void(0);" id="openPost-{{ post.id }}" onclick="open_post_send({{ post.id }})"{% if post.poll.open %} style="display:none;"{% endif %}>Open</a> <a href="javascript:void(0);" id="openPost-{{ post.id }}" onclick="open_post_send({{ post.id }})"{% if post.poll.open %} style="display:none;"{% endif %}>Open</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -75,7 +75,7 @@
{% for option in poll_options.filter(poll=post.poll).order_by("id") %} {% for option in poll_options.filter(poll=post.poll).order_by("id") %}
<tr id="optionRow-{{ option.id }}"> <tr id="optionRow-{{ option.id }}">
<td class="pollCheckBox"> <td class="pollCheckBox">
<input type="checkbox" {% if poll_votes.filter(option=option, ip_address=ip_address) %}checked="true"{% endif %} id="pollInput-{{ option.id }}" onchange="vote({{ post.id }}, {{ option.id }})"{% if not post.poll.open %} disabled{% endif %}> <input type="checkbox" {% if poll_votes.filter(option=option, ip_address=ip_address) %}checked="true"{% endif %} id="pollInput-{{ option.id }}" onchange="vote({{ post.id }}, {{ option.id }})"{% if not post.poll.open %} disabled{% endif %}/>
<label for="pollInput-{{ option.id }}"></label> <label for="pollInput-{{ option.id }}"></label>
</td> </td>
<td class="option_text">{{ option.text }}</td> <td class="option_text">{{ option.text }}</td>
@ -85,8 +85,8 @@
</table> </table>
{% if post.poll.open and post.poll.allow_writein %} {% if post.poll.open and post.poll.allow_writein %}
<div id="writeinContainer-{{ post.id }}"> <div id="writeinContainer-{{ post.id }}">
Write-in: <input type="text" id="writeinInput-{{ post.id }}" placeholder="Custom choice..." maxlength="200"><br> Write-in: <input type="text" id="writeinInput-{{ post.id }}" placeholder="Custom choice..." maxlength="200" /><br />
<input type="submit" id="writeinSubmit-{{ post.id }}" value="Submit" onclick="submitWritein({{ post.id }});"> <input type="submit" id="writeinSubmit-{{ post.id }}" value="Submit" onclick="submitWritein({{ post.id }});"/>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -101,28 +101,27 @@
<li><a class="QMPostTab active" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostText')">Text</a></li> <li><a class="QMPostTab active" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostText')">Text</a></li>
<li><a class="QMPostTab" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostDice')">Dice</a></li> <li><a class="QMPostTab" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostDice')">Dice</a></li>
<li><a class="QMPostTab" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostPoll')">Poll</a></li> <li><a class="QMPostTab" href="javascript:void(0);" onclick="openPostTab(event, 'QMPostPoll')">Poll</a></li>
<li><a class="QMPostTab" href="javascript:void(0);" onclick="openPostTab(event, 'QMPage')">Page</a></li>
</ul> </ul>
</div> </div>
<div id="QMPostText" class="QMPostTabContent" style="display:initial;"> <div id="QMPostText" class="QMPostTabContent" style="display:initial;">
<textarea id="postTextArea"></textarea><br> <textarea id="postTextArea"></textarea><br />
<input type="submit" name="newPost" value="Post" onclick="makePost();"> <input type="submit" name="newPost" value="Post" onclick="makePost();"/>
</div> </div>
<div id="QMPostDice" class="QMPostTabContent" style="display:none;"> <div id="QMPostDice" class="QMPostTabContent" style="display:none;">
Dice for the dice god.<br> Dice for the dice god.<br />
<form id="QMDicePostForm" action="javascript:void(0);" onsubmit="form_post('QMDicePostForm', 'dice_post');"> <form id="QMDicePostForm" action="javascript:void(0);" onsubmit="form_post('QMDicePostForm', 'dice_post');">
Dice: <input type="number" name="diceNum" min="1" max="256" required> Dice: <input type="number" name="diceNum" min="1" max="99" required/>
d <input type="number" name="diceSides" min="1" max="65536" required> d <input type="number" name="diceSides" min="1" max="99" required/>
±<input type="number" name="diceMod" min="-65536" max="65536"> ±<input type="number" name="diceMod" min="-999" max="999"/>
<input type="checkbox" name="diceStrict"> <input type="checkbox" name="diceStrict"/>
<span class="tooltip" title="Only take matching rolls.">Strict</span><br> <span class="tooltip" title="Only take matching rolls.">Strict</span><br />
<input type="checkbox" onclick="document.getElementById('diceChal').disabled=!this.checked;"> <input type="checkbox" onclick="document.getElementById('diceChal').disabled=!this.checked;"/>
<span class="tooltip" title="Dice challenge">DC:</span> <span class="tooltip" title="Dice challenge">DC:</span>
<input type="number" name="diceChal" id="diceChal" min="1" max="65536" disabled><br> <input type="number" name="diceChal" id="diceChal" min="1" max="999" disabled/><br />
<input type="checkbox" onclick="document.getElementById('diceRollsTaken').disabled=!this.checked;"> <input type="checkbox" onclick="document.getElementById('diceRollsTaken').disabled=!this.checked;"/>
<span class="tooltip" title="Automatically close the dice call after this many rolls have been made.">Rolls Taken:</span> <span class="tooltip" title="Automatically close the dice call after this many rolls have been made.">Rolls Taken:</span>
<input type="number" name="diceRollsTaken" id="diceRollsTaken" min="1" max="256" disabled><br> <input type="number" name="diceRollsTaken" id="diceRollsTaken" min="1" max="99" disabled/><br />
<input type="submit" name="submit" value="Roll 'em"> <input type="submit" name="submit" value="Roll 'em"/>
</form> </form>
</div> </div>
<div id="QMPostPoll" class="QMPostTabContent" style="display:none;"> <div id="QMPostPoll" class="QMPostTabContent" style="display:none;">
@ -131,19 +130,13 @@
<a href="javascript:void(0);" id="pollInsertNewOption" onclick="insertPollOption()">[+]</a> <a href="javascript:void(0);" id="pollInsertNewOption" onclick="insertPollOption()">[+]</a>
<a href="javascript:void(0);" onclick="removePollOption()">[-]</a> <a href="javascript:void(0);" onclick="removePollOption()">[-]</a>
<div id="pollOptions"> <div id="pollOptions">
<div><input type="text" name="pollOption-1" class="pollOption" placeholder="Option 1" maxlength="200"></div> <div><input type="text" name="pollOption-1" class="pollOption" placeholder="Option 1" maxlength="200" /></div>
<div><input type="text" name="pollOption-2" class="pollOption" placeholder="Option 2" maxlength="200"></div> <div><input type="text" name="pollOption-2" class="pollOption" placeholder="Option 2" maxlength="200" /></div>
</div> </div>
<hr> <hr>
<input type="checkbox" name="multi_choice">Allow multiple choices<br> <input type="checkbox" name="multi_choice" />Allow multiple choices<br />
<input type="checkbox" name="allow_writein">Allow user-created options<br> <input type="checkbox" name="allow_writein" />Allow user-created options<br />
<input type="submit" name="submit" value="Submit"> <input type="submit" name="submit" value="Submit" />
</form>
</div>
<div id="QMPage" class="QMPostTabContent" style="display:none;">
<form id="QMPageForm" action="javascript:void(0);" onsubmit="form_post('QMPageForm', 'new_page');">
New Page: <input type="text" name="page_title" maxlength="200" value="Page {{ pages.count() + 1 }}"><br>
<input type="submit" name="submit" value="Submit">
</form> </form>
</div> </div>
</div> </div>
@ -166,7 +159,7 @@
{% endfor %} {% endfor %}
{% endautoescape %} {% endautoescape %}
</div> </div>
<div id="messageTextDiv"><textarea id="messageTextArea" maxlength="512"></textarea></div> <div id="messageTextDiv"><textarea id="messageTextArea"></textarea></div>
</div> </div>
<div id="preview" style="display:none;"></div> <div id="preview" style="display:none;"></div>
{% endblock %} {% endblock %}

34
quest/migrations/0004_auto_20180924_0931.py
View File

@ -1,34 +0,0 @@
# Generated by Django 2.1.1 on 2018-09-24 13:31
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('quest', '0003_quest_anon_name'),
]
operations = [
migrations.AlterField(
model_name='dicecall',
name='dice_challenge',
field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65536)]),
),
migrations.AlterField(
model_name='dicecall',
name='dice_roll',
field=models.CharField(max_length=16),
),
migrations.AlterField(
model_name='dicecall',
name='rolls_taken',
field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(256)]),
),
migrations.AlterField(
model_name='diceroll',
name='roll',
field=models.CharField(max_length=16),
),
]

12
quest/models.py
View File

@ -56,22 +56,22 @@ class DiceCall(models.Model):
on_delete=models.CASCADE, on_delete=models.CASCADE,
primary_key=True, primary_key=True,
) )
dice_roll = models.CharField(max_length=16) dice_roll = models.CharField(max_length=9)
strict = models.BooleanField() strict = models.BooleanField()
dice_challenge = models.IntegerField( dice_challenge = models.IntegerField(
null=True, null=True,
blank=True, blank=True,
validators=[ validators=[
MinValueValidator(1), MaxValueValidator(999),
MaxValueValidator(65536), MinValueValidator(1)
] ]
) )
rolls_taken = models.IntegerField( rolls_taken = models.IntegerField(
null=True, null=True,
blank=True, blank=True,
validators=[ validators=[
MinValueValidator(1), MaxValueValidator(99),
MaxValueValidator(256), MinValueValidator(1)
] ]
) )
open = models.BooleanField() open = models.BooleanField()
@ -87,7 +87,7 @@ class DiceRoll(models.Model):
on_delete=models.CASCADE, on_delete=models.CASCADE,
primary_key=True, primary_key=True,
) )
roll = models.CharField(max_length=16) roll = models.CharField(max_length=9)
results = models.TextField() results = models.TextField()
total = models.IntegerField() total = models.IntegerField()

9
quest/static/quest.js
View File

@ -41,7 +41,8 @@ function load() {
let text = mtarea.value.trim(); let text = mtarea.value.trim();
mtarea.value = ''; mtarea.value = '';
if (text === '') { return; } if (text === '') { return; }
socket.send('message', {message: text}); document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
socket.send('message', {message: text, quest_id: quest_id});
} }
}); });
} }
@ -56,7 +57,7 @@ socket.events['message'] = function(data) {
let mbox = document.getElementById('chatWindow'); let mbox = document.getElementById('chatWindow');
mbox.innerHTML = mbox.innerHTML + msg_str; mbox.innerHTML = mbox.innerHTML + msg_str;
if ((mbox.scrollTop + mbox.offsetHeight) >= (mbox.scrollHeight - mbox.clientHeight)) { if ((mbox.scrollTop + mbox.offsetHeight) >= (mbox.scrollHeight - mbox.clientHeight / 2)) {
mbox.scrollTop = mbox.scrollHeight; mbox.scrollTop = mbox.scrollHeight;
} }
} }
@ -81,7 +82,7 @@ socket.events['new_post'] = function(data) {
post_str += '<table class="poll" id="poll-' + data.post_id + '">'; post_str += '<table class="poll" id="poll-' + data.post_id + '">';
for (let i = 0; i < data.options.length; i++) { for (let i = 0; i < data.options.length; i++) {
post_str += '<tr id="optionRow-' + data.options[i] + '">'; post_str += '<tr id="optionRow-' + data.options[i] + '">';
post_str += '<td class="pollCheckBox"><input type="checkbox" id="pollInput-' + data.options[i][0] + '" onchange="vote(' + data.post_id + ',' + data.options[i][0] + ')">'; post_str += '<td class="pollCheckBox"><input type="checkbox" id="pollInput-' + data.options[i][0] + '" onchange="vote(' + data.post_id + ',' + data.options[i][0] + ')"/>';
post_str += '<label for="pollInput-' + data.options[i][0] + '"></label></td>'; post_str += '<label for="pollInput-' + data.options[i][0] + '"></label></td>';
post_str += '<td class="option_text">' + data.options[i][1] + '</td>'; post_str += '<td class="option_text">' + data.options[i][1] + '</td>';
post_str += '<td class="optionVotes">0</td></tr>'; post_str += '<td class="optionVotes">0</td></tr>';
@ -158,7 +159,7 @@ socket.events['set_option_box'] = function(data) {
/* Websocket send */ /* Websocket send */
function vote(post_id, option_id) { function vote(post_id, option_id) {
let polarity = document.getElementById('pollInput-' + option_id).checked; let polarity = document.getElementById('pollInput-' + option_id).checked;
socket.send('vote', {post_id: post_id, option_id: option_id, polarity: polarity}); socket.send('vote', {post_id: post_id, option_id: option_id, polarity: polarity, quest_id: quest_id});
} }
function submitWritein(post_id) { function submitWritein(post_id) {
let writeinInput = document.getElementById('writeinInput-' + post_id); let writeinInput = document.getElementById('writeinInput-' + post_id);

7
quest/static/questQM.js
View File

@ -51,7 +51,7 @@ function makePost() {
let text = qparea.value.trim(); let text = qparea.value.trim();
qparea.value = ''; qparea.value = '';
if (text === '') { return; } if (text === '') { return; }
socket.send('text_post', {text: text, page_num: page_num}); socket.send('text_post', {text: text, page_num: page_num, quest_id: quest_id});
} }
function save_post(post_id) { function save_post(post_id) {
let post = document.getElementById('questPostData-' + post_id); let post = document.getElementById('questPostData-' + post_id);
@ -68,12 +68,13 @@ function form_post(form_id, event) {
formData.forEach(function(value, key) { formData.forEach(function(value, key) {
obj[key] = value; obj[key] = value;
}); });
obj.quest_id = quest_id;
obj.page_num = page_num; obj.page_num = page_num;
socket.send(event, obj); socket.send(event, obj);
document.getElementById(form_id).reset(); document.getElementById(form_id).reset();
} }
function close_post_send(post_id) { function close_post_send(post_id) {
data = {post_id: post_id} data = {post_id: post_id, quest_id: quest_id}
let post = document.getElementById('questPostData-' + post_id); let post = document.getElementById('questPostData-' + post_id);
if (post.parentElement.classList.contains('dicePost')) { if (post.parentElement.classList.contains('dicePost')) {
data.post_type = 'dice'; data.post_type = 'dice';
@ -83,7 +84,7 @@ function close_post_send(post_id) {
socket.send('close_post', data); socket.send('close_post', data);
} }
function open_post_send(post_id) { function open_post_send(post_id) {
data = {post_id: post_id} data = {post_id: post_id, quest_id: quest_id}
let post = document.getElementById('questPostData-' + post_id); let post = document.getElementById('questPostData-' + post_id);
if (post.parentElement.classList.contains('dicePost')) { if (post.parentElement.classList.contains('dicePost')) {
data.post_type = 'dice'; data.post_type = 'dice';

6
quest/views.py
View File

@ -6,7 +6,7 @@ from django.shortcuts import render, redirect
from django.http import HttpResponse from django.http import HttpResponse
from .models import Quest, DiceRoll, PollOption, PollVote, PageTitle from .models import Quest, DiceRoll, PollOption, PollVote, PageTitle
from .forms import EditQuestForm from .forms import EditQuest
def index(request): def index(request):
""" """
@ -22,7 +22,7 @@ def quest(request, quest_id, page_num=1):
quest = Quest.objects.get(id=quest_id) quest = Quest.objects.get(id=quest_id)
pages = PageTitle.objects.filter(quest=quest).order_by('page_num') pages = PageTitle.objects.filter(quest=quest).order_by('page_num')
messages = quest.message_set.all() messages = quest.message_set.all()
posts = quest.post_set.filter(page_num=page_num) posts = quest.post_set.all()
dice_rolls = DiceRoll.objects.filter(dicecall__post__quest=quest) dice_rolls = DiceRoll.objects.filter(dicecall__post__quest=quest)
poll_options = PollOption.objects.filter(poll__post__quest=quest) poll_options = PollOption.objects.filter(poll__post__quest=quest)
poll_votes = PollVote.objects.filter(option__poll__post__quest=quest) poll_votes = PollVote.objects.filter(option__poll__post__quest=quest)
@ -39,7 +39,7 @@ def edit_quest(request, quest_id, page_num=1):
if quest.owner != request.user: if quest.owner != request.user:
return redirect('quest:quest', quest_id=quest_id, page_num=page_num) return redirect('quest:quest', quest_id=quest_id, page_num=page_num)
if request.method == 'POST': if request.method == 'POST':
form = EditQuestForm(request.POST) form = EditQuest(request.POST)
if form.is_valid(): if form.is_valid():
quest.anon_name = form.cleaned_data['anon_name'] quest.anon_name = form.cleaned_data['anon_name']
quest.save() quest.save()