Merge branch 'master' into avatar-creator

.coveragerc

@@ -5,6 +5,11 @@ omit =
     node_modules/*
     .virtualenv/*
     import_libravatar.py
+    requirements.txt
+    static/admin/*
+    static/humans.txt
+    static/img/robots.txt
+
 
 [html]
 extra_css = coverage_extra_style.css

.gitlab-ci.yml

@@ -1,4 +1,6 @@
-image: docker.io/ofalk/fedora31-python3
+image:
+  name: quay.io/rhn_support_ofalk/fedora34-python3
+  entrypoint: [ '/bin/sh', '-c' ]
 
 before_script:
   - virtualenv -p python3 /tmp/.virtualenv

INSTALL.md

@@ -23,6 +23,7 @@ cd ivatar
 virtualenv -p python3 .virtualenv 
 source .virtualenv/bin/activate
 pip install -r requirements.txt
+pip install pillow
 ~~~~
 
 ## (SQL) Migrations

ivatar/ivataraccount/migrations/0017_auto_20210528_1314.py

@@ -0,0 +1,48 @@
+# Generated by Django 3.2.3 on 2021-05-28 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ivataraccount', '0016_auto_20210413_0904'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='confirmedemail',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='confirmedopenid',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='openidassociation',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='openidnonce',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='unconfirmedemail',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='unconfirmedopenid',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

ivatar/ivataraccount/models.py

@@ -359,11 +359,12 @@ class UnconfirmedEmail(BaseAccountModel):
 
     def save(self, force_insert=False, force_update=False, using=None,
              update_fields=None):
-        hash_object = hashlib.new('sha256')
-        hash_object.update(
-            urandom(1024) + self.user.username.encode('utf-8')  # pylint: disable=no-member
-        )  # pylint: disable=no-member
-        self.verification_key = hash_object.hexdigest()
+        if not self.verification_key:
+            hash_object = hashlib.new('sha256')
+            hash_object.update(
+                urandom(1024) + self.user.username.encode('utf-8')  # pylint: disable=no-member
+            )  # pylint: disable=no-member
+            self.verification_key = hash_object.hexdigest()
         super(UnconfirmedEmail, self).save(
             force_insert,
             force_update,

ivatar/settings.py

@@ -118,4 +118,6 @@ PROJECT_ROOT = os.path.abspath(
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 from config import *  # pylint: disable=wildcard-import,wrong-import-position,unused-wildcard-import

ivatar/views.py

@@ -411,7 +411,4 @@ class StatsView(TemplateView, JsonResponse):
             'openids': ConfirmedOpenId.objects.all().count(),  # pylint: disable=no-member
         }
 
-        if request.content_type == 'application/json':
-            return JsonResponse(retval)
-
-        return HttpResponseRedirect(reverse_lazy('home'))
+        return JsonResponse(retval)

requirements.txt

@@ -1,7 +1,7 @@
 autopep8
 bcrypt
 defusedxml
-Django<3.2
+Django
 django-auth-ldap
 django-bootstrap4
 django-coverage-plugin

templates/contact.html

@@ -14,9 +14,7 @@
 There are a few ways to get in touch with the ivatar/libravatar developers:
 <h4 style="margin-top: 2rem;margin-bottom: 1rem;">IRC</h4>
 
-If you have an IRC client already, you can join #libravatar on chat.freenode.net.
-<br/>
-Otherwise, you can use this <a href="http://webchat.freenode.net/?channels=libravatar" title="http://webchat.freenode.net/?channels=libravatar">simple web interface</a>.
+You can join the Libravatar community chat at <a href="https://matrix.to/#/#libravatar:matrix.org?via=shivering-isles.com&via=matrix.org&via=foad.me.uk" title="Libravatar on Matrix">#libravatar:matrix.org</a>. It is also bridged to #libravatar on irc.<a href="https://libera.chat/">libera.chat</a> for those prefering IRC.
 <br/>
 Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :)