+416

api/tangled/cbor_gen.go

reviewed

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

+27

api/tangled/tangledcomment.go

reviewed

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package tangled 4 4 + 5 5 + // schema: sh.tangled.comment 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + CommentNSID = "sh.tangled.comment" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.comment", &Comment{}) 17 17 + } // 18 18 + // RECORDTYPE: Comment 19 19 + type Comment struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.comment" cborgen:"$type,const=sh.tangled.comment"` 21 21 + Body string `json:"body" cborgen:"body"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 24 24 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 25 25 + ReplyTo *string `json:"replyTo,omitempty" cborgen:"replyTo,omitempty"` 26 26 + Subject string `json:"subject" cborgen:"subject"` 27 27 + }

+1

cmd/cborgen/cborgen.go

reviewed

··· 15 15 "api/tangled/cbor_gen.go", 16 16 "tangled", 17 17 tangled.ActorProfile{}, 18 18 + tangled.Comment{}, 18 19 tangled.FeedReaction{}, 19 20 tangled.FeedStar{}, 20 21 tangled.GitRefUpdate{},

+51

lexicons/comment/comment.json

reviewed

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.comment", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "tid", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "subject", 14 14 + "body", 15 15 + "createdAt" 16 16 + ], 17 17 + "properties": { 18 18 + "subject": { 19 19 + "type": "string", 20 20 + "format": "at-uri" 21 21 + }, 22 22 + "body": { 23 23 + "type": "string" 24 24 + }, 25 25 + "createdAt": { 26 26 + "type": "string", 27 27 + "format": "datetime" 28 28 + }, 29 29 + "replyTo": { 30 30 + "type": "string", 31 31 + "format": "at-uri" 32 32 + }, 33 33 + "mentions": { 34 34 + "type": "array", 35 35 + "items": { 36 36 + "type": "string", 37 37 + "format": "did" 38 38 + } 39 39 + }, 40 40 + "references": { 41 41 + "type": "array", 42 42 + "items": { 43 43 + "type": "string", 44 44 + "format": "at-uri" 45 45 + } 46 46 + } 47 47 + } 48 48 + } 49 49 + } 50 50 + } 51 51 + }