+376

api/yoten/cbor_gen.go

··· 648 648 649 649 return nil 650 650 } 651 651 + func (t *FeedComment) MarshalCBOR(w io.Writer) error { 652 652 + if t == nil { 653 653 + _, err := w.Write(cbg.CborNull) 654 654 + return err 655 655 + } 656 656 + 657 657 + cw := cbg.NewCborWriter(w) 658 658 + fieldCount := 5 659 659 + 660 660 + if t.Reply == nil { 661 661 + fieldCount-- 662 662 + } 663 663 + 664 664 + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 665 665 + return err 666 666 + } 667 667 + 668 668 + // t.Body (string) (string) 669 669 + if len("body") > 1000000 { 670 670 + return xerrors.Errorf("Value in field \"body\" was too long") 671 671 + } 672 672 + 673 673 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("body"))); err != nil { 674 674 + return err 675 675 + } 676 676 + if _, err := cw.WriteString(string("body")); err != nil { 677 677 + return err 678 678 + } 679 679 + 680 680 + if len(t.Body) > 1000000 { 681 681 + return xerrors.Errorf("Value in field t.Body was too long") 682 682 + } 683 683 + 684 684 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Body))); err != nil { 685 685 + return err 686 686 + } 687 687 + if _, err := cw.WriteString(string(t.Body)); err != nil { 688 688 + return err 689 689 + } 690 690 + 691 691 + // t.LexiconTypeID (string) (string) 692 692 + if len("$type") > 1000000 { 693 693 + return xerrors.Errorf("Value in field \"$type\" was too long") 694 694 + } 695 695 + 696 696 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("$type"))); err != nil { 697 697 + return err 698 698 + } 699 699 + if _, err := cw.WriteString(string("$type")); err != nil { 700 700 + return err 701 701 + } 702 702 + 703 703 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("app.yoten.feed.comment"))); err != nil { 704 704 + return err 705 705 + } 706 706 + if _, err := cw.WriteString(string("app.yoten.feed.comment")); err != nil { 707 707 + return err 708 708 + } 709 709 + 710 710 + // t.Reply (yoten.FeedComment_Reply) (struct) 711 711 + if t.Reply != nil { 712 712 + 713 713 + if len("reply") > 1000000 { 714 714 + return xerrors.Errorf("Value in field \"reply\" was too long") 715 715 + } 716 716 + 717 717 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("reply"))); err != nil { 718 718 + return err 719 719 + } 720 720 + if _, err := cw.WriteString(string("reply")); err != nil { 721 721 + return err 722 722 + } 723 723 + 724 724 + if err := t.Reply.MarshalCBOR(cw); err != nil { 725 725 + return err 726 726 + } 727 727 + } 728 728 + 729 729 + // t.Subject (string) (string) 730 730 + if len("subject") > 1000000 { 731 731 + return xerrors.Errorf("Value in field \"subject\" was too long") 732 732 + } 733 733 + 734 734 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("subject"))); err != nil { 735 735 + return err 736 736 + } 737 737 + if _, err := cw.WriteString(string("subject")); err != nil { 738 738 + return err 739 739 + } 740 740 + 741 741 + if len(t.Subject) > 1000000 { 742 742 + return xerrors.Errorf("Value in field t.Subject was too long") 743 743 + } 744 744 + 745 745 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Subject))); err != nil { 746 746 + return err 747 747 + } 748 748 + if _, err := cw.WriteString(string(t.Subject)); err != nil { 749 749 + return err 750 750 + } 751 751 + 752 752 + // t.CreatedAt (string) (string) 753 753 + if len("createdAt") > 1000000 { 754 754 + return xerrors.Errorf("Value in field \"createdAt\" was too long") 755 755 + } 756 756 + 757 757 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("createdAt"))); err != nil { 758 758 + return err 759 759 + } 760 760 + if _, err := cw.WriteString(string("createdAt")); err != nil { 761 761 + return err 762 762 + } 763 763 + 764 764 + if len(t.CreatedAt) > 1000000 { 765 765 + return xerrors.Errorf("Value in field t.CreatedAt was too long") 766 766 + } 767 767 + 768 768 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.CreatedAt))); err != nil { 769 769 + return err 770 770 + } 771 771 + if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { 772 772 + return err 773 773 + } 774 774 + return nil 775 775 + } 776 776 + 777 777 + func (t *FeedComment) UnmarshalCBOR(r io.Reader) (err error) { 778 778 + *t = FeedComment{} 779 779 + 780 780 + cr := cbg.NewCborReader(r) 781 781 + 782 782 + maj, extra, err := cr.ReadHeader() 783 783 + if err != nil { 784 784 + return err 785 785 + } 786 786 + defer func() { 787 787 + if err == io.EOF { 788 788 + err = io.ErrUnexpectedEOF 789 789 + } 790 790 + }() 791 791 + 792 792 + if maj != cbg.MajMap { 793 793 + return fmt.Errorf("cbor input should be of type map") 794 794 + } 795 795 + 796 796 + if extra > cbg.MaxLength { 797 797 + return fmt.Errorf("FeedComment: map struct too large (%d)", extra) 798 798 + } 799 799 + 800 800 + n := extra 801 801 + 802 802 + nameBuf := make([]byte, 9) 803 803 + for i := uint64(0); i < n; i++ { 804 804 + nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 805 805 + if err != nil { 806 806 + return err 807 807 + } 808 808 + 809 809 + if !ok { 810 810 + // Field doesn't exist on this type, so ignore it 811 811 + if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { 812 812 + return err 813 813 + } 814 814 + continue 815 815 + } 816 816 + 817 817 + switch string(nameBuf[:nameLen]) { 818 818 + // t.Body (string) (string) 819 819 + case "body": 820 820 + 821 821 + { 822 822 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 823 823 + if err != nil { 824 824 + return err 825 825 + } 826 826 + 827 827 + t.Body = string(sval) 828 828 + } 829 829 + // t.LexiconTypeID (string) (string) 830 830 + case "$type": 831 831 + 832 832 + { 833 833 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 834 834 + if err != nil { 835 835 + return err 836 836 + } 837 837 + 838 838 + t.LexiconTypeID = string(sval) 839 839 + } 840 840 + // t.Reply (yoten.FeedComment_Reply) (struct) 841 841 + case "reply": 842 842 + 843 843 + { 844 844 + 845 845 + b, err := cr.ReadByte() 846 846 + if err != nil { 847 847 + return err 848 848 + } 849 849 + if b != cbg.CborNull[0] { 850 850 + if err := cr.UnreadByte(); err != nil { 851 851 + return err 852 852 + } 853 853 + t.Reply = new(FeedComment_Reply) 854 854 + if err := t.Reply.UnmarshalCBOR(cr); err != nil { 855 855 + return xerrors.Errorf("unmarshaling t.Reply pointer: %w", err) 856 856 + } 857 857 + } 858 858 + 859 859 + } 860 860 + // t.Subject (string) (string) 861 861 + case "subject": 862 862 + 863 863 + { 864 864 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 865 865 + if err != nil { 866 866 + return err 867 867 + } 868 868 + 869 869 + t.Subject = string(sval) 870 870 + } 871 871 + // t.CreatedAt (string) (string) 872 872 + case "createdAt": 873 873 + 874 874 + { 875 875 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 876 876 + if err != nil { 877 877 + return err 878 878 + } 879 879 + 880 880 + t.CreatedAt = string(sval) 881 881 + } 882 882 + 883 883 + default: 884 884 + // Field doesn't exist on this type, so ignore it 885 885 + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { 886 886 + return err 887 887 + } 888 888 + } 889 889 + } 890 890 + 891 891 + return nil 892 892 + } 893 893 + func (t *FeedComment_Reply) MarshalCBOR(w io.Writer) error { 894 894 + if t == nil { 895 895 + _, err := w.Write(cbg.CborNull) 896 896 + return err 897 897 + } 898 898 + 899 899 + cw := cbg.NewCborWriter(w) 900 900 + 901 901 + if _, err := cw.Write([]byte{162}); err != nil { 902 902 + return err 903 903 + } 904 904 + 905 905 + // t.Root (string) (string) 906 906 + if len("root") > 1000000 { 907 907 + return xerrors.Errorf("Value in field \"root\" was too long") 908 908 + } 909 909 + 910 910 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("root"))); err != nil { 911 911 + return err 912 912 + } 913 913 + if _, err := cw.WriteString(string("root")); err != nil { 914 914 + return err 915 915 + } 916 916 + 917 917 + if len(t.Root) > 1000000 { 918 918 + return xerrors.Errorf("Value in field t.Root was too long") 919 919 + } 920 920 + 921 921 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Root))); err != nil { 922 922 + return err 923 923 + } 924 924 + if _, err := cw.WriteString(string(t.Root)); err != nil { 925 925 + return err 926 926 + } 927 927 + 928 928 + // t.Parent (string) (string) 929 929 + if len("parent") > 1000000 { 930 930 + return xerrors.Errorf("Value in field \"parent\" was too long") 931 931 + } 932 932 + 933 933 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("parent"))); err != nil { 934 934 + return err 935 935 + } 936 936 + if _, err := cw.WriteString(string("parent")); err != nil { 937 937 + return err 938 938 + } 939 939 + 940 940 + if len(t.Parent) > 1000000 { 941 941 + return xerrors.Errorf("Value in field t.Parent was too long") 942 942 + } 943 943 + 944 944 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Parent))); err != nil { 945 945 + return err 946 946 + } 947 947 + if _, err := cw.WriteString(string(t.Parent)); err != nil { 948 948 + return err 949 949 + } 950 950 + return nil 951 951 + } 952 952 + 953 953 + func (t *FeedComment_Reply) UnmarshalCBOR(r io.Reader) (err error) { 954 954 + *t = FeedComment_Reply{} 955 955 + 956 956 + cr := cbg.NewCborReader(r) 957 957 + 958 958 + maj, extra, err := cr.ReadHeader() 959 959 + if err != nil { 960 960 + return err 961 961 + } 962 962 + defer func() { 963 963 + if err == io.EOF { 964 964 + err = io.ErrUnexpectedEOF 965 965 + } 966 966 + }() 967 967 + 968 968 + if maj != cbg.MajMap { 969 969 + return fmt.Errorf("cbor input should be of type map") 970 970 + } 971 971 + 972 972 + if extra > cbg.MaxLength { 973 973 + return fmt.Errorf("FeedComment_Reply: map struct too large (%d)", extra) 974 974 + } 975 975 + 976 976 + n := extra 977 977 + 978 978 + nameBuf := make([]byte, 6) 979 979 + for i := uint64(0); i < n; i++ { 980 980 + nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 981 981 + if err != nil { 982 982 + return err 983 983 + } 984 984 + 985 985 + if !ok { 986 986 + // Field doesn't exist on this type, so ignore it 987 987 + if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil { 988 988 + return err 989 989 + } 990 990 + continue 991 991 + } 992 992 + 993 993 + switch string(nameBuf[:nameLen]) { 994 994 + // t.Root (string) (string) 995 995 + case "root": 996 996 + 997 997 + { 998 998 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 999 999 + if err != nil { 1000 1000 + return err 1001 1001 + } 1002 1002 + 1003 1003 + t.Root = string(sval) 1004 1004 + } 1005 1005 + // t.Parent (string) (string) 1006 1006 + case "parent": 1007 1007 + 1008 1008 + { 1009 1009 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 1010 1010 + if err != nil { 1011 1011 + return err 1012 1012 + } 1013 1013 + 1014 1014 + t.Parent = string(sval) 1015 1015 + } 1016 1016 + 1017 1017 + default: 1018 1018 + // Field doesn't exist on this type, so ignore it 1019 1019 + if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil { 1020 1020 + return err 1021 1021 + } 1022 1022 + } 1023 1023 + } 1024 1024 + 1025 1025 + return nil 1026 1026 + } 651 1027 func (t *FeedReaction) MarshalCBOR(w io.Writer) error { 652 1028 if t == nil { 653 1029 _, err := w.Write(cbg.CborNull)

+35

api/yoten/feedcomment.go

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package yoten 4 4 + 5 5 + // schema: app.yoten.feed.comment 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + FeedCommentNSID = "app.yoten.feed.comment" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("app.yoten.feed.comment", &FeedComment{}) 17 17 + } // 18 18 + // RECORDTYPE: FeedComment 19 19 + type FeedComment struct { 20 20 + LexiconTypeID string `json:"$type,const=app.yoten.feed.comment" cborgen:"$type,const=app.yoten.feed.comment"` 21 21 + Body string `json:"body" cborgen:"body"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + // reply: Indicates that this comment is a reply to another comment. 24 24 + Reply *FeedComment_Reply `json:"reply,omitempty" cborgen:"reply,omitempty"` 25 25 + // subject: A reference to the study session being commented on. 26 26 + Subject string `json:"subject" cborgen:"subject"` 27 27 + } 28 28 + 29 29 + // Indicates that this comment is a reply to another comment. 30 30 + type FeedComment_Reply struct { 31 31 + // parent: A reference to the specific comment being replied to. 32 32 + Parent string `json:"parent" cborgen:"parent"` 33 33 + // root: A reference to the original study session (the root of the conversation). 34 34 + Root string `json:"root" cborgen:"root"` 35 35 + }

+2

cmd/gen.go

··· 28 28 yoten.ActivityDef{}, 29 29 yoten.GraphFollow{}, 30 30 yoten.FeedReaction{}, 31 31 + yoten.FeedComment{}, 32 32 + yoten.FeedComment_Reply{}, 31 33 } 32 34 33 35 for name, rt := range AllLexTypes() {

+62

internal/db/comment.go

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "time" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + "yoten.app/api/yoten" 9 9 + "yoten.app/internal/types" 10 10 + ) 11 11 + 12 12 + type CommentWithBskyProfile struct { 13 13 + Comment 14 14 + BskyProfile types.BskyProfile 15 15 + } 16 16 + 17 17 + type Comment struct { 18 18 + ID int 19 19 + Did string 20 20 + Rkey string 21 21 + StudySessionUri syntax.ATURI 22 22 + ParentCommentUri *syntax.ATURI 23 23 + Body string 24 24 + IsDeleted bool 25 25 + CreatedAt time.Time 26 26 + } 27 27 + 28 28 + func (c Comment) CommentAt() syntax.ATURI { 29 29 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", c.Did, yoten.FeedCommentNSID, c.Rkey)) 30 30 + } 31 31 + 32 32 + func UpsertComment(e Execer, comment Comment) error { 33 33 + _, err := e.Exec(` 34 34 + insert into study_sessions ( 35 35 + id, 36 36 + did, 37 37 + rkey, 38 38 + study_session_uri, 39 39 + parent_comment_uri, 40 40 + body, 41 41 + is_deleted, 42 42 + created_at 43 43 + ) 44 44 + values () 45 45 + on conflict(did, rkey) do update set 46 46 + is_deleted = excluded.is_deleted, 47 47 + body = excluded.body`, 48 48 + comment.ID, 49 49 + comment.Did, 50 50 + comment.Rkey, 51 51 + comment.StudySessionUri.String(), 52 52 + comment.ParentCommentUri.String(), 53 53 + comment.Body, 54 54 + comment.IsDeleted, 55 55 + comment.CreatedAt.Format(time.RFC3339), 56 56 + ) 57 57 + if err != nil { 58 58 + return fmt.Errorf("failed to insert or update comment: %w", err) 59 59 + } 60 60 + 61 61 + return nil 62 62 + }

+177 -161

internal/db/db.go

··· 29 29 return nil, fmt.Errorf("failed to open db: %w", err) 30 30 } 31 31 _, err = db.Exec(` 32 32 - pragma journal_mode = WAL; 33 33 - pragma synchronous = normal; 34 34 - pragma foreign_keys = on; 35 35 - pragma temp_store = memory; 36 36 - pragma mmap_size = 30000000000; 37 37 - pragma page_size = 32768; 38 38 - pragma auto_vacuum = incremental; 39 39 - pragma busy_timeout = 5000; 32 32 + pragma journal_mode = WAL; 33 33 + pragma synchronous = normal; 34 34 + pragma foreign_keys = on; 35 35 + pragma temp_store = memory; 36 36 + pragma mmap_size = 30000000000; 37 37 + pragma page_size = 32768; 38 38 + pragma auto_vacuum = incremental; 39 39 + pragma busy_timeout = 5000; 40 40 41 41 - create table if not exists oauth_requests ( 42 42 - id integer primary key autoincrement, 43 43 - auth_server_iss text not null, 44 44 - state text not null, 45 45 - did text not null, 46 46 - handle text not null, 47 47 - pds_url text not null, 48 48 - pkce_verifier text not null, 49 49 - dpop_auth_server_nonce text not null, 50 50 - dpop_private_jwk text not null 51 51 - ); 41 41 + create table if not exists oauth_requests ( 42 42 + id integer primary key autoincrement, 43 43 + auth_server_iss text not null, 44 44 + state text not null, 45 45 + did text not null, 46 46 + handle text not null, 47 47 + pds_url text not null, 48 48 + pkce_verifier text not null, 49 49 + dpop_auth_server_nonce text not null, 50 50 + dpop_private_jwk text not null 51 51 + ); 52 52 53 53 - create table if not exists oauth_sessions ( 54 54 - id integer primary key autoincrement, 55 55 - did text not null, 56 56 - handle text not null, 57 57 - pds_url text not null, 58 58 - auth_server_iss text not null, 59 59 - access_jwt text not null, 60 60 - refresh_jwt text not null, 61 61 - dpop_pds_nonce text, 62 62 - dpop_auth_server_nonce text not null, 63 63 - dpop_private_jwk text not null, 64 64 - expiry text not null 65 65 - ); 53 53 + create table if not exists oauth_sessions ( 54 54 + id integer primary key autoincrement, 55 55 + did text not null, 56 56 + handle text not null, 57 57 + pds_url text not null, 58 58 + auth_server_iss text not null, 59 59 + access_jwt text not null, 60 60 + refresh_jwt text not null, 61 61 + dpop_pds_nonce text, 62 62 + dpop_auth_server_nonce text not null, 63 63 + dpop_private_jwk text not null, 64 64 + expiry text not null 65 65 + ); 66 66 67 67 - create table if not exists profiles ( 68 68 - -- id 69 69 - id integer primary key autoincrement, 70 70 - did text not null, 67 67 + create table if not exists profiles ( 68 68 + -- id 69 69 + id integer primary key autoincrement, 70 70 + did text not null, 71 71 72 72 - -- data 73 73 - display_name text not null, 74 74 - description text, 75 75 - location text, 76 76 - xp integer not null default 0, -- total accumulated xp 77 77 - level integer not null default 0, 78 78 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 72 72 + -- data 73 73 + display_name text not null, 74 74 + description text, 75 75 + location text, 76 76 + xp integer not null default 0, -- total accumulated xp 77 77 + level integer not null default 0, 78 78 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 79 79 80 80 - -- constraints 81 81 - unique(did) 82 82 - ); 80 80 + -- constraints 81 81 + unique(did) 82 82 + ); 83 83 84 84 - create table if not exists profile_languages ( 85 85 - -- id 86 86 - did text not null, 84 84 + create table if not exists profile_languages ( 85 85 + -- id 86 86 + did text not null, 87 87 88 88 - -- data 89 89 - language_code text not null, 88 88 + -- data 89 89 + language_code text not null, 90 90 91 91 - -- constraints 92 92 - primary key (did, language_code), 93 93 - check (length(language_code) = 2), 94 94 - foreign key (did) references profiles(did) on delete cascade 95 95 - ); 91 91 + -- constraints 92 92 + primary key (did, language_code), 93 93 + check (length(language_code) = 2), 94 94 + foreign key (did) references profiles(did) on delete cascade 95 95 + ); 96 96 97 97 - create table if not exists study_sessions ( 98 98 - -- id 99 99 - did text not null, 100 100 - rkey text not null, 97 97 + create table if not exists study_sessions ( 98 98 + -- id 99 99 + did text not null, 100 100 + rkey text not null, 101 101 102 102 - -- data 103 103 - activity_id integer not null, 104 104 - resource_id integer, 105 105 - description text, 106 106 - duration integer not null, 107 107 - language_code text not null, 108 108 - date text not null, 109 109 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 102 102 + -- data 103 103 + activity_id integer not null, 104 104 + resource_id integer, 105 105 + description text, 106 106 + duration integer not null, 107 107 + language_code text not null, 108 108 + date text not null, 109 109 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 110 110 111 111 - -- constraints 112 112 - check (length(language_code) = 2), 113 113 - foreign key (did) references profiles(did) on delete cascade, 114 114 - foreign key (activity_id) references activities(id) on delete restrict, 115 115 - foreign key (resource_id) references resources(id) on delete set null, 116 116 - primary key (did, rkey) 117 117 - ); 111 111 + -- constraints 112 112 + check (length(language_code) = 2), 113 113 + foreign key (did) references profiles(did) on delete cascade, 114 114 + foreign key (activity_id) references activities(id) on delete restrict, 115 115 + foreign key (resource_id) references resources(id) on delete set null, 116 116 + primary key (did, rkey) 117 117 + ); 118 118 119 119 - create table if not exists categories ( 120 120 - id integer primary key, -- Matches StudySessionCategory iota 121 121 - name text not null unique 122 122 - ); 119 119 + create table if not exists categories ( 120 120 + id integer primary key, -- Matches StudySessionCategory iota 121 121 + name text not null unique 122 122 + ); 123 123 124 124 - create table if not exists activities ( 125 125 - id integer primary key autoincrement, 124 124 + create table if not exists activities ( 125 125 + id integer primary key autoincrement, 126 126 127 127 - did text, 128 128 - rkey text, 127 127 + did text, 128 128 + rkey text, 129 129 130 130 - name text not null, 131 131 - description text, 132 132 - status integer not null default 0 check(status in (0, 1)), 133 133 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 130 130 + name text not null, 131 131 + description text, 132 132 + status integer not null default 0 check(status in (0, 1)), 133 133 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 134 134 + 135 135 + foreign key (did) references profiles(did) on delete cascade, 136 136 + unique (did, rkey) 137 137 + ); 138 138 + 139 139 + create table if not exists activity_categories ( 140 140 + activity_id integer not null, 141 141 + category_id integer not null, 142 142 + 143 143 + foreign key (activity_id) references activities(id) on delete cascade, 144 144 + foreign key (category_id) references categories(id) on delete cascade, 145 145 + primary key (activity_id, category_id) 146 146 + ); 147 147 + 148 148 + create table if not exists follows ( 149 149 + user_did text not null, 150 150 + subject_did text not null, 134 151 135 135 - foreign key (did) references profiles(did) on delete cascade, 136 136 - unique (did, rkey) 137 137 - ); 152 152 + rkey text not null, 153 153 + followed_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 138 154 139 139 - create table if not exists activity_categories ( 140 140 - activity_id integer not null, 141 141 - category_id integer not null, 155 155 + primary key (user_did, subject_did), 156 156 + check (user_did <> subject_did) 157 157 + ); 142 158 143 143 - foreign key (activity_id) references activities(id) on delete cascade, 144 144 - foreign key (category_id) references categories(id) on delete cascade, 145 145 - primary key (activity_id, category_id) 146 146 - ); 159 159 + create table if not exists xp_events ( 160 160 + id integer primary key autoincrement, 147 161 148 148 - create table if not exists follows ( 149 149 - user_did text not null, 150 150 - subject_did text not null, 162 162 + did text not null, 163 163 + session_rkey text not null, 164 164 + xp_gained integer not null, 165 165 + created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 151 166 152 152 - rkey text not null, 153 153 - followed_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 167 167 + foreign key (did) references profiles (did), 168 168 + foreign key (did, session_rkey) references study_sessions (did, rkey), 169 169 + unique (did, session_rkey) 170 170 + ); 154 171 155 155 - primary key (user_did, subject_did), 156 156 - check (user_did <> subject_did) 157 157 - ); 172 172 + create table if not exists study_session_reactions ( 173 173 + id integer primary key autoincrement, 158 174 159 159 - create table if not exists xp_events ( 160 160 - id integer primary key autoincrement, 175 175 + did text not null, 176 176 + rkey text not null, 161 177 162 162 - did text not null, 163 163 - session_rkey text not null, 164 164 - xp_gained integer not null, 165 165 - created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 178 178 + session_did text not null, 179 179 + session_rkey text not null, 180 180 + reaction_id integer not null, 181 181 + created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 166 182 167 167 - foreign key (did) references profiles (did), 168 168 - foreign key (did, session_rkey) references study_sessions (did, rkey), 169 169 - unique (did, session_rkey) 170 170 - ); 183 183 + foreign key (did) references profiles (did), 184 184 + foreign key (session_did, session_rkey) references study_sessions (did, rkey), 185 185 + unique (did, session_did, session_rkey, reaction_id) 186 186 + ); 171 187 172 172 - create table if not exists study_session_reactions ( 173 173 - id integer primary key autoincrement, 188 188 + create table if not exists notifications ( 189 189 + id integer primary key autoincrement, 174 190 175 175 - did text not null, 176 176 - rkey text not null, 191 191 + recipient_did text not null, 192 192 + actor_did text not null, 193 193 + subject_uri text not null, 177 194 178 178 - session_did text not null, 179 179 - session_rkey text not null, 180 180 - reaction_id integer not null, 181 181 - created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 195 195 + state text not null default 'unread' check(state in ('unread', 'read')), 196 196 + type text not null check(type in ('follow', 'reaction')), 182 197 183 183 - foreign key (did) references profiles (did), 184 184 - foreign key (session_did, session_rkey) references study_sessions (did, rkey), 185 185 - unique (did, session_did, session_rkey, reaction_id) 186 186 - ); 198 198 + created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 187 199 188 188 - create table if not exists notifications ( 189 189 - id integer primary key autoincrement, 200 200 + foreign key (recipient_did) references profiles(did) on delete cascade, 201 201 + foreign key (actor_did) references profiles(did) on delete cascade 202 202 + ); 190 203 191 191 - recipient_did text not null, 192 192 - actor_did text not null, 193 193 - subject_uri text not null, 204 204 + create table if not exists resources ( 205 205 + id integer primary key autoincrement, 194 206 195 195 - state text not null default 'unread' check(state in ('unread', 'read')), 196 196 - type text not null check(type in ('follow', 'reaction')), 207 207 + did text not null, 208 208 + rkey text not null, 197 209 198 198 - created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 210 210 + title text not null, 211 211 + type text not null, 212 212 + author text not null, 213 213 + link text, 214 214 + description text not null, 215 215 + status integer not null default 0 check(status in (0, 1)), 216 216 + created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 199 217 200 200 - foreign key (recipient_did) references profiles(did) on delete cascade, 201 201 - foreign key (actor_did) references profiles(did) on delete cascade 202 202 - ); 218 218 + foreign key (did) references profiles (did) on delete cascade, 219 219 + unique (did, rkey) 220 220 + ); 203 221 204 204 - create table if not exists resources ( 205 205 - id integer primary key autoincrement, 222 222 + create table if not exists comments ( 223 223 + id integer primary key autoincrement, 206 224 207 207 - did text not null, 208 208 - rkey text not null, 225 225 + did text not null, 226 226 + rkey text not null, 209 227 210 210 - title text not null, 211 211 - type text not null, 212 212 - author text not null, 213 213 - link text, 214 214 - description text not null, 215 215 - status integer not null default 0 check(status in (0, 1)), 216 216 - created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 228 228 + study_session_uri text not null, 229 229 + parent_comment_uri text, 230 230 + body text not null, 231 231 + is_deleted boolean not null default false, 232 232 + created_at text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 217 233 218 218 - foreign key (did) references profiles (did) on delete cascade, 219 219 - unique (did, rkey) 220 220 - ); 234 234 + foreign key (did) references profiles(did) on delete cascade 235 235 + unique (did, rkey) 236 236 + ); 221 237 222 222 - create table if not exists _jetstream ( 223 223 - id integer primary key autoincrement, 224 224 - last_time_us integer not null 225 225 - ); 238 238 + create table if not exists _jetstream ( 239 239 + id integer primary key autoincrement, 240 240 + last_time_us integer not null 241 241 + ); 226 242 227 227 - create table if not exists migrations ( 228 228 - id integer primary key autoincrement, 229 229 - name text unique 230 230 - ); 231 231 - `) 243 243 + create table if not exists migrations ( 244 244 + id integer primary key autoincrement, 245 245 + name text unique 246 246 + ); 247 247 + `) 232 248 if err != nil { 233 249 return nil, fmt.Errorf("failed to execute db create statement: %w", err) 234 250 }

+1

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

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

+50

lexicons/feed/comment.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "app.yoten.feed.comment", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "description": "A declaration of a Yōten comment.", 10 10 + "key": "tid", 11 11 + "record": { 12 12 + "type": "object", 13 13 + "required": ["subject", "body", "createdAt"], 14 14 + "properties": { 15 15 + "body": { 16 16 + "type": "string", 17 17 + "minLength": 1, 18 18 + "maxLength": 256 19 19 + }, 20 20 + "subject": { 21 21 + "type": "string", 22 22 + "format": "at-uri", 23 23 + "description": "A reference to the study session being commented on." 24 24 + }, 25 25 + "reply": { 26 26 + "type": "object", 27 27 + "description": "Indicates that this comment is a reply to another comment.", 28 28 + "required": ["root", "parent"], 29 29 + "properties": { 30 30 + "root": { 31 31 + "type": "string", 32 32 + "format": "at-uri", 33 33 + "description": "A reference to the original study session (the root of the conversation)." 34 34 + }, 35 35 + "parent": { 36 36 + "type": "string", 37 37 + "format": "at-uri", 38 38 + "description": "A reference to the specific comment being replied to." 39 39 + } 40 40 + } 41 41 + }, 42 42 + "createdAt": { 43 43 + "type": "string", 44 44 + "format": "datetime" 45 45 + } 46 46 + } 47 47 + } 48 48 + } 49 49 + } 50 50 + }