From 1afb0df721edc4338ae1d8912dbd3cf75eeaa595 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Tue, 9 Oct 2018 19:11:13 +0200
Subject: [PATCH 1/5] Preferences are no longer used, do not list 'em

---
 templates/_account_bar.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/_account_bar.html b/templates/_account_bar.html
index ec1c7cb..52fc705 100644
--- a/templates/_account_bar.html
+++ b/templates/_account_bar.html
@@ -12,7 +12,9 @@
         <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
           {% if request.user.is_authenticated %}
             <li><a href="{% url 'profile' %}"><i class="fa fa-image" aria-hidden="true"></i> {% trans 'Profile' %}</a></li>
+<!--
             <li><a href="{% url 'user_preference' %}"><i class="fa fa-cog" aria-hidden="true"></i> {% trans 'Preferences' %}</a></li>
+-->
             <li><a href="{% url 'import_photo' %}"><i class="fa fa-envelope-square" aria-hidden="true"></i> {% trans 'Import photo via mail address' %}</a></li>
             <li><a href="{% url 'upload_export' %}"><i class="fa fa-file-archive-o" aria-hidden="true"></i> {% trans 'Import libravatar XML export' %}</a></li>
             <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i> {% trans 'Logout' %}</a></li>

From 617717a144deefe646c37f5cf2fd0aa85d518f7a Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Tue, 9 Oct 2018 19:11:31 +0200
Subject: [PATCH 2/5] Prepare for description page (WiP)

---
 ivatar/urls.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ivatar/urls.py b/ivatar/urls.py
index 7e93a9c..f0d9787 100644
--- a/ivatar/urls.py
+++ b/ivatar/urls.py
@@ -20,6 +20,7 @@ urlpatterns = [  # pylint: disable=invalid-name
     url(
         r'avatar/(?P<digest>\w{32})',
         AvatarImageView.as_view(), name='avatar_view'),
+    url('description/', TemplateView.as_view(template_name='description.html'), name='description'),
     url('security/', TemplateView.as_view(template_name='security.html'), name='security'),
     url('contact/', TemplateView.as_view(template_name='contact.html'), name='contact'),
     path('talk_to_us/', RedirectView.as_view(url='/contact'), name='talk_to_us'),

From 3badfd8dc162de7cd1ac27de2d0f130e7520f51f Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Tue, 9 Oct 2018 19:20:31 +0200
Subject: [PATCH 3/5] Add notsetuptools as dep for monsterid and add monsterid
 and pydenticon

---
 requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index 839d5b3..cfd7b9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,3 +31,6 @@ yapf
 django-anymail[mailgun]
 mysqlclient
 psycopg2
+notsetuptools
+git+https://github.com/ofalk/monsterid.git
+git+https://github.com/azaghal/pydenticon.git

From 9a447bb858c02e6ed04f9a6fc3f7fe0972bda9f4 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Tue, 9 Oct 2018 19:22:15 +0200
Subject: [PATCH 4/5] Add monsterid functionality

---
 ivatar/views.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ivatar/views.py b/ivatar/views.py
index 1e0e842..9cd5920 100644
--- a/ivatar/views.py
+++ b/ivatar/views.py
@@ -13,6 +13,8 @@ from ivatar.settings import AVATAR_MAX_SIZE, JPEG_QUALITY
 from . ivataraccount.models import ConfirmedEmail, ConfirmedOpenId
 from . ivataraccount.models import pil_format
 
+from monsterid.id import build_monster
+
 
 class AvatarImageView(TemplateView):
     '''
@@ -80,6 +82,14 @@ class AvatarImageView(TemplateView):
             if default:
                 if str(default) == str(404):
                     return HttpResponseNotFound(_('<h1>Image not found</h1>'))
+                if str(default) == 'monsterid':
+                    monsterdata = build_monster(seed=kwargs['digest'], size=(size, size))
+                    data = BytesIO()
+                    monsterdata.save(data, 'PNG', quality=JPEG_QUALITY)
+                    data.seek(0)
+                    return HttpResponse(
+                        data,
+                        content_type='image/png')
                 return HttpResponseRedirect(default)
 
             static_img = path.join('static', 'img', 'mm', '%s%s' % (str(size), '.png'))

From 1de1257a4228845bc87aa73f4a5b2241bfd3808a Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@linux-kernel.at>
Date: Wed, 10 Oct 2018 09:48:53 +0200
Subject: [PATCH 5/5] use default, not d, since d not in params of course

---
 ivatar/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivatar/views.py b/ivatar/views.py
index 9cd5920..23de9de 100644
--- a/ivatar/views.py
+++ b/ivatar/views.py
@@ -36,7 +36,7 @@ class AvatarImageView(TemplateView):
         if 'd' in request.GET:
             default = request.GET['d']
         if 'default' in request.GET:
-            default = request.GET['d']
+            default = request.GET['default']
 
         if 'f' in request.GET:
             if request.GET['f'] == 'y':