summaryrefslogtreecommitdiff
path: root/internal/id/ulid.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-12-05 13:35:07 +0000
committerLibravatar GitHub <noreply@github.com>2024-12-05 13:35:07 +0000
commit23fc70f4e68730b7eec91d58dac54ec00099ed8d (patch)
tree9ab22b85d1d2c9c7ff2db9371ab2dc752c085f07 /internal/id/ulid.go
parent[feature] unending polls (#3592) (diff)
downloadgotosocial-23fc70f4e68730b7eec91d58dac54ec00099ed8d.tar.xz
[feature] add support for receiving federated status edits (#3597)
* add support for extracting Updated field from Statusable implementers * add support for status edits in the database, and update status dereferencer to handle them * remove unused AdditionalInfo{}.CreatedAt * remove unused AdditionalEmojiInfo{}.CreatedAt * update new mention creation to use status.UpdatedAt * remove mention.UpdatedAt, fixes related to NewULIDFromTime() change * add migration to remove Mention{}.UpdatedAt field * add migration to add the StatusEdit{} table * start adding tests, add delete function for status edits * add more of status edit migrations, fill in more of the necessary edit delete functionality * remove unused function * allow generating gotosocial compatible ulid via CLI with `go run ./cmd/gen-ulid` * add StatusEdit{} test models * fix new statusedits sql * use model instead of table name * actually remove the Mention.UpdatedAt field... * fix tests now new models are added, add more status edit DB tests * fix panic wording * add test for deleting status edits * don't automatically set `updated_at` field on updated statuses * flesh out more of the dereferencer status edit tests, ensure updated at field set on outgoing AS statuses * remove media_attachments.updated_at column * fix up more tests, further complete the dereferencer status edit tests * update more status serialization tests not expecting 'updated' AS property * gah!! json serialization tests!! * undo some gtscontext wrapping changes * more serialization test fixing :smiling_face_with_tear: * more test fixing, ensure the edit.status_id field is actually set :facepalm: * fix status edit test * grrr linter * add edited_at field to apimodel status * remove the choice of paging on the timeline public filtered test (otherwise it needs updating every time you add statuses ...) * ensure that status.updated_at always fits chronologically * fix more serialization tests ... * add more code comments * fix envparsing * update swagger file * properly handle media description changes during status edits * slight formatting tweak * code comment
Diffstat (limited to 'internal/id/ulid.go')
-rw-r--r--internal/id/ulid.go20
1 files changed, 14 insertions, 6 deletions
diff --git a/internal/id/ulid.go b/internal/id/ulid.go
index 8de4cc4cc..8c0b1e94c 100644
--- a/internal/id/ulid.go
+++ b/internal/id/ulid.go
@@ -22,7 +22,9 @@ import (
"math/big"
"time"
+ "codeberg.org/gruf/go-kv"
"github.com/oklog/ulid"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const (
@@ -45,13 +47,19 @@ func NewULID() string {
return ulid.String()
}
-// NewULIDFromTime returns a new ULID string using the given time, or an error if something goes wrong.
-func NewULIDFromTime(t time.Time) (string, error) {
- newUlid, err := ulid.New(ulid.Timestamp(t), rand.Reader)
- if err != nil {
- return "", err
+// NewULIDFromTime returns a new ULID string using
+// given time, or from current time on any error.
+func NewULIDFromTime(t time.Time) string {
+ ts := ulid.Timestamp(t)
+ if ts > ulid.MaxTime() {
+ log.WarnKVs(nil, kv.Fields{
+ {K: "caller", V: log.Caller(2)},
+ {K: "value", V: t},
+ {K: "msg", V: "invalid ulid time"},
+ }...)
+ ts = ulid.Now()
}
- return newUlid.String(), nil
+ return ulid.MustNew(ts, rand.Reader).String()
}
// NewRandomULID returns a new ULID string using a random time in an ~80 year range around the current datetime, or an error if something goes wrong.