djsundog/brutaldon
1
0
Fork 0
mirror of http://git.carcosa.net/jmcbray/brutaldon.git synced 2024-11-27 09:10:08 -05:00
Code Issues Projects Releases Wiki Activity

Fix an issue with mentions caused by last update

Browse Source
This commit is contained in:
Jason McBrayer 2019-01-18 08:03:38 -05:00
parent aa1434e821
commit 7c351ef341
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brutaldon/settings.py
View File

@ -193,5 +193,5 @@ SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
ANONYMOUS_HOME_URL = 'about' ANONYMOUS_HOME_URL = 'about'
# Version number displayed on about page # Version number displayed on about page
BRUTALDON_VERSION = "2.8.0" BRUTALDON_VERSION = "2.8.1"

2
brutaldon/templates/main/post_minimal_partial.html
View File

@ -21,7 +21,7 @@
required="" id="id_status" required="" id="id_status"
ic-post-to="{% url "user_search" %}" ic-post-to="{% url "user_search" %}"
ic-trigger-on="keyup changed" ic-trigger-delay="500ms" ic-trigger-on="keyup changed" ic-trigger-delay="500ms"
ic-target="#username_autocomplete"></textarea> ic-target="#username_autocomplete">{% if form.status.value %}{{ form.status.value }}{% endif %}</textarea>
<div id="username_autocomplete"></div> <div id="username_autocomplete"></div>
</div> </div>
<div id="status_count"></div> <div id="status_count"></div>

2
brutaldon/templates/main/post_partial.html
View File

@ -28,7 +28,7 @@
required="" id="id_status" required="" id="id_status"
ic-post-to="{% url "user_search" %}" ic-post-to="{% url "user_search" %}"
ic-trigger-on="keyup changed" ic-trigger-delay="500ms" ic-trigger-on="keyup changed" ic-trigger-delay="500ms"
ic-target="#username_autocomplete"></textarea> ic-target="#username_autocomplete">{% if form.status.value %}{{ form.status.value }}{% endif %}</textarea>
<div id="username_autocomplete"></div> <div id="username_autocomplete"></div>
</div> </div>
<div id="status_count"></div> <div id="status_count"></div>

14
brutaldon/views.py
View File

@ -453,12 +453,10 @@ def toot(request, mention=None):
if mention: if mention:
if not mention.startswith('@'): if not mention.startswith('@'):
mention = '@'+mention mention = '@'+mention
form = PostForm(request.GET, request.FILES, form = PostForm(initial={'visibility': request.session['user'].source.privacy,
initial={'visibility': request.session['user'].source.privacy, 'status': mention + ' ' })
'status': mention + '\n' })
else: else:
form = PostForm(request.GET, request.FILES, form = PostForm(initial={'visibility': request.session['user'].source.privacy})
initial={'visibility': request.session['user'].source.privacy})
if request.GET.get('ic-request'): if request.GET.get('ic-request'):
return render(request, 'intercooler/post.html', return render(request, 'intercooler/post.html',
{'form': form, {'form': form,
@ -590,9 +588,9 @@ def reply(request, id):
initial_text = "" initial_text = ""
for mention in [x for x in toot.mentions if x.acct != request.session['user'].acct]: for mention in [x for x in toot.mentions if x.acct != request.session['user'].acct]:
initial_text +=('@' + mention.acct + " ") initial_text +=('@' + mention.acct + " ")
form = PostForm({'status': initial_text, form = PostForm(initial={'status': initial_text,
'visibility': toot.visibility, 'visibility': toot.visibility,
'spoiler_text': toot.spoiler_text}) 'spoiler_text': toot.spoiler_text})
return render(request, 'main/reply.html', return render(request, 'main/reply.html',
{'context': context, 'toot': toot, 'form': form, 'reply':True, {'context': context, 'toot': toot, 'form': form, 'reply':True,
'own_acct': request.session['user'], 'own_acct': request.session['user'],