Release 2026-02-03 - Content, signup limits and Digital Detroit project support

.dockerignore

@@ -15,3 +15,4 @@ Dockerfile
 compose/
 places/data/
 docker.env
+gdoc/

.gitignore

@@ -16,4 +16,6 @@ tmp/*.png
 *.mo
 scripts/*
 docker.env
-compose/
+compose/
+token.pickle
+credentials.json

content/db.py

@@ -0,0 +1,17 @@
+from django.db import models
+
+
+class Content(models.Model):
+
+    latest = models.ForeignKey('content.ContentVersion', models.CASCADE, related_name='+', null=True, blank=True)
+    based_on = models.ForeignKey('content.Content', models.SET_NULL, related_name='derived_content', null=True, blank=True)  #on_delete=SET_NULL might cause a problem here
+
+
+class ContentVersion(models.Model):
+
+    container = models.ForeignKey(Content, models.CASCADE, related_name='versions')
+    title = models.CharField(max_length = 100)
+    content = models.TextField()
+    date = models.DateTimeField(auto_now_add=True)
+    comment = models.CharField(max_length = 100)
+    author_uri = models.CharField(max_length=256)

content/forms.py

@@ -0,0 +1,9 @@
+from django import forms
+from content import utils
+
+class ContentForm(forms.Form):
+    title = forms.CharField(max_length=80)
+    content = forms.CharField(widget=forms.Textarea, required=False)
+
+    def clean_content(self):
+        return utils.clean_user_content(self.cleaned_data['content'])

content/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.11 on 2025-07-24 07:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Content',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('based_on', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derived_content', to='content.content')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ContentVersion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('content', models.TextField()),
+                ('date', models.DateTimeField(auto_now_add=True)),
+                ('comment', models.CharField(max_length=100)),
+                ('author_uri', models.CharField(max_length=256)),
+                ('container', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='content.content')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='content',
+            name='latest',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='content.contentversion'),
+        ),
+    ]

content/models.py

@@ -0,0 +1,106 @@
+import json
+
+from content import db
+from django.utils.text import slugify
+from django.utils.translation import gettext as _
+
+import logging
+log = logging.getLogger(__name__)
+
+
+def content_uri2id(content_uri):
+    return content_uri.strip('/').split('/')[-1]
+
+
+def get_content(content_uri, fields=[]):
+    content_id = content_uri2id(content_uri)
+    try:
+        wrapper_db = db.Content.objects.get(id=content_id)
+        latest_db = wrapper_db.latest
+    except Exception as e:
+        #TODO
+        log.debug(e)
+        return None
+
+    content = {
+        "id": wrapper_db.id,
+        "uri": "/uri/content/{0}".format(wrapper_db.id),
+        "title": latest_db.title,
+        "content": latest_db.content,
+    }
+    if "history" in fields:
+        content["history"] = []
+        for version in wrapper_db.versions.sort_by("date"):
+            content['history'] += {
+                "date": version.date,
+                "author_uri": version.author_uri,
+                "title": version.title,
+                "comment": version.comment,
+            }
+
+    return content
+
+
+def create_content(title, content, author_uri):
+    #TODO check all required properties
+    container_db = db.Content()
+    container_db.save()
+    content_db = db.ContentVersion(
+        container=container_db,
+        title=title,
+        content=content,
+        author_uri = author_uri,
+    )
+    #TODO if "comment" in content:
+    #    content_db.comment = content["comment"]
+    content_db.save()
+    container_db.latest = content_db
+    container_db.save()
+    return get_content("/uri/content/{0}".format(container_db.id))
+
+
+def update_content( uri, title, content, author_uri ):
+    content_id = content_uri2id(uri)
+    try:
+        wrapper_db = db.Content.objects.get(id=content_id)
+    except Exception as e:
+        #TODO
+        log.debug(e)
+        return None
+
+    content_db = db.ContentVersion(
+        container=wrapper_db,
+        title=title,
+        content=content,
+        author_uri = author_uri,
+    )
+    #TODO if "comment" in content:
+    #    content_db.comment = content["comment"]
+    content_db.save()
+    wrapper_db.latest = content_db
+    wrapper_db.save()
+    return get_content("/uri/content/{0}".format(wrapper_db.id))
+
+
+def clone_content(uri):
+    content_id = content_uri2id(uri)
+    try:
+        original_db = db.Content.objects.get(id=content_id)
+    except Exception as e:
+        log.debug(e)
+        raise
+
+    container_db = db.Content(based_on=original_db)
+    container_db.save()
+
+    content_db = db.ContentVersion(
+        container=container_db,
+        title=original_db.latest.title,
+        content=original_db.latest.content,
+        author_uri=original_db.latest.author_uri,
+    )
+    content_db.save()
+    container_db.latest = content_db
+    container_db.save()
+
+    return get_content("/uri/content/{0}".format(container_db.id))

content/templatetags/content_tags.py

@@ -0,0 +1,28 @@
+from django import template
+from django.template.defaultfilters import stringfilter
+from django.utils.safestring import mark_safe
+
+import markdown
+import bleach
+#from html5lib.tokenizer import HTMLTokenizer
+import re
+
+register = template.Library()
+
+def add_target_blank(attrs, new=False):
+    attrs[(None, 'target')] = '_blank'
+    return attrs
+
+@register.filter(is_safe=True)
+@stringfilter
+def convert_content( markdown_text ):
+    html = markdown.markdown(markdown_text)#TODO , ['tables'])
+    html = bleach.linkify(html, 
+            callbacks=bleach.linkifier.DEFAULT_CALLBACKS + [add_target_blank]
+    ) #TODO, tokenizer=HTMLTokenizer)
+    regex = re.compile(r'<pre\>.*?</pre\>', re.IGNORECASE|re.DOTALL)
+    f = lambda m: re.sub(r'&amp;', '&', m.group(0))
+    html = regex.sub(f, html)
+    return mark_safe(html)
+
+convert_content.is_safe = True

content/tests.py

@@ -0,0 +1,55 @@
+from django.test import Client
+from django.test import TestCase
+
+from custom_registration.models import create_user
+from content import models as content_model
+
+
+class CourseTests(TestCase):
+
+    test_username = 'testuser'
+    test_email = 'test@mail.org'
+    test_password = 'testpass'
+
+    test_username2 = 'bob'
+    test_email2 = 'bob@mail.org'
+    test_password2 = '13245'
+
+    def setUp(self):
+        self.client = Client()
+        self.locale = 'en'
+
+        self.user = create_user(
+            self.test_email,
+            self.test_username,
+            'lastname',
+            self.test_password
+        )
+
+        self.user2 = create_user(
+            self.test_email2,
+            self.test_username2,
+            'lastname2',
+            self.test_password2
+        )
+
+
+    def test_content_creation(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        content = content_model.get_content(content['uri'])
+        self.assertEquals(content, content)
+
+
+    def test_content_history(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        content_model.update_content(
+            content['uri'], 'New title', 'New content', '/uri/users/testuser'
+        )
+        # TODO this doesn't test anything?
+
+
+    def test_clone_content(self):
+        content = content_model.create_content('title', 'content', '/uri/users/bob')
+        clone = content_model.clone_content(content['uri'])
+        for key in ['title', 'content']:
+            self.assertTrue(content[key], clone[key])

content/utils.py

@@ -0,0 +1,11 @@
+import bleach
+
+def clean_user_content(content):
+    config = {
+        'tags': ['table', 'tr', 'th', 'td', 'tbody', 'a', 'iframe'],
+        'attributes': {'a': ['href'], 'iframe': ['src', 'width', 'height'] },
+        'strip': True
+    }
+    content = bleach.clean(content, **config)
+    #TODO ?? no idea why?
+    return content

courses/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .db import Course
+
+admin.site.register(Course)
+

courses/db.py

@@ -0,0 +1,28 @@
+from django.db import models
+
+class Course(models.Model):
+    title = models.CharField(max_length=255)
+    short_title = models.CharField(max_length=20)
+    description = models.CharField(max_length=1000)
+    language = models.CharField(max_length=32)
+    image_uri = models.CharField(max_length=256)
+    creation_date = models.DateTimeField(auto_now_add=True)
+    draft = models.BooleanField(default=True)
+    archived = models.BooleanField(default=False)
+    deleted = models.BooleanField(default=False)
+    creator_uri = models.CharField(max_length=256)
+    based_on = models.ForeignKey('courses.Course', models.SET_NULL, related_name='derived_courses', blank=True, null=True)
+
+    def __str__(self):
+        return self.title
+
+
+class CourseContent(models.Model):
+    course = models.ForeignKey(Course, models.CASCADE, related_name='content')
+    content_uri = models.CharField(max_length=256) 
+    index = models.PositiveIntegerField()
+
+
+class CourseTags(models.Model):
+    course = models.ForeignKey(Course, models.CASCADE, related_name='tags')
+    tag = models.CharField(max_length=64)

courses/decorators.py

@@ -0,0 +1,17 @@
+from django import http
+from django.utils.translation import gettext as _
+
+from courses import models as course_model
+
+def require_organizer( function ):
+    def check_organizer( *args, **kwargs ):
+        request = args[0]
+        course_id = kwargs.get('course_id')
+        course_uri = course_model.course_id2uri(course_id)
+        user_uri = "/uri/user/{0}".format(request.user.username)
+        organizer = course_model.is_organizer(course_uri, user_uri)
+        organizer |= request.user.is_superuser
+        if not organizer:
+            return http.HttpResponseForbidden(_("You need to be a course organizer."))
+        return function(*args, **kwargs)
+    return check_organizer

courses/forms.py

@@ -0,0 +1,46 @@
+from django import forms
+from django.conf import settings
+from django.utils.translation import gettext_lazy as _
+from django.forms.widgets import RadioSelect
+
+import re
+
+class HashtagField(forms.CharField):
+    def clean(self, value):
+        if not value:
+            return super(HashtagField, self).clean(value)
+        if not re.match('^[#]*[a-z,A-Z][a-z,A-Z,0-9,_,-]*$', value):
+            raise forms.ValidationError(_("The hashtag must start with letter and contain only letters, digits, _ and -"))
+        return super(HashtagField, self).clean(value.strip('#'))
+
+
+class CourseCreationForm(forms.Form):
+    title = forms.CharField()
+    hashtag = HashtagField(max_length=20)
+    description = forms.CharField(widget=forms.Textarea)
+    language = forms.ChoiceField(choices=settings.LANGUAGES)
+
+
+class CourseUpdateForm(forms.Form):
+    title = forms.CharField(required=False)
+    hashtag = HashtagField(required=False, max_length=20)
+    description = forms.CharField(widget=forms.Textarea, required=False)
+    language = forms.ChoiceField(choices=settings.LANGUAGES, required=False)
+
+
+class CourseImageForm(forms.Form):
+    image = forms.ImageField()
+
+
+class CourseTagsForm(forms.Form):
+    tags = forms.CharField(max_length=256)
+
+
+class CourseStatusForm(forms.Form):
+    STATUS_CHOICES = [
+        ('draft', _('Draft'), ),
+        ('published', _('Published'), ),
+        ('archived', _('Archived'), ),
+    ]
+
+    status = forms.ChoiceField(choices=STATUS_CHOICES, widget=RadioSelect)