{% if result.avatar_server_http %}
-
-{{result.avatar_server_http}}
+
+http://{{result.avatar_server_http}}
{% if result.avatar_server_http_ipv4 %}
{{ result.avatar_server_http_ipv4 }}
@@ -66,8 +65,8 @@
{% if result.avatar_server_https %}
-
-{{result.avatar_server_https}}
+
+https://{{result.avatar_server_https}}
{% if result.avatar_server_https_ipv4 %}
{{ result.avatar_server_https_ipv4 }}
diff --git a/ivatar/tools/urls.py b/ivatar/tools/urls.py
index 9605ed4..1a13b43 100644
--- a/ivatar/tools/urls.py
+++ b/ivatar/tools/urls.py
@@ -8,4 +8,5 @@ from . views import CheckView, CheckDomainView
urlpatterns = [ # pylint: disable=invalid-name
url('check/', CheckView.as_view(), name='tools_check'),
url('check_domain/', CheckDomainView.as_view(), name='tools_check_domain'),
+ url('check_domain$', CheckDomainView.as_view(), name='tools_check_domain'),
]
diff --git a/ivatar/views.py b/ivatar/views.py
index b8850ad..b8c2743 100644
--- a/ivatar/views.py
+++ b/ivatar/views.py
@@ -22,6 +22,7 @@ import pagan
from robohash import Robohash
from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY, DEFAULT_AVATAR_SIZE
+from ivatar.settings import CACHE_IMAGES_MAX_AGE
from . ivataraccount.models import ConfirmedEmail, ConfirmedOpenId
from . ivataraccount.models import pil_format, file_format
@@ -147,9 +148,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
monsterdata.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'robohash':
roboset = 'any'
@@ -160,9 +163,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
robohash.img.save(data, format='png')
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'retro':
identicon = Identicon.render(kwargs['digest'])
@@ -171,9 +176,11 @@ class AvatarImageView(TemplateView):
img = img.resize((size, size), Image.ANTIALIAS)
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'pagan':
paganobj = pagan.Avatar(kwargs['digest'])
@@ -181,9 +188,11 @@ class AvatarImageView(TemplateView):
img = paganobj.img.resize((size, size), Image.ANTIALIAS)
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'identicon':
p = Pydenticon5()
@@ -193,9 +202,11 @@ class AvatarImageView(TemplateView):
data = BytesIO()
img.save(data, 'PNG', quality=JPEG_QUALITY)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/png')
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
if str(default) == 'mm' or str(default) == 'mp':
# If mm is explicitly given, we need to catch that
@@ -231,9 +242,11 @@ class AvatarImageView(TemplateView):
obj.save()
if imgformat == 'jpg':
imgformat = 'jpeg'
- return HttpResponse(
+ response = HttpResponse(
data,
content_type='image/%s' % imgformat)
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
class GravatarProxyView(View):
'''
@@ -302,9 +315,11 @@ class GravatarProxyView(View):
data = BytesIO(gravatarimagedata.read())
img = Image.open(data)
data.seek(0)
- return HttpResponse(
+ response = HttpResponse(
data.read(),
content_type='image/%s' % file_format(img.format))
+ response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE
+ return response
except ValueError as exc:
print('Value error: %s' % exc)
diff --git a/templates/contact.html b/templates/contact.html
index af10e2a..5fdbfb5 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -30,6 +30,10 @@ If you've got a proposal to discuss or prefer to write to us, you can join our <
You can also put short notices to our attention on
Identica or
Twitter.
+
Mastodon
+
+Our Mastodon profile is available on
https://photog.social/@libravatar.
+
Email
Finally, if you need to email us:
dev@libravatar.org