post aperture refactor (May-8b): Post.title field; Line.author PROTECT FK + created_at; Note.grant_if_new admin-vs-Look! format dispatch w. note-ref anchor; bottom-anchored aperture w. shared-between header + per-Line user/timestamp; dotted-? Brief square; reserved adman seed — TDD
- schema: billboard/0004 adds Post.title (CharField 35) + Line.author (PROTECT FK, related_name=authored_lines) + Line.created_at (auto_now_add); RunPython backfill stamps existing rows (note_unlock → "Notes & recognitions" + author=adman; user_post → first-line glean + author=Post.owner).
- lyric/0003 seeds adman User (system author for note unlock + share invite Lines); apps.lyric.models gains RESERVED_USERNAMES = {"adman"}, is_reserved_username() guard in dashboard.set_profile, get_or_create_adman() lazy fetch (TransactionTestCase flushes the seed).
- drama: Note.grant_if_new dispatches via _ADMIN_NOTE_SLUGS = {"super-schizo","super-nomad"} — admin slugs use "The administration recognizes…" prose; everyone else uses "Look!—new Note unlocked." Both wrap Note name in `<a class="note-ref">`. Header Line dropped (test_two_different_grants_share_one_post asserts 2 lines, not 3). Note.display_name property added (slug.title() default — "super-schizo" → "Super-Schizo"). User.active_title_display returns donned recognition title or "Earthman" default.
- billboard models: Post.name property removed → my_posts.html, _applet-my-posts.html, PostSerializer switched to Post.title. LineForm.save(for_post, author) + ExistingPostLineForm.save(author) signature + all callers (api.views, billboard.views.new_post + view_post + share_post). billboard.views.share_post authors via get_or_create_adman; new_post truncates first line for Post.title via _truncate_post_title.
- post.html: <h3> post title heading; .post-shared-recipients (commas only) + .post-shared-self lines ("just me, X the Earthman" / "& me, X the Y" 0/≥1 split); #id_post_table is now a <ul> w. justify-content: flex-end + per-Line 3-col grid (author/text/time); adman Lines render |safe + .post-line--system italic; #id_text → #id_post_line_text rename (post.html only — /billboard/ new-post applet keeps #id_text); page_class page-billpost (joins billboard+billscroll body-class trio).
- SCSS _billboard.scss: .post-page extends %billboard-page-base, adds bottom-anchored flex-column scroll + 3-col .post-line grid + .post-line-form pinned at bottom. _note.scss: a.note-banner__image picks up .note-item__image-box dashed-? styling for the Brief square.
- _buddy_panel.html JS rewired for new layout: _appendLine builds <li class="post-line post-line--system"> w. adman+timestamp; _appendRecipientChip handles 0→1+ transition (rewrites "just me," → "& me,", inserts .post-shared-recipients line above self).
- FT post_page.py: get_table_rows queries .post-line; wait_for_row_in_post_table matches by text containment (line_number arg ignored — kept for backwards compat); get_line_input_box probes #id_post_line_text first, falls back to #id_text; get_post_owner reads textContent (hidden span). test_applet_new_post_line_validation switched to input[name="text"]:invalid/:valid for cross-page selectors.
- rootvars.scss: minor plutonium + fuschia tweaks (pre-existing).
- 818 ITs + 35 FTs (buddy/new-post/sharing/validation/layout/jasmine/my-notes/my-posts) green.
Code architected by Disco DeDisco <discodedisco@outlook.com>
Git commit message Co-Authored-By:
Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -13,10 +13,11 @@ class LineForm(forms.Form):
|
||||
required=True,
|
||||
)
|
||||
|
||||
def save(self, for_post):
|
||||
def save(self, for_post, author):
|
||||
return Line.objects.create(
|
||||
post=for_post,
|
||||
text=self.cleaned_data["text"],
|
||||
author=author,
|
||||
)
|
||||
|
||||
|
||||
@@ -31,5 +32,5 @@ class ExistingPostLineForm(LineForm):
|
||||
raise forms.ValidationError(DUPLICATE_LINE_ERROR)
|
||||
return text
|
||||
|
||||
def save(self):
|
||||
return super().save(for_post=self._for_post)
|
||||
def save(self, author):
|
||||
return super().save(for_post=self._for_post, author=author)
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
# Adds Post.title, Line.author (PROTECT FK to lyric.User), Line.created_at.
|
||||
# Backfills Post.title from first-line text (truncate 32 + "…" past 35 chars,
|
||||
# or hardcoded "Notes & recognitions" for KIND_NOTE_UNLOCK), and Line.author
|
||||
# from Post.owner — except KIND_NOTE_UNLOCK + ownerless rows, which attribute
|
||||
# to the seeded `adman` User. Depends on lyric/0003_seed_adman so adman
|
||||
# exists before backfill runs.
|
||||
|
||||
from django.db import migrations, models
|
||||
from django.db.models import deletion
|
||||
from django.utils import timezone
|
||||
|
||||
|
||||
_NOTE_UNLOCK_TITLE = "Notes & recognitions"
|
||||
|
||||
|
||||
def _truncate_title(text, length=35):
|
||||
if len(text) <= length:
|
||||
return text
|
||||
return text[: length - 3] + "..."
|
||||
|
||||
|
||||
def backfill(apps, schema_editor):
|
||||
Post = apps.get_model("billboard", "Post")
|
||||
Line = apps.get_model("billboard", "Line")
|
||||
User = apps.get_model("lyric", "User")
|
||||
|
||||
adman = User.objects.filter(username="adman").first()
|
||||
|
||||
for post in Post.objects.all():
|
||||
if post.kind == "note_unlock":
|
||||
post.title = _NOTE_UNLOCK_TITLE
|
||||
else:
|
||||
first_line = post.lines.order_by("id").first()
|
||||
post.title = _truncate_title(first_line.text) if first_line else ""
|
||||
post.save(update_fields=["title"])
|
||||
|
||||
now = timezone.now()
|
||||
for line in Line.objects.select_related("post").all():
|
||||
if line.post.kind == "note_unlock":
|
||||
line.author = adman
|
||||
elif line.post.owner_id:
|
||||
line.author_id = line.post.owner_id
|
||||
else:
|
||||
line.author = adman
|
||||
if line.created_at is None:
|
||||
line.created_at = now
|
||||
line.save(update_fields=["author", "created_at"])
|
||||
|
||||
|
||||
def reverse_noop(apps, schema_editor):
|
||||
pass
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("billboard", "0003_post_kind"),
|
||||
("lyric", "0003_seed_adman"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="post",
|
||||
name="title",
|
||||
field=models.CharField(default="", max_length=35),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="line",
|
||||
name="created_at",
|
||||
field=models.DateTimeField(default=timezone.now),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="line",
|
||||
name="author",
|
||||
field=models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=deletion.PROTECT,
|
||||
related_name="authored_lines",
|
||||
to="lyric.user",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(backfill, reverse_noop),
|
||||
migrations.AlterField(
|
||||
model_name="line",
|
||||
name="author",
|
||||
field=models.ForeignKey(
|
||||
on_delete=deletion.PROTECT,
|
||||
related_name="authored_lines",
|
||||
to="lyric.user",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="line",
|
||||
name="created_at",
|
||||
field=models.DateTimeField(auto_now_add=True),
|
||||
),
|
||||
]
|
||||
@@ -39,9 +39,12 @@ class Post(models.Model):
|
||||
default=KIND_USER_POST,
|
||||
)
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self.lines.first().text
|
||||
# Stored title — set explicitly on creation. Note-unlock Posts hardcode
|
||||
# "Notes & recognitions"; user_post Posts truncate first line to 35 chars
|
||||
# (32 + "..." past length). Replaces the legacy `name` property which
|
||||
# gleaned `lines.first().text` lazily and broke if the first Line was
|
||||
# later edited or deleted.
|
||||
title = models.CharField(max_length=35, default="")
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse("billboard:view_post", args=[self.id])
|
||||
@@ -50,9 +53,19 @@ class Post(models.Model):
|
||||
class Line(models.Model):
|
||||
text = models.TextField(default="")
|
||||
post = models.ForeignKey(Post, default=None, on_delete=models.CASCADE, related_name="lines")
|
||||
# `author` PROTECTs against accidental sitewide-entity deletion (notably
|
||||
# `adman`, the system-author for note_unlock + share_invite Lines).
|
||||
# User-typed Lines attribute to the typing User; system-rendered Lines
|
||||
# attribute to adman so the per-line "username" column always renders.
|
||||
author = models.ForeignKey(
|
||||
"lyric.User",
|
||||
on_delete=models.PROTECT,
|
||||
related_name="authored_lines",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
ordering = ("created_at", "id")
|
||||
unique_together = ("post", "text")
|
||||
|
||||
def __str__(self):
|
||||
|
||||
@@ -17,7 +17,7 @@ class BriefModelTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="brief@test.io")
|
||||
self.post = Post.objects.create(owner=self.user)
|
||||
self.line = Line.objects.create(post=self.post, text="Stargazer, 5:21pm")
|
||||
self.line = Line.objects.create(post=self.post, text="Stargazer, 5:21pm", author=self.user)
|
||||
|
||||
def test_brief_defaults_unread(self):
|
||||
b = Brief.objects.create(owner=self.user, post=self.post, line=self.line)
|
||||
@@ -72,7 +72,7 @@ class ViewPostMarksReadTest(TestCase):
|
||||
self.user = User.objects.create(email="reader@test.io")
|
||||
self.client.force_login(self.user)
|
||||
self.post = Post.objects.create(owner=self.user)
|
||||
self.line = Line.objects.create(post=self.post, text="entry one")
|
||||
self.line = Line.objects.create(post=self.post, text="entry one", author=self.user)
|
||||
|
||||
def test_get_view_post_flips_owner_unread_brief_to_read(self):
|
||||
b = Brief.objects.create(owner=self.user, post=self.post, line=self.line)
|
||||
@@ -94,7 +94,7 @@ class ViewPostMarksReadTest(TestCase):
|
||||
|
||||
def test_get_does_not_flip_briefs_on_other_posts(self):
|
||||
other_post = Post.objects.create(owner=self.user)
|
||||
other_line = Line.objects.create(post=other_post, text="other")
|
||||
other_line = Line.objects.create(post=other_post, text="other", author=self.user)
|
||||
unrelated = Brief.objects.create(owner=self.user, post=other_post, line=other_line)
|
||||
self.client.get(reverse("billboard:view_post", args=[self.post.id]))
|
||||
unrelated.refresh_from_db()
|
||||
|
||||
@@ -16,7 +16,7 @@ from apps.dashboard.views import _PALETTE_DEFS
|
||||
from apps.drama.models import GameEvent, Note, ScrollPosition
|
||||
from apps.epic.models import Room
|
||||
from apps.epic.utils import rooms_for_user
|
||||
from apps.lyric.models import User
|
||||
from apps.lyric.models import User, get_or_create_adman
|
||||
|
||||
_PALETTE_LABELS = {p["name"]: p["label"] for p in _PALETTE_DEFS}
|
||||
|
||||
@@ -219,14 +219,30 @@ def doff_title(request, slug):
|
||||
# Templates also live under templates/apps/billboard/. URL names sit in the
|
||||
# `billboard:` namespace so reversers across the codebase carry the prefix.
|
||||
|
||||
def _truncate_post_title(text, length=35):
|
||||
"""Glean a Post.title from the first user-submitted Line: copy first
|
||||
`length` chars exactly, or truncate to `length-3` chars + "..." past
|
||||
that. Mirrors billboard/migrations/0004 backfill helper."""
|
||||
if len(text) <= length:
|
||||
return text
|
||||
return text[: length - 3] + "..."
|
||||
|
||||
|
||||
def new_post(request):
|
||||
form = LineForm(data=request.POST)
|
||||
if form.is_valid():
|
||||
nupost = Post.objects.create()
|
||||
# Anonymous compose path (Percival ch. 18 chapters) keeps owner=null
|
||||
# but still needs an author for the Line FK. We require auth on this
|
||||
# view's caller paths in practice; no anonymous Lines reach prod.
|
||||
author = request.user if request.user.is_authenticated else None
|
||||
nupost = Post.objects.create(
|
||||
title=_truncate_post_title(form.cleaned_data["text"]),
|
||||
)
|
||||
if request.user.is_authenticated:
|
||||
nupost.owner = request.user
|
||||
nupost.save()
|
||||
form.save(for_post=nupost)
|
||||
if author is not None:
|
||||
form.save(for_post=nupost, author=author)
|
||||
return redirect(nupost)
|
||||
else:
|
||||
context = {
|
||||
@@ -253,7 +269,7 @@ def view_post(request, post_id):
|
||||
if request.method == "POST":
|
||||
form = ExistingPostLineForm(for_post=our_post, data=request.POST)
|
||||
if form.is_valid():
|
||||
form.save()
|
||||
form.save(author=request.user)
|
||||
return redirect(our_post)
|
||||
|
||||
# GET render is the FYI-read contract — flip every unread Brief on this
|
||||
@@ -266,7 +282,7 @@ def view_post(request, post_id):
|
||||
return render(request, "apps/billboard/post.html", {
|
||||
"post": our_post,
|
||||
"form": form,
|
||||
"page_class": "page-billboard",
|
||||
"page_class": "page-billpost",
|
||||
})
|
||||
|
||||
|
||||
@@ -306,11 +322,13 @@ def share_post(request, post_id):
|
||||
# response shape mustn't leak whether the email is on the system. Line
|
||||
# text carries an isoformat timestamp w/ microseconds so two rapid
|
||||
# shares of the same email don't collide on the
|
||||
# Line.unique_together(post, text) constraint.
|
||||
# Line.unique_together(post, text) constraint. System-authored as adman
|
||||
# so the per-line "username" column renders the share announcement.
|
||||
line_text = (
|
||||
f"Shared with {recipient_email} at {timezone.now().isoformat()}"
|
||||
)
|
||||
line = Line.objects.create(post=our_post, text=line_text)
|
||||
adman = get_or_create_adman()
|
||||
line = Line.objects.create(post=our_post, text=line_text, author=adman)
|
||||
|
||||
brief = None
|
||||
if request.user.is_authenticated:
|
||||
|
||||
Reference in New Issue
Block a user