Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .claude/skills/docs/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: docs
description: Update, review, or build the Sphinx documentation for Democrasite
disable-model-invocation: true
argument-hint: "[what to update or check, e.g. 'review for accuracy' or 'add activitypub section']"
argument-hint: "[what to update or check, e.g. 'review for accuracy' or 'add social section']"
---

## Task
Expand Down Expand Up @@ -30,7 +30,7 @@ docs/
├── democrasite.webiscite.views.rst
├── democrasite.webiscite.api.rst
├── democrasite.users.rst
├── democrasite.activitypub.rst
├── democrasite.social.rst
└── … (one file per module)
```

Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ just coverage # Run tests with coverage + open HTML report
just shell # Bash shell in django container
just pyshell # Django shell_plus (IPython)
just run <cmd> # Execute arbitrary command in django container
just loaddata # Load fixtures (democrasite + activitypub)
just loaddata # Load fixtures (democrasite + social)
```

To run a single test file or test:
Expand All @@ -49,7 +49,7 @@ Pytest is configured with `--ds=config.settings.test --reuse-db` in `pyproject.t

- **`democrasite/webiscite/`** — Core app. Models: `PullRequest`, `Bill`, `Vote`. Handles GitHub webhooks, voting logic, constitution enforcement, and Celery tasks for auto-merging.
- **`democrasite/users/`** — Custom `User` model (extends `AbstractUser` with single `name` field instead of first/last). OAuth integration.
- **`democrasite/activitypub/`** — ActivityPub federation. Models: `Person` (linked to User with keypair), `Follow`.
- **`democrasite/social/`** — Social network for short notes. Models: `Person` (linked to User with keypair), `Follow`.

### Configuration

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Loading initial data

To load some initial sample data into the database, run::

$ python manage.py loaddata democrasite activitypub
$ python manage.py loaddata democrasite social

Setting up your users
^^^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
# Custom apps
"democrasite.users",
"democrasite.webiscite",
"democrasite.activitypub",
"democrasite.social",
]
# https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
Expand Down
6 changes: 2 additions & 4 deletions config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
# User management
path("users/", include("democrasite.users.urls", namespace="users")),
path("accounts/", include("allauth.urls")),
# ActivityPub
path(
"activitypub/", include("democrasite.activitypub.urls", namespace="activitypub")
),
# Social
path("social/", include("democrasite.social.urls", namespace="social")),
# webiscite
path("", include("democrasite.webiscite.urls", namespace="webiscite")),
# Media files
Expand Down
117 changes: 0 additions & 117 deletions democrasite/activitypub/migrations/0001_initial.py

This file was deleted.

18 changes: 0 additions & 18 deletions democrasite/activitypub/migrations/0003_alter_person_following.py

This file was deleted.

102 changes: 0 additions & 102 deletions democrasite/activitypub/tests/test_urls.py

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from mptt.admin import MPTTModelAdmin
from simple_history.admin import SimpleHistoryAdmin

from democrasite.activitypub.models import Note
from democrasite.activitypub.models import Person
from democrasite.social.models import Note
from democrasite.social.models import Person


@admin.register(Note)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.apps import AppConfig


class ActivitypubConfig(AppConfig):
class SocialConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "democrasite.activitypub"
name = "democrasite.social"
label = "social"
Loading
Loading