diff --git a/package.json b/package.json index 21ef23c..7d78d27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lemoncurry", - "version": "1.12.0", + "version": "1.11.0", "repository": "https://git.00dani.me/00dani/lemoncurry", "license": "MIT", "devDependencies": { diff --git a/pyproject.toml b/pyproject.toml index 75eb201..4fc7074 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lemoncurry" -version = "1.12.0" +version = "1.11.0" description = "Indieweb-compatible personal website" authors = ["Danielle McLean "] license = "MIT" diff --git a/users/admin.py b/users/admin.py index 29a1474..6cd53dd 100644 --- a/users/admin.py +++ b/users/admin.py @@ -20,7 +20,6 @@ class ProfileInline(admin.TabularInline): class UserAdmin(BaseUserAdmin): fieldsets = BaseUserAdmin.fieldsets + ( ("Profile", {"fields": ("avatar", "xmpp", "note")}), - ("Nostr", {"fields": ("nostr_key", "nostr_relays")}), ) inlines = ( PgpKeyInline, diff --git a/users/migrations/0018_auto_20230810_1754.py b/users/migrations/0018_auto_20230810_1754.py deleted file mode 100644 index 0c0785a..0000000 --- a/users/migrations/0018_auto_20230810_1754.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.20 on 2023-08-10 07:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("users", "0017_rename_key_pgpkey"), - ] - - operations = [ - migrations.AddField( - model_name="user", - name="nostr_key", - field=models.CharField(blank=True, max_length=32, null=True, unique=True), - ), - migrations.AddField( - model_name="user", - name="nostr_relays", - field=models.JSONField(blank=True, default=list), - ), - ] diff --git a/users/models.py b/users/models.py index 8f1f033..9ddac65 100644 --- a/users/models.py +++ b/users/models.py @@ -81,19 +81,6 @@ class User(ModelMeta, AbstractUser): help_text="SHA-256 hash of the user's OpenID URL, used for Libravatar", ) - nostr_key = models.CharField( - max_length=32, - unique=True, - blank=True, - null=True, - help_text="A Nostr public key in 32-byte hex format", - ) - nostr_relays = models.JSONField( - default=list, - blank=True, - help_text="An array of Nostr relay URLs that this public key posts to", - ) - @property def calc_email_md5(self): return md5(self.email.lower().encode("utf-8")).hexdigest() diff --git a/wellknowns/urls.py b/wellknowns/urls.py index 562e70b..35957c0 100644 --- a/wellknowns/urls.py +++ b/wellknowns/urls.py @@ -8,6 +8,5 @@ urlpatterns = [ path("host-meta", views.host_meta_xml, name="host-meta"), path("host-meta.json", views.host_meta_json, name="host-meta.json"), path("manifest.json", views.manifest, name="manifest"), - path("nostr.json", views.nostr_json, name="nostr.json"), path("webfinger", views.webfinger, name="webfinger"), ] diff --git a/wellknowns/views/__init__.py b/wellknowns/views/__init__.py index f3d69d3..dd2ff0f 100644 --- a/wellknowns/views/__init__.py +++ b/wellknowns/views/__init__.py @@ -1,5 +1,4 @@ from .static import keybase from .host_meta import host_meta_xml, host_meta_json from .manifest import manifest -from .nostr import nostr_json from .webfinger import webfinger diff --git a/wellknowns/views/nostr.py b/wellknowns/views/nostr.py deleted file mode 100644 index bf21a3e..0000000 --- a/wellknowns/views/nostr.py +++ /dev/null @@ -1,27 +0,0 @@ -from django.http import JsonResponse -from users.models import User - -aliases = {"00dani": ("_", "dani")} -unaliases = {alias: name for (name, aliases) in aliases.items() for alias in aliases} - - -def nostr_json(request) -> JsonResponse: - users = User.objects.filter(nostr_key__isnull=False) - - if "name" in request.GET: - name = request.GET["name"] - if name in unaliases: - name = unaliases[name] - users = users.filter(username=name) - - names = {u.username: u.nostr_key for u in users} - for name in list(names.keys()): - for alias in aliases.get(name, []): - names[alias] = names[name] - - relays = {u.nostr_key: u.nostr_relays for u in users if u.nostr_relays} - - response = {"names": names} - if relays: - response["relays"] = relays - return JsonResponse(response)