commit 3c8a87ca14e866c10d535da3497be2a1b50bd48c · nel.pet/core

+5 -110

appview/db/strings.go

···

       1
        
       package db

     

       2
        
       

     

       3
        
       import (

     

       4
       -
       	"bytes"

     

       5
        
       	"database/sql"

     

       6
        
       	"errors"

     

       7
        
       	"fmt"

     

       8
       -
       	"io"

     

       9
        
       	"strings"

     

       10
        
       	"time"

     

       11
       -
       	"unicode/utf8"

     

       12
        
       

     

       13
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       14
       -
       	"tangled.org/core/api/tangled"

     

       15
        
       )

     

       16
        
       

     

       17
       -
       type String struct {

     

       18
       -
       	Did  syntax.DID

     

       19
       -
       	Rkey string

     

       20
       -
       

     

       21
       -
       	Filename    string

     

       22
       -
       	Description string

     

       23
       -
       	Contents    string

     

       24
       -
       	Created     time.Time

     

       25
       -
       	Edited      *time.Time

     

       26
       -
       }

     

       27
       -
       

     

       28
       -
       func (s *String) StringAt() syntax.ATURI {

     

       29
       -
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       30
       -
       }

     

       31
       -
       

     

       32
       -
       type StringStats struct {

     

       33
       -
       	LineCount uint64

     

       34
       -
       	ByteCount uint64

     

       35
       -
       }

     

       36
       -
       

     

       37
       -
       func (s String) Stats() StringStats {

     

       38
       -
       	lineCount, err := countLines(strings.NewReader(s.Contents))

     

       39
       -
       	if err != nil {

     

       40
       -
       		// non-fatal

     

       41
       -
       		// TODO: log this?

     

       42
       -
       	}

     

       43
       -
       

     

       44
       -
       	return StringStats{

     

       45
       -
       		LineCount: uint64(lineCount),

     

       46
       -
       		ByteCount: uint64(len(s.Contents)),

     

       47
       -
       	}

     

       48
       -
       }

     

       49
       -
       

     

       50
       -
       func (s String) Validate() error {

     

       51
       -
       	var err error

     

       52
       -
       

     

       53
       -
       	if utf8.RuneCountInString(s.Filename) > 140 {

     

       54
       -
       		err = errors.Join(err, fmt.Errorf("filename too long"))

     

       55
       -
       	}

     

       56
       -
       

     

       57
       -
       	if utf8.RuneCountInString(s.Description) > 280 {

     

       58
       -
       		err = errors.Join(err, fmt.Errorf("description too long"))

     

       59
       -
       	}

     

       60
       -
       

     

       61
       -
       	if len(s.Contents) == 0 {

     

       62
       -
       		err = errors.Join(err, fmt.Errorf("contents is empty"))

     

       63
       -
       	}

     

       64
       -
       

     

       65
       -
       	return err

     

       66
       -
       }

     

       67
       -
       

     

       68
       -
       func (s *String) AsRecord() tangled.String {

     

       69
       -
       	return tangled.String{

     

       70
       -
       		Filename:    s.Filename,

     

       71
       -
       		Description: s.Description,

     

       72
       -
       		Contents:    s.Contents,

     

       73
       -
       		CreatedAt:   s.Created.Format(time.RFC3339),

     

       74
       -
       	}

     

       75
       -
       }

     

       76
       -
       

     

       77
       -
       func StringFromRecord(did, rkey string, record tangled.String) String {

     

       78
       -
       	created, err := time.Parse(record.CreatedAt, time.RFC3339)

     

       79
       -
       	if err != nil {

     

       80
       -
       		created = time.Now()

     

       81
       -
       	}

     

       82
       -
       	return String{

     

       83
       -
       		Did:         syntax.DID(did),

     

       84
       -
       		Rkey:        rkey,

     

       85
       -
       		Filename:    record.Filename,

     

       86
       -
       		Description: record.Description,

     

       87
       -
       		Contents:    record.Contents,

     

       88
       -
       		Created:     created,

     

       89
       -
       	}

     

       90
       -
       }

     

       91
       -
       

     

       92
       -
       func AddString(e Execer, s String) error {

     

       93
        
       	_, err := e.Exec(

     

       94
        
       		`insert into strings (

     

       95
        
       			did,

     
···

       123
        
       	return err

     

       124
        
       }

     

       125
        
       

     

       126
       -
       func GetStrings(e Execer, limit int, filters ...filter) ([]String, error) {

     

       127
       -
       	var all []String

     

       128
        
       

     

       129
        
       	var conditions []string

     

       130
        
       	var args []any

     
···

       167
        
       	defer rows.Close()

     

       168
        
       

     

       169
        
       	for rows.Next() {

     

       170
       -
       		var s String

     

       171
        
       		var createdAt string

     

       172
        
       		var editedAt sql.NullString

     

       173
        
       

     
···

       248
        
       	_, err := e.Exec(query, args...)

     

       249
        
       	return err

     

       250
        
       }

     

       251
       -
       

     

       252
       -
       func countLines(r io.Reader) (int, error) {

     

       253
       -
       	buf := make([]byte, 32*1024)

     

       254
       -
       	bufLen := 0

     

       255
       -
       	count := 0

     

       256
       -
       	nl := []byte{'\n'}

     

       257
       -
       

     

       258
       -
       	for {

     

       259
       -
       		c, err := r.Read(buf)

     

       260
       -
       		if c > 0 {

     

       261
       -
       			bufLen += c

     

       262
       -
       		}

     

       263
       -
       		count += bytes.Count(buf[:c], nl)

     

       264
       -
       

     

       265
       -
       		switch {

     

       266
       -
       		case err == io.EOF:

     

       267
       -
       			/* handle last line not having a newline at the end */

     

       268
       -
       			if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' {

     

       269
       -
       				count++

     

       270
       -
       			}

     

       271
       -
       			return count, nil

     

       272
       -
       		case err != nil:

     

       273
       -
       			return 0, err

     

       274
       -
       		}

     

       275
       -
       	}

     

       276
       -
       }

···

       1
        
       package db

     

       2
        
       

     

       3
        
       import (

     

       0
        
       
     

       4
        
       	"database/sql"

     

       5
        
       	"errors"

     

       6
        
       	"fmt"

     

       0
        
       
     

       7
        
       	"strings"

     

       8
        
       	"time"

     

       0
        
       
     

       9
        
       

     

       10
       +
       	"tangled.org/core/appview/models"

     

       0
        
       
     

       11
        
       )

     

       12
        
       

     

       13
       +
       func AddString(e Execer, s models.String) error {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       	_, err := e.Exec(

     

       15
        
       		`insert into strings (

     

       16
        
       			did,

     
···

       44
        
       	return err

     

       45
        
       }

     

       46
        
       

     

       47
       +
       func GetStrings(e Execer, limit int, filters ...filter) ([]models.String, error) {

     

       48
       +
       	var all []models.String

     

       49
        
       

     

       50
        
       	var conditions []string

     

       51
        
       	var args []any

     
···

       88
        
       	defer rows.Close()

     

       89
        
       

     

       90
        
       	for rows.Next() {

     

       91
       +
       		var s models.String

     

       92
        
       		var createdAt string

     

       93
        
       		var editedAt sql.NullString

     

       94
        
       

     
···

       169
        
       	_, err := e.Exec(query, args...)

     

       170
        
       	return err

     

       171
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

+2 -2

appview/ingester.go

···

       594
        
       			return err

     

       595
        
       		}

     

       596
        
       

     

       597
       -
       		string := db.StringFromRecord(did, rkey, record)

     

       598
        
       

     

       599
       -
       		if err = string.Validate(); err != nil {

     

       600
        
       			l.Error("invalid record", "err", err)

     

       601
        
       			return err

     

       602
        
       		}

···

       594
        
       			return err

     

       595
        
       		}

     

       596
        
       

     

       597
       +
       		string := models.StringFromRecord(did, rkey, record)

     

       598
        
       

     

       599
       +
       		if err = i.Validator.ValidateString(&string); err != nil {

     

       600
        
       			l.Error("invalid record", "err", err)

     

       601
        
       			return err

     

       602
        
       		}

+95

appview/models/string.go

···

       1
       +
       package models

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"bytes"

     

       5
       +
       	"fmt"

     

       6
       +
       	"io"

     

       7
       +
       	"strings"

     

       8
       +
       	"time"

     

       9
       +
       

     

       10
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       11
       +
       	"tangled.org/core/api/tangled"

     

       12
       +
       )

     

       13
       +
       

     

       14
       +
       type String struct {

     

       15
       +
       	Did  syntax.DID

     

       16
       +
       	Rkey string

     

       17
       +
       

     

       18
       +
       	Filename    string

     

       19
       +
       	Description string

     

       20
       +
       	Contents    string

     

       21
       +
       	Created     time.Time

     

       22
       +
       	Edited      *time.Time

     

       23
       +
       }

     

       24
       +
       

     

       25
       +
       func (s *String) StringAt() syntax.ATURI {

     

       26
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       27
       +
       }

     

       28
       +
       

     

       29
       +
       func (s *String) AsRecord() tangled.String {

     

       30
       +
       	return tangled.String{

     

       31
       +
       		Filename:    s.Filename,

     

       32
       +
       		Description: s.Description,

     

       33
       +
       		Contents:    s.Contents,

     

       34
       +
       		CreatedAt:   s.Created.Format(time.RFC3339),

     

       35
       +
       	}

     

       36
       +
       }

     

       37
       +
       

     

       38
       +
       func StringFromRecord(did, rkey string, record tangled.String) String {

     

       39
       +
       	created, err := time.Parse(record.CreatedAt, time.RFC3339)

     

       40
       +
       	if err != nil {

     

       41
       +
       		created = time.Now()

     

       42
       +
       	}

     

       43
       +
       	return String{

     

       44
       +
       		Did:         syntax.DID(did),

     

       45
       +
       		Rkey:        rkey,

     

       46
       +
       		Filename:    record.Filename,

     

       47
       +
       		Description: record.Description,

     

       48
       +
       		Contents:    record.Contents,

     

       49
       +
       		Created:     created,

     

       50
       +
       	}

     

       51
       +
       }

     

       52
       +
       

     

       53
       +
       type StringStats struct {

     

       54
       +
       	LineCount uint64

     

       55
       +
       	ByteCount uint64

     

       56
       +
       }

     

       57
       +
       

     

       58
       +
       func (s String) Stats() StringStats {

     

       59
       +
       	lineCount, err := countLines(strings.NewReader(s.Contents))

     

       60
       +
       	if err != nil {

     

       61
       +
       		// non-fatal

     

       62
       +
       		// TODO: log this?

     

       63
       +
       	}

     

       64
       +
       

     

       65
       +
       	return StringStats{

     

       66
       +
       		LineCount: uint64(lineCount),

     

       67
       +
       		ByteCount: uint64(len(s.Contents)),

     

       68
       +
       	}

     

       69
       +
       }

     

       70
       +
       

     

       71
       +
       func countLines(r io.Reader) (int, error) {

     

       72
       +
       	buf := make([]byte, 32*1024)

     

       73
       +
       	bufLen := 0

     

       74
       +
       	count := 0

     

       75
       +
       	nl := []byte{'\n'}

     

       76
       +
       

     

       77
       +
       	for {

     

       78
       +
       		c, err := r.Read(buf)

     

       79
       +
       		if c > 0 {

     

       80
       +
       			bufLen += c

     

       81
       +
       		}

     

       82
       +
       		count += bytes.Count(buf[:c], nl)

     

       83
       +
       

     

       84
       +
       		switch {

     

       85
       +
       		case err == io.EOF:

     

       86
       +
       			/* handle last line not having a newline at the end */

     

       87
       +
       			if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' {

     

       88
       +
       				count++

     

       89
       +
       			}

     

       90
       +
       			return count, nil

     

       91
       +
       		case err != nil:

     

       92
       +
       			return 0, err

     

       93
       +
       		}

     

       94
       +
       	}

     

       95
       +
       }

+2 -3

appview/notify/merged_notifier.go

···

       3
        
       import (

     

       4
        
       	"context"

     

       5
        
       

     

       6
       -
       	"tangled.org/core/appview/db"

     

       7
        
       	"tangled.org/core/appview/models"

     

       8
        
       )

     

       9
        
       

     
···

       68
        
       	}

     

       69
        
       }

     

       70
        
       

     

       71
       -
       func (m *mergedNotifier) NewString(ctx context.Context, string *db.String) {

     

       72
        
       	for _, notifier := range m.notifiers {

     

       73
        
       		notifier.NewString(ctx, string)

     

       74
        
       	}

     

       75
        
       }

     

       76
        
       

     

       77
       -
       func (m *mergedNotifier) EditString(ctx context.Context, string *db.String) {

     

       78
        
       	for _, notifier := range m.notifiers {

     

       79
        
       		notifier.EditString(ctx, string)

     

       80
        
       	}

···

       3
        
       import (

     

       4
        
       	"context"

     

       5
        
       

     

       0
        
       
     

       6
        
       	"tangled.org/core/appview/models"

     

       7
        
       )

     

       8
        
       

     
···

       67
        
       	}

     

       68
        
       }

     

       69
        
       

     

       70
       +
       func (m *mergedNotifier) NewString(ctx context.Context, string *models.String) {

     

       71
        
       	for _, notifier := range m.notifiers {

     

       72
        
       		notifier.NewString(ctx, string)

     

       73
        
       	}

     

       74
        
       }

     

       75
        
       

     

       76
       +
       func (m *mergedNotifier) EditString(ctx context.Context, string *models.String) {

     

       77
        
       	for _, notifier := range m.notifiers {

     

       78
        
       		notifier.EditString(ctx, string)

     

       79
        
       	}

+4 -5

appview/notify/notifier.go

···

       3
        
       import (

     

       4
        
       	"context"

     

       5
        
       

     

       6
       -
       	"tangled.org/core/appview/db"

     

       7
        
       	"tangled.org/core/appview/models"

     

       8
        
       )

     

       9
        
       

     
···

       23
        
       

     

       24
        
       	UpdateProfile(ctx context.Context, profile *models.Profile)

     

       25
        
       

     

       26
       -
       	NewString(ctx context.Context, s *db.String)

     

       27
       -
       	EditString(ctx context.Context, s *db.String)

     

       28
        
       	DeleteString(ctx context.Context, did, rkey string)

     

       29
        
       }

     

       30
        
       

     
···

       48
        
       

     

       49
        
       func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {}

     

       50
        
       

     

       51
       -
       func (m *BaseNotifier) NewString(ctx context.Context, s *db.String)        {}

     

       52
       -
       func (m *BaseNotifier) EditString(ctx context.Context, s *db.String)       {}

     

       53
        
       func (m *BaseNotifier) DeleteString(ctx context.Context, did, rkey string) {}

···

       3
        
       import (

     

       4
        
       	"context"

     

       5
        
       

     

       0
        
       
     

       6
        
       	"tangled.org/core/appview/models"

     

       7
        
       )

     

       8
        
       

     
···

       22
        
       

     

       23
        
       	UpdateProfile(ctx context.Context, profile *models.Profile)

     

       24
        
       

     

       25
       +
       	NewString(ctx context.Context, s *models.String)

     

       26
       +
       	EditString(ctx context.Context, s *models.String)

     

       27
        
       	DeleteString(ctx context.Context, did, rkey string)

     

       28
        
       }

     

       29
        
       

     
···

       47
        
       

     

       48
        
       func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {}

     

       49
        
       

     

       50
       +
       func (m *BaseNotifier) NewString(ctx context.Context, s *models.String)    {}

     

       51
       +
       func (m *BaseNotifier) EditString(ctx context.Context, s *models.String)   {}

     

       52
        
       func (m *BaseNotifier) DeleteString(ctx context.Context, did, rkey string) {}

+6 -6

appview/pages/pages.go

···

       477
        
       

     

       478
        
       type ProfileStringsParams struct {

     

       479
        
       	LoggedInUser *oauth.User

     

       480
       -
       	Strings      []db.String

     

       481
        
       	Card         *ProfileCard

     

       482
        
       	Active       string

     

       483
        
       }

     
···

       1308
        
       	Action       string

     

       1309
        
       

     

       1310
        
       	// this is supplied in the case of editing an existing string

     

       1311
       -
       	String db.String

     

       1312
        
       }

     

       1313
        
       

     

       1314
        
       func (p *Pages) PutString(w io.Writer, params PutStringParams) error {

     
···

       1318
        
       type StringsDashboardParams struct {

     

       1319
        
       	LoggedInUser *oauth.User

     

       1320
        
       	Card         ProfileCard

     

       1321
       -
       	Strings      []db.String

     

       1322
        
       }

     

       1323
        
       

     

       1324
        
       func (p *Pages) StringsDashboard(w io.Writer, params StringsDashboardParams) error {

     
···

       1327
        
       

     

       1328
        
       type StringTimelineParams struct {

     

       1329
        
       	LoggedInUser *oauth.User

     

       1330
       -
       	Strings      []db.String

     

       1331
        
       }

     

       1332
        
       

     

       1333
        
       func (p *Pages) StringsTimeline(w io.Writer, params StringTimelineParams) error {

     
···

       1339
        
       	ShowRendered     bool

     

       1340
        
       	RenderToggle     bool

     

       1341
        
       	RenderedContents template.HTML

     

       1342
       -
       	String           db.String

     

       1343
       -
       	Stats            db.StringStats

     

       1344
        
       	Owner            identity.Identity

     

       1345
        
       }

     

       1346

···

       477
        
       

     

       478
        
       type ProfileStringsParams struct {

     

       479
        
       	LoggedInUser *oauth.User

     

       480
       +
       	Strings      []models.String

     

       481
        
       	Card         *ProfileCard

     

       482
        
       	Active       string

     

       483
        
       }

     
···

       1308
        
       	Action       string

     

       1309
        
       

     

       1310
        
       	// this is supplied in the case of editing an existing string

     

       1311
       +
       	String models.String

     

       1312
        
       }

     

       1313
        
       

     

       1314
        
       func (p *Pages) PutString(w io.Writer, params PutStringParams) error {

     
···

       1318
        
       type StringsDashboardParams struct {

     

       1319
        
       	LoggedInUser *oauth.User

     

       1320
        
       	Card         ProfileCard

     

       1321
       +
       	Strings      []models.String

     

       1322
        
       }

     

       1323
        
       

     

       1324
        
       func (p *Pages) StringsDashboard(w io.Writer, params StringsDashboardParams) error {

     
···

       1327
        
       

     

       1328
        
       type StringTimelineParams struct {

     

       1329
        
       	LoggedInUser *oauth.User

     

       1330
       +
       	Strings      []models.String

     

       1331
        
       }

     

       1332
        
       

     

       1333
        
       func (p *Pages) StringsTimeline(w io.Writer, params StringTimelineParams) error {

     
···

       1339
        
       	ShowRendered     bool

     

       1340
        
       	RenderToggle     bool

     

       1341
        
       	RenderedContents template.HTML

     

       1342
       +
       	String           models.String

     

       1343
       +
       	Stats            models.StringStats

     

       1344
        
       	Owner            identity.Identity

     

       1345
        
       }

     

       1346

+2 -3

appview/posthog/notifier.go

···

       5
        
       	"log"

     

       6
        
       

     

       7
        
       	"github.com/posthog/posthog-go"

     

       8
       -
       	"tangled.org/core/appview/db"

     

       9
        
       	"tangled.org/core/appview/models"

     

       10
        
       	"tangled.org/core/appview/notify"

     

       11
        
       )

     
···

       142
        
       	}

     

       143
        
       }

     

       144
        
       

     

       145
       -
       func (n *posthogNotifier) EditString(ctx context.Context, string *db.String) {

     

       146
        
       	err := n.client.Enqueue(posthog.Capture{

     

       147
        
       		DistinctId: string.Did.String(),

     

       148
        
       		Event:      "edit_string",

     
···

       153
        
       	}

     

       154
        
       }

     

       155
        
       

     

       156
       -
       func (n *posthogNotifier) CreateString(ctx context.Context, string *db.String) {

     

       157
        
       	err := n.client.Enqueue(posthog.Capture{

     

       158
        
       		DistinctId: string.Did.String(),

     

       159
        
       		Event:      "create_string",

···

       5
        
       	"log"

     

       6
        
       

     

       7
        
       	"github.com/posthog/posthog-go"

     

       0
        
       
     

       8
        
       	"tangled.org/core/appview/models"

     

       9
        
       	"tangled.org/core/appview/notify"

     

       10
        
       )

     
···

       141
        
       	}

     

       142
        
       }

     

       143
        
       

     

       144
       +
       func (n *posthogNotifier) EditString(ctx context.Context, string *models.String) {

     

       145
        
       	err := n.client.Enqueue(posthog.Capture{

     

       146
        
       		DistinctId: string.Did.String(),

     

       147
        
       		Event:      "edit_string",

     
···

       152
        
       	}

     

       153
        
       }

     

       154
        
       

     

       155
       +
       func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) {

     

       156
        
       	err := n.client.Enqueue(posthog.Capture{

     

       157
        
       		DistinctId: string.Did.String(),

     

       158
        
       		Event:      "create_string",

+3 -2

appview/strings/strings.go

···

       11
        
       	"tangled.org/core/api/tangled"

     

       12
        
       	"tangled.org/core/appview/db"

     

       13
        
       	"tangled.org/core/appview/middleware"

     

       0
        
       
     

       14
        
       	"tangled.org/core/appview/notify"

     

       15
        
       	"tangled.org/core/appview/oauth"

     

       16
        
       	"tangled.org/core/appview/pages"

     
···

       235
        
       		description := r.FormValue("description")

     

       236
        
       

     

       237
        
       		// construct new string from form values

     

       238
       -
       		entry := db.String{

     

       239
        
       			Did:         first.Did,

     

       240
        
       			Rkey:        first.Rkey,

     

       241
        
       			Filename:    filename,

     
···

       318
        
       

     

       319
        
       		description := r.FormValue("description")

     

       320
        
       

     

       321
       -
       		string := db.String{

     

       322
        
       			Did:         syntax.DID(user.Did),

     

       323
        
       			Rkey:        tid.TID(),

     

       324
        
       			Filename:    filename,

···

       11
        
       	"tangled.org/core/api/tangled"

     

       12
        
       	"tangled.org/core/appview/db"

     

       13
        
       	"tangled.org/core/appview/middleware"

     

       14
       +
       	"tangled.org/core/appview/models"

     

       15
        
       	"tangled.org/core/appview/notify"

     

       16
        
       	"tangled.org/core/appview/oauth"

     

       17
        
       	"tangled.org/core/appview/pages"

     
···

       236
        
       		description := r.FormValue("description")

     

       237
        
       

     

       238
        
       		// construct new string from form values

     

       239
       +
       		entry := models.String{

     

       240
        
       			Did:         first.Did,

     

       241
        
       			Rkey:        first.Rkey,

     

       242
        
       			Filename:    filename,

     
···

       319
        
       

     

       320
        
       		description := r.FormValue("description")

     

       321
        
       

     

       322
       +
       		string := models.String{

     

       323
        
       			Did:         syntax.DID(user.Did),

     

       324
        
       			Rkey:        tid.TID(),

     

       325
        
       			Filename:    filename,

+27

appview/validator/string.go

···

       1
       +
       package validator

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"errors"

     

       5
       +
       	"fmt"

     

       6
       +
       	"unicode/utf8"

     

       7
       +
       

     

       8
       +
       	"tangled.org/core/appview/models"

     

       9
       +
       )

     

       10
       +
       

     

       11
       +
       func (v *Validator) ValidateString(s *models.String) error {

     

       12
       +
       	var err error

     

       13
       +
       

     

       14
       +
       	if utf8.RuneCountInString(s.Filename) > 140 {

     

       15
       +
       		err = errors.Join(err, fmt.Errorf("filename too long"))

     

       16
       +
       	}

     

       17
       +
       

     

       18
       +
       	if utf8.RuneCountInString(s.Description) > 280 {

     

       19
       +
       		err = errors.Join(err, fmt.Errorf("description too long"))

     

       20
       +
       	}

     

       21
       +
       

     

       22
       +
       	if len(s.Contents) == 0 {

     

       23
       +
       		err = errors.Join(err, fmt.Errorf("contents is empty"))

     

       24
       +
       	}

     

       25
       +
       

     

       26
       +
       	return err

     

       27
       +
       }