Skip to content

Commit 57fabbd

Browse files
committed
Fix opengraph image url to be absolute
1 parent 32eee23 commit 57fabbd

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

pytition/petition/templates/petition/petition_detail.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<meta property="og:url" content="{{ meta.petition_url }}" />
2222
<meta property="og:site_name" content="{{ meta.site_url }}" />
2323
{% if petition.twitter_image %}
24-
<meta property="og:image" content="{{ petition.twitter_image }}"/>
24+
<meta property="og:image" content="{{ og_image_absolute_url }}" />
2525
{% endif %}
2626

2727
<meta itemprop="name" content="{{ petition.title }}"/>
@@ -44,7 +44,7 @@
4444
<meta name="twitter:description" content="{{ petition.raw_text|safe }}"/>
4545
{% endif %}
4646
{% if petition.twitter_image %}
47-
<meta name="twitter:image" content="{{ petition.twitter_image }}"/>
47+
<meta name="twitter:image" content="{{ og_image_absolute_url }}"/>
4848
{% endif %}
4949

5050
{% endblock %}
@@ -386,4 +386,4 @@ <h2 class="text-danger">{% trans "This petition is moderated. You only see it be
386386
</footer>
387387
</div>
388388
</div>
389-
{% endblock %}
389+
{% endblock %}

pytition/petition/views.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ def detail(request, petition_id):
175175
sign_form = SignatureForm(petition=petition)
176176
ctx = {"user": pytitionuser, 'petition': petition, 'form': sign_form,
177177
'meta': petition_detail_meta(request, petition_id),
178-
'moderation_reasons': reasons}
178+
'moderation_reasons': reasons,
179+
'og_image_absolute_url': request.build_absolute_uri(petition.twitter_image)}
179180

180181
# If we've just signed successfully the petition, do not show the sign form
181182
hide_sign_form_if_user_just_signed(request, ctx)
@@ -259,8 +260,14 @@ def create_signature(request, petition_id):
259260

260261
if request.method == "POST":
261262
form = SignatureForm(petition=petition, data=request.POST)
263+
ctx = {
264+
'petition': petition,
265+
'form': form,
266+
'meta': petition_detail_meta(request, petition_id),
267+
'og_image_absolute_url': request.build_absolute_uri(petition.twitter_image)
268+
}
262269
if not form.is_valid():
263-
return render(request, 'petition/petition_detail.html', {'petition': petition, 'form': form, 'meta': petition_detail_meta(request, petition_id)})
270+
return render(request, 'petition/petition_detail.html', ctx)
264271

265272
ipaddr = make_password(
266273
get_client_ip(request),
@@ -272,7 +279,7 @@ def create_signature(request, petition_id):
272279
date__gt=since)
273280
if signatures.count() > settings.SIGNATURE_THROTTLE:
274281
messages.error(request, _("Too many signatures from your IP address, please try again later."))
275-
return render(request, 'petition/petition_detail.html', {'petition': petition, 'form': form, 'meta': petition_detail_meta(request, petition_id)})
282+
return render(request, 'petition/petition_detail.html', ctx)
276283
else:
277284
signature = form.save()
278285
signature.ipaddress = ipaddr
@@ -1557,7 +1564,8 @@ def slug_show_petition(request, orgslugname=None, username=None, petitionname=No
15571564
reasons = ModerationReason.objects.all()
15581565
ctx = {"user": pytitionuser, "petition": petition, "form": sign_form,
15591566
'meta': petition_detail_meta(request, petition.id),
1560-
'moderation_reasons': reasons}
1567+
'moderation_reasons': reasons,
1568+
'og_image_absolute_url': request.build_absolute_uri(petition.twitter_image)}
15611569

15621570
# If we've just signed successfully the petition, do not show the sign form
15631571
hide_sign_form_if_user_just_signed(request, ctx)

0 commit comments

Comments
 (0)