feat: add comment lexicon and db struct

api/yoten/cbor_gen.go

···
 
 	return nil
 }
+func (t *FeedComment) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+
+	cw := cbg.NewCborWriter(w)
+	fieldCount := 5
+
+	if t.Reply == nil {
+		fieldCount--
+	}
+
+	if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil {
+		return err
+	}
+
+	// t.Body (string) (string)
+	if len("body") > 1000000 {
+		return xerrors.Errorf("Value in field \"body\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("body")); err != nil {
+		return err
+	}
+
+	if len(t.Body) > 1000000 {
+		return xerrors.Errorf("Value in field t.Body was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string(t.Body)); err != nil {
+		return err
+	}
+
+	// t.LexiconTypeID (string) (string)
+	if len("$type") > 1000000 {
+		return xerrors.Errorf("Value in field \"$type\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("$type")); err != nil {
+		return err
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("app.yoten.feed.comment"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("app.yoten.feed.comment")); err != nil {
+		return err
+	}
+
+	// t.Reply (yoten.FeedComment_Reply) (struct)
+	if t.Reply != nil {
+
+		if len("reply") > 1000000 {
+			return xerrors.Errorf("Value in field \"reply\" was too long")
+		}
+
+		if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("reply"))); err != nil {
+			return err
+		}
+		if _, err := cw.WriteString(string("reply")); err != nil {
+			return err
+		}
+
+		if err := t.Reply.MarshalCBOR(cw); err != nil {
+			return err
+		}
+	}
+
+	// t.Subject (string) (string)
+	if len("subject") > 1000000 {
+		return xerrors.Errorf("Value in field \"subject\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("subject")); err != nil {
+		return err
+	}
+
+	if len(t.Subject) > 1000000 {
+		return xerrors.Errorf("Value in field t.Subject was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string(t.Subject)); err != nil {
+		return err
+	}
+
+	// t.CreatedAt (string) (string)
+	if len("createdAt") > 1000000 {
+		return xerrors.Errorf("Value in field \"createdAt\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("createdAt")); err != nil {
+		return err
+	}
+
+	if len(t.CreatedAt) > 1000000 {
+		return xerrors.Errorf("Value in field t.CreatedAt was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string(t.CreatedAt)); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *FeedComment) UnmarshalCBOR(r io.Reader) (err error) {
+	*t = FeedComment{}
+
+	cr := cbg.NewCborReader(r)
+
+	maj, extra, err := cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+	}()
+
+	if maj != cbg.MajMap {
+		return fmt.Errorf("cbor input should be of type map")
+	}
+
+	if extra > cbg.MaxLength {
+		return fmt.Errorf("FeedComment: map struct too large (%d)", extra)
+	}
+
+	n := extra
+
+	nameBuf := make([]byte, 9)
+	for i := uint64(0); i < n; i++ {
+		nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000)
+		if err != nil {
+			return err
+		}
+
+		if !ok {
+			// Field doesn't exist on this type, so ignore it
+			if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil {
+				return err
+			}
+			continue
+		}
+
+		switch string(nameBuf[:nameLen]) {
+		// t.Body (string) (string)
+		case "body":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.Body = string(sval)
+			}
+			// t.LexiconTypeID (string) (string)
+		case "$type":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.LexiconTypeID = string(sval)
+			}
+			// t.Reply (yoten.FeedComment_Reply) (struct)
+		case "reply":
+
+			{
+
+				b, err := cr.ReadByte()
+				if err != nil {
+					return err
+				}
+				if b != cbg.CborNull[0] {
+					if err := cr.UnreadByte(); err != nil {
+						return err
+					}
+					t.Reply = new(FeedComment_Reply)
+					if err := t.Reply.UnmarshalCBOR(cr); err != nil {
+						return xerrors.Errorf("unmarshaling t.Reply pointer: %w", err)
+					}
+				}
+
+			}
+			// t.Subject (string) (string)
+		case "subject":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.Subject = string(sval)
+			}
+			// t.CreatedAt (string) (string)
+		case "createdAt":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.CreatedAt = string(sval)
+			}
+
+		default:
+			// Field doesn't exist on this type, so ignore it
+			if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+func (t *FeedComment_Reply) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+
+	cw := cbg.NewCborWriter(w)
+
+	if _, err := cw.Write([]byte{162}); err != nil {
+		return err
+	}
+
+	// t.Root (string) (string)
+	if len("root") > 1000000 {
+		return xerrors.Errorf("Value in field \"root\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("root"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("root")); err != nil {
+		return err
+	}
+
+	if len(t.Root) > 1000000 {
+		return xerrors.Errorf("Value in field t.Root was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Root))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string(t.Root)); err != nil {
+		return err
+	}
+
+	// t.Parent (string) (string)
+	if len("parent") > 1000000 {
+		return xerrors.Errorf("Value in field \"parent\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("parent"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("parent")); err != nil {
+		return err
+	}
+
+	if len(t.Parent) > 1000000 {
+		return xerrors.Errorf("Value in field t.Parent was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Parent))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string(t.Parent)); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *FeedComment_Reply) UnmarshalCBOR(r io.Reader) (err error) {
+	*t = FeedComment_Reply{}
+
+	cr := cbg.NewCborReader(r)
+
+	maj, extra, err := cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+	}()
+
+	if maj != cbg.MajMap {
+		return fmt.Errorf("cbor input should be of type map")
+	}
+
+	if extra > cbg.MaxLength {
+		return fmt.Errorf("FeedComment_Reply: map struct too large (%d)", extra)
+	}
+
+	n := extra
+
+	nameBuf := make([]byte, 6)
+	for i := uint64(0); i < n; i++ {
+		nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000)
+		if err != nil {
+			return err
+		}
+
+		if !ok {
+			// Field doesn't exist on this type, so ignore it
+			if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil {
+				return err
+			}
+			continue
+		}
+
+		switch string(nameBuf[:nameLen]) {
+		// t.Root (string) (string)
+		case "root":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.Root = string(sval)
+			}
+			// t.Parent (string) (string)
+		case "parent":
+
+			{
+				sval, err := cbg.ReadStringWithMax(cr, 1000000)
+				if err != nil {
+					return err
+				}
+
+				t.Parent = string(sval)
+			}
+
+		default:
+			// Field doesn't exist on this type, so ignore it
+			if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
 func (t *FeedReaction) MarshalCBOR(w io.Writer) error {
 	if t == nil {
 		_, err := w.Write(cbg.CborNull)

api/yoten/feedcomment.go

···
+// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
+
+package yoten
+
+// schema: app.yoten.feed.comment
+
+import (
+	"github.com/bluesky-social/indigo/lex/util"
+)
+
+const (
+	FeedCommentNSID = "app.yoten.feed.comment"
+)
+
+func init() {
+	util.RegisterType("app.yoten.feed.comment", &FeedComment{})
+} //
+// RECORDTYPE: FeedComment
+type FeedComment struct {
+	LexiconTypeID string `json:"$type,const=app.yoten.feed.comment" cborgen:"$type,const=app.yoten.feed.comment"`
+	Body          string `json:"body" cborgen:"body"`
+	CreatedAt     string `json:"createdAt" cborgen:"createdAt"`
+	// reply: Indicates that this comment is a reply to another comment.
+	Reply *FeedComment_Reply `json:"reply,omitempty" cborgen:"reply,omitempty"`
+	// subject: A reference to the study session being commented on.
+	Subject string `json:"subject" cborgen:"subject"`
+}
+
+// Indicates that this comment is a reply to another comment.
+type FeedComment_Reply struct {
+	// parent: A reference to the specific comment being replied to.
+	Parent string `json:"parent" cborgen:"parent"`
+	// root: A reference to the original study session (the root of the conversation).
+	Root string `json:"root" cborgen:"root"`
+}

cmd/gen.go

···
 		yoten.ActivityDef{},
 		yoten.GraphFollow{},
 		yoten.FeedReaction{},
+		yoten.FeedComment{},
+		yoten.FeedComment_Reply{},
 	}
 
 	for name, rt := range AllLexTypes() {

internal/db/comment.go

···
+package db
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/bluesky-social/indigo/atproto/syntax"
+	"yoten.app/api/yoten"
+	"yoten.app/internal/types"
+)
+
+type CommentWithBskyProfile struct {
+	Comment
+	BskyProfile types.BskyProfile
+}
+
+type Comment struct {
+	ID               int
+	Did              string
+	Rkey             string
+	StudySessionUri  syntax.ATURI
+	ParentCommentUri *syntax.ATURI
+	Body             string
+	IsDeleted        bool
+	CreatedAt        time.Time
+}
+
+func (c Comment) CommentAt() syntax.ATURI {
+	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", c.Did, yoten.FeedCommentNSID, c.Rkey))
+}
+
+func UpsertComment(e Execer, comment Comment) error {
+	_, err := e.Exec(`
+        insert into study_sessions (
+			id,
+			did,
+            rkey,
+			study_session_uri,
+			parent_comment_uri,
+			body,
+			is_deleted,
+            created_at
+		)
+		values ()
+        on conflict(did, rkey) do update set
+			is_deleted = excluded.is_deleted,
+            body = excluded.body`,
+		comment.ID,
+		comment.Did,
+		comment.Rkey,
+		comment.StudySessionUri.String(),
+		comment.ParentCommentUri.String(),
+		comment.Body,
+		comment.IsDeleted,
+		comment.CreatedAt.Format(time.RFC3339),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to insert or update comment: %w", err)
+	}
+
+	return nil
+}

internal/db/db.go

···
 		return nil, fmt.Errorf("failed to open db: %w", err)
 	}
 	_, err = db.Exec(`
-		pragma journal_mode = WAL;
-		pragma synchronous = normal;
-		pragma foreign_keys = on;
-		pragma temp_store = memory;
-		pragma mmap_size = 30000000000;
-		pragma page_size = 32768;
-		pragma auto_vacuum = incremental;
-		pragma busy_timeout = 5000;
+			pragma journal_mode = WAL;
+			pragma synchronous = normal;
+			pragma foreign_keys = on;
+			pragma temp_store = memory;
+			pragma mmap_size = 30000000000;
+			pragma page_size = 32768;
+			pragma auto_vacuum = incremental;
+			pragma busy_timeout = 5000;
 
-        create table if not exists oauth_requests (
-            id integer primary key autoincrement,
-            auth_server_iss text not null,
-            state text not null,
-            did text not null,
-            handle text not null,
-            pds_url text not null,
-            pkce_verifier text not null,
-            dpop_auth_server_nonce text not null,
-            dpop_private_jwk text not null
-        );
+			create table if not exists oauth_requests (
+				id integer primary key autoincrement,
+				auth_server_iss text not null,
+				state text not null,
+				did text not null,
+				handle text not null,
+				pds_url text not null,
+				pkce_verifier text not null,
+				dpop_auth_server_nonce text not null,
+				dpop_private_jwk text not null
+			);
 
-        create table if not exists oauth_sessions (
-            id integer primary key autoincrement,
-            did text not null,
-            handle text not null,
-            pds_url text not null,
-            auth_server_iss text not null,
-            access_jwt text not null,
-            refresh_jwt text not null,
-            dpop_pds_nonce text,
-            dpop_auth_server_nonce text not null,
-            dpop_private_jwk text not null,
-            expiry text not null
-        );
+			create table if not exists oauth_sessions (
+				id integer primary key autoincrement,
+				did text not null,
+				handle text not null,
+				pds_url text not null,
+				auth_server_iss text not null,
+				access_jwt text not null,
+				refresh_jwt text not null,
+				dpop_pds_nonce text,
+				dpop_auth_server_nonce text not null,
+				dpop_private_jwk text not null,
+				expiry text not null
+			);
 
-        create table if not exists profiles (
-            -- id
-            id integer primary key autoincrement,
-            did text not null,
+			create table if not exists profiles (
+				-- id
+				id integer primary key autoincrement,
+				did text not null,
 
-            -- data
-            display_name text not null,
-            description text,
-            location text,
-            xp integer not null default 0, -- total accumulated xp
-            level integer not null default 0,
-            created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				-- data
+				display_name text not null,
+				description text,
+				location text,
+				xp integer not null default 0, -- total accumulated xp
+				level integer not null default 0,
+				created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-            -- constraints
-            unique(did)
-        );
+				-- constraints
+				unique(did)
+			);
 
-        create table if not exists profile_languages (
-            -- id
-            did text not null,
+			create table if not exists profile_languages (
+				-- id
+				did text not null,
 
-            -- data
-            language_code text not null,
+				-- data
+				language_code text not null,
 
-            -- constraints
-            primary key (did, language_code),
-            check (length(language_code) = 2),
-            foreign key (did) references profiles(did) on delete cascade
-        );
+				-- constraints
+				primary key (did, language_code),
+				check (length(language_code) = 2),
+				foreign key (did) references profiles(did) on delete cascade
+			);
 
-        create table if not exists study_sessions (
-            -- id
-            did text not null,
-            rkey text not null,
+			create table if not exists study_sessions (
+				-- id
+				did text not null,
+				rkey text not null,
 
-            -- data
-            activity_id integer not null,
-            resource_id integer,
-            description text,
-            duration integer not null,
-            language_code text not null,
-            date text not null,
-            created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				-- data
+				activity_id integer not null,
+				resource_id integer,
+				description text,
+				duration integer not null,
+				language_code text not null,
+				date text not null,
+				created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-            -- constraints
-            check (length(language_code) = 2),
-            foreign key (did) references profiles(did) on delete cascade,
-            foreign key (activity_id) references activities(id) on delete restrict,
-            foreign key (resource_id) references resources(id) on delete set null,
-            primary key (did, rkey)
-        );
+				-- constraints
+				check (length(language_code) = 2),
+				foreign key (did) references profiles(did) on delete cascade,
+				foreign key (activity_id) references activities(id) on delete restrict,
+				foreign key (resource_id) references resources(id) on delete set null,
+				primary key (did, rkey)
+			);
 
-        create table if not exists categories (
-            id integer primary key, -- Matches StudySessionCategory iota
-            name text not null unique
-        );
+			create table if not exists categories (
+				id integer primary key, -- Matches StudySessionCategory iota
+				name text not null unique
+			);
 
-        create table if not exists activities (
-            id integer primary key autoincrement,
+			create table if not exists activities (
+				id integer primary key autoincrement,
 
-            did text,
-            rkey text,
+				did text,
+				rkey text,
 
-            name text not null,
-            description text,
-            status integer not null default 0 check(status in (0, 1)),
-            created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				name text not null,
+				description text,
+				status integer not null default 0 check(status in (0, 1)),
+				created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+
+				foreign key (did) references profiles(did) on delete cascade,
+				unique (did, rkey)
+			);
+
+			create table if not exists activity_categories (
+				activity_id integer not null,
+				category_id integer not null,
+
+				foreign key (activity_id) references activities(id) on delete cascade,
+				foreign key (category_id) references categories(id) on delete cascade,
+				primary key (activity_id, category_id)
+			);
+
+			create table if not exists follows (
+				user_did text not null,
+				subject_did text not null,
 
-            foreign key (did) references profiles(did) on delete cascade,
-            unique (did, rkey)
-        );
+				rkey text not null,
+				followed_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-        create table if not exists activity_categories (
-            activity_id integer not null,
-            category_id integer not null,
+				primary key (user_did, subject_did),
+				check (user_did <> subject_did)
+			);
 
-            foreign key (activity_id) references activities(id) on delete cascade,
-            foreign key (category_id) references categories(id) on delete cascade,
-            primary key (activity_id, category_id)
-        );
+			create table if not exists xp_events (
+				id integer primary key autoincrement,
 
-        create table if not exists follows (
-			user_did text not null,
-			subject_did text not null,
+				did text not null,
+				session_rkey text not null,
+				xp_gained integer not null,
+				created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-			rkey text not null,
-			followed_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				foreign key (did) references profiles (did),
+				foreign key (did, session_rkey) references study_sessions (did, rkey),
+				unique (did, session_rkey)
+			);
 
-			primary key (user_did, subject_did),
-			check (user_did <> subject_did)
-		);
+			create table if not exists study_session_reactions (
+				id integer primary key autoincrement,
 
-        create table if not exists xp_events (
-            id integer primary key autoincrement,
+				did text not null,
+				rkey text not null,
 
-            did text not null,
-            session_rkey text not null,
-            xp_gained integer not null,
-            created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				session_did text not null,
+				session_rkey text not null,
+				reaction_id integer not null,
+				created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-            foreign key (did) references profiles (did),
-            foreign key (did, session_rkey) references study_sessions (did, rkey),
-            unique (did, session_rkey)
-        );
+				foreign key (did) references profiles (did),
+				foreign key (session_did, session_rkey) references study_sessions (did, rkey),
+				unique (did, session_did, session_rkey, reaction_id)
+			);
 
-        create table if not exists study_session_reactions (
-            id integer primary key autoincrement,
+			create table if not exists notifications (
+				id integer primary key autoincrement,
 
-            did text not null,
-            rkey text not null,
+				recipient_did text not null,
+				actor_did text not null,
+				subject_uri text not null,
 
-            session_did text not null,
-            session_rkey text not null,
-            reaction_id integer not null,
-            created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				state text not null default 'unread' check(state in ('unread', 'read')),
+				type text not null check(type in ('follow', 'reaction')),
 
-            foreign key (did) references profiles (did),
-            foreign key (session_did, session_rkey) references study_sessions (did, rkey),
-            unique (did, session_did, session_rkey, reaction_id)
-        );
+				created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-        create table if not exists notifications (
-            id integer primary key autoincrement,
+				foreign key (recipient_did) references profiles(did) on delete cascade,
+				foreign key (actor_did) references profiles(did) on delete cascade
+			);
 
-			recipient_did text not null,
-			actor_did text not null,
-			subject_uri text not null,
+			create table if not exists resources (
+				id integer primary key autoincrement,
 
-			state text not null default 'unread' check(state in ('unread', 'read')),
-			type text not null check(type in ('follow', 'reaction')),
+				did text not null,
+				rkey text not null,
 
-            created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				title text not null,
+				type text not null,
+				author text not null,
+				link text,
+				description text not null,
+				status integer not null default 0 check(status in (0, 1)),
+				created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-			foreign key (recipient_did) references profiles(did) on delete cascade,
-			foreign key (actor_did) references profiles(did) on delete cascade
-        );
+				foreign key (did) references profiles (did) on delete cascade,
+				unique (did, rkey)
+			);
 
-        create table if not exists resources (
-            id integer primary key autoincrement,
+			create table if not exists comments (
+				id integer primary key autoincrement,
 
-            did text not null,
-            rkey text not null,
+				did text not null,
+				rkey text not null,
 
-            title text not null,
-            type text not null,
-            author text not null,
-            link text,
-            description text not null,
-            status integer not null default 0 check(status in (0, 1)),
-            created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+				study_session_uri text not null,
+				parent_comment_uri text,
+				body text not null,
+				is_deleted boolean not null default false,
+				created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
 
-            foreign key (did) references profiles (did) on delete cascade,
-            unique (did, rkey)
-        );
+				foreign key (did) references profiles(did) on delete cascade
+				unique (did, rkey)
+			);
 
-        create table if not exists _jetstream (
-            id integer primary key autoincrement,
-            last_time_us integer not null
-        );
+			create table if not exists _jetstream (
+				id integer primary key autoincrement,
+				last_time_us integer not null
+			);
 
-        create table if not exists migrations (
-            id integer primary key autoincrement,
-            name text unique
-        );
-	`)
+			create table if not exists migrations (
+				id integer primary key autoincrement,
+				name text unique
+			);
+		`)
 	if err != nil {
 		return nil, fmt.Errorf("failed to execute db create statement: %w", err)
 	}

internal/server/views/new-study-session.templ

···
 					stopAndLog() {
 						this.pause();
 						const form = this.$root;
+						this.timerState = 'stopped';
 
 						let durationSeconds = form.querySelector('input[name="duration_seconds"]');
 						if (!durationSeconds) {

lexicons/feed/comment.json

···
+{
+  "lexicon": 1,
+  "id": "app.yoten.feed.comment",
+  "needsCbor": true,
+  "needsType": true,
+  "defs": {
+    "main": {
+      "type": "record",
+      "description": "A declaration of a Yōten comment.",
+      "key": "tid",
+      "record": {
+        "type": "object",
+        "required": ["subject", "body", "createdAt"],
+        "properties": {
+          "body": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 256
+          },
+          "subject": {
+            "type": "string",
+            "format": "at-uri",
+            "description": "A reference to the study session being commented on."
+          },
+          "reply": {
+            "type": "object",
+            "description": "Indicates that this comment is a reply to another comment.",
+            "required": ["root", "parent"],
+            "properties": {
+              "root": {
+                "type": "string",
+                "format": "at-uri",
+                "description": "A reference to the original study session (the root of the conversation)."
+              },
+              "parent": {
+                "type": "string",
+                "format": "at-uri",
+                "description": "A reference to the specific comment being replied to."
+              }
+            }
+          }, 
+          "createdAt": { 
+            "type": "string", 
+            "format": "datetime" 
+          } 
+        }
+      }
+    }
+  }
+}