mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 16:12:25 -05:00
add repeat boost filtering logic, update go-structr, general improvements
This commit is contained in:
parent
cf405352e6
commit
50805fac53
10 changed files with 153 additions and 114 deletions
2
go.mod
2
go.mod
|
|
@ -30,7 +30,7 @@ require (
|
||||||
codeberg.org/gruf/go-runners v1.6.3
|
codeberg.org/gruf/go-runners v1.6.3
|
||||||
codeberg.org/gruf/go-sched v1.2.4
|
codeberg.org/gruf/go-sched v1.2.4
|
||||||
codeberg.org/gruf/go-storage v0.2.0
|
codeberg.org/gruf/go-storage v0.2.0
|
||||||
codeberg.org/gruf/go-structr v0.9.6
|
codeberg.org/gruf/go-structr v0.9.7
|
||||||
github.com/DmitriyVTitov/size v1.5.0
|
github.com/DmitriyVTitov/size v1.5.0
|
||||||
github.com/KimMachineGun/automemlimit v0.7.1
|
github.com/KimMachineGun/automemlimit v0.7.1
|
||||||
github.com/SherClockHolmes/webpush-go v1.4.0
|
github.com/SherClockHolmes/webpush-go v1.4.0
|
||||||
|
|
|
||||||
4
go.sum
generated
4
go.sum
generated
|
|
@ -48,8 +48,8 @@ codeberg.org/gruf/go-sched v1.2.4 h1:ddBB9o0D/2oU8NbQ0ldN5aWxogpXPRBATWi58+p++Hw
|
||||||
codeberg.org/gruf/go-sched v1.2.4/go.mod h1:wad6l+OcYGWMA2TzNLMmLObsrbBDxdJfEy5WvTgBjNk=
|
codeberg.org/gruf/go-sched v1.2.4/go.mod h1:wad6l+OcYGWMA2TzNLMmLObsrbBDxdJfEy5WvTgBjNk=
|
||||||
codeberg.org/gruf/go-storage v0.2.0 h1:mKj3Lx6AavEkuXXtxqPhdq+akW9YwrnP16yQBF7K5ZI=
|
codeberg.org/gruf/go-storage v0.2.0 h1:mKj3Lx6AavEkuXXtxqPhdq+akW9YwrnP16yQBF7K5ZI=
|
||||||
codeberg.org/gruf/go-storage v0.2.0/go.mod h1:o3GzMDE5QNUaRnm/daUzFqvuAaC4utlgXDXYO79sWKU=
|
codeberg.org/gruf/go-storage v0.2.0/go.mod h1:o3GzMDE5QNUaRnm/daUzFqvuAaC4utlgXDXYO79sWKU=
|
||||||
codeberg.org/gruf/go-structr v0.9.6 h1:FSbJ1A0ubTQB82rC0K4o6qyiqrDGH1t9ivttm8Zy64o=
|
codeberg.org/gruf/go-structr v0.9.7 h1:yQeIxTjYb6reNdgESk915twyjolydYBqat/mlZrP7bg=
|
||||||
codeberg.org/gruf/go-structr v0.9.6/go.mod h1:9k5hYztZ4PsBS+m1v5hUTeFiVUBTLF5VA7d9cd1OEMs=
|
codeberg.org/gruf/go-structr v0.9.7/go.mod h1:9k5hYztZ4PsBS+m1v5hUTeFiVUBTLF5VA7d9cd1OEMs=
|
||||||
codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix h1:+JvBZqsQfdT+ROnk2DkvXsKQ9QBorKKKBk5fBqw62I8=
|
codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix h1:+JvBZqsQfdT+ROnk2DkvXsKQ9QBorKKKBk5fBqw62I8=
|
||||||
codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po=
|
codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po=
|
||||||
github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=
|
github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=
|
||||||
|
|
|
||||||
4
internal/cache/cache.go
vendored
4
internal/cache/cache.go
vendored
|
|
@ -212,8 +212,8 @@ func (c *Caches) Sweep(threshold float64) {
|
||||||
c.DB.User.Trim(threshold)
|
c.DB.User.Trim(threshold)
|
||||||
c.DB.UserMute.Trim(threshold)
|
c.DB.UserMute.Trim(threshold)
|
||||||
c.DB.UserMuteIDs.Trim(threshold)
|
c.DB.UserMuteIDs.Trim(threshold)
|
||||||
c.Timelines.Home.Trim(threshold)
|
c.Timelines.Home.Trim()
|
||||||
c.Timelines.List.Trim(threshold)
|
c.Timelines.List.Trim()
|
||||||
c.Visibility.Trim(threshold)
|
c.Visibility.Trim(threshold)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
17
internal/cache/timeline.go
vendored
17
internal/cache/timeline.go
vendored
|
|
@ -23,18 +23,18 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type TimelineCaches struct {
|
type TimelineCaches struct {
|
||||||
|
// Home provides a concurrency-safe map of status timeline
|
||||||
// Home ...
|
// caches for home timelines, keyed by home's account ID.
|
||||||
Home timeline.StatusTimelines
|
Home timeline.StatusTimelines
|
||||||
|
|
||||||
// List ...
|
// List provides a concurrency-safe map of status
|
||||||
|
// timeline caches for lists, keyed by list ID.
|
||||||
List timeline.StatusTimelines
|
List timeline.StatusTimelines
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Caches) initHomeTimelines() {
|
func (c *Caches) initHomeTimelines() {
|
||||||
// Per-user cache
|
// TODO: configurable
|
||||||
// so use smaller.
|
cap := 800
|
||||||
cap := 400
|
|
||||||
|
|
||||||
log.Infof(nil, "cache size = %d", cap)
|
log.Infof(nil, "cache size = %d", cap)
|
||||||
|
|
||||||
|
|
@ -42,9 +42,8 @@ func (c *Caches) initHomeTimelines() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Caches) initListTimelines() {
|
func (c *Caches) initListTimelines() {
|
||||||
// Per-user cache
|
// TODO: configurable
|
||||||
// so use smaller.
|
cap := 800
|
||||||
cap := 400
|
|
||||||
|
|
||||||
log.Infof(nil, "cache size = %d", cap)
|
log.Infof(nil, "cache size = %d", cap)
|
||||||
|
|
||||||
|
|
|
||||||
156
internal/cache/timeline/status.go
vendored
156
internal/cache/timeline/status.go
vendored
|
|
@ -43,6 +43,12 @@ type StatusMeta struct {
|
||||||
BoostOfAccountID string
|
BoostOfAccountID string
|
||||||
Local bool
|
Local bool
|
||||||
|
|
||||||
|
// is an internal flag that may be set on
|
||||||
|
// a StatusMeta object that will prevent
|
||||||
|
// preparation of its apimodel.Status, due
|
||||||
|
// to it being a recently repeated boost.
|
||||||
|
repeatBoost bool
|
||||||
|
|
||||||
// prepared contains prepared frontend API
|
// prepared contains prepared frontend API
|
||||||
// model for the referenced status. This may
|
// model for the referenced status. This may
|
||||||
// or may-not be nil depending on whether the
|
// or may-not be nil depending on whether the
|
||||||
|
|
@ -50,7 +56,7 @@ type StatusMeta struct {
|
||||||
// call to "prepare" the frontend model.
|
// call to "prepare" the frontend model.
|
||||||
prepared *apimodel.Status
|
prepared *apimodel.Status
|
||||||
|
|
||||||
// Loaded is a temporary field that may be
|
// loaded is a temporary field that may be
|
||||||
// set for a newly loaded timeline status
|
// set for a newly loaded timeline status
|
||||||
// so that statuses don't need to be loaded
|
// so that statuses don't need to be loaded
|
||||||
// from the database twice in succession.
|
// from the database twice in succession.
|
||||||
|
|
@ -61,16 +67,18 @@ type StatusMeta struct {
|
||||||
loaded *gtsmodel.Status
|
loaded *gtsmodel.Status
|
||||||
}
|
}
|
||||||
|
|
||||||
// StatusTimelines ...
|
// StatusTimelines is a concurrency safe map of StatusTimeline{}
|
||||||
|
// objects, optimizing *very heavily* for reads over writes.
|
||||||
type StatusTimelines struct {
|
type StatusTimelines struct {
|
||||||
ptr atomic.Pointer[map[string]*StatusTimeline] // ronly except by CAS
|
ptr atomic.Pointer[map[string]*StatusTimeline] // ronly except by CAS
|
||||||
cap int
|
cap int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Init ...
|
// Init stores the given argument(s) such that any created StatusTimeline{}
|
||||||
|
// objects by MustGet() will initialize them with the given arguments.
|
||||||
func (t *StatusTimelines) Init(cap int) { t.cap = cap }
|
func (t *StatusTimelines) Init(cap int) { t.cap = cap }
|
||||||
|
|
||||||
// MustGet ...
|
// MustGet will attempt to fetch StatusTimeline{} stored under key, else creating one.
|
||||||
func (t *StatusTimelines) MustGet(key string) *StatusTimeline {
|
func (t *StatusTimelines) MustGet(key string) *StatusTimeline {
|
||||||
var tt *StatusTimeline
|
var tt *StatusTimeline
|
||||||
|
|
||||||
|
|
@ -121,7 +129,7 @@ func (t *StatusTimelines) MustGet(key string) *StatusTimeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete ...
|
// Delete will delete the stored StatusTimeline{} under key, if any.
|
||||||
func (t *StatusTimelines) Delete(key string) {
|
func (t *StatusTimelines) Delete(key string) {
|
||||||
for {
|
for {
|
||||||
// Load current ptr.
|
// Load current ptr.
|
||||||
|
|
@ -153,7 +161,7 @@ func (t *StatusTimelines) Delete(key string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveByStatusIDs ...
|
// RemoveByStatusIDs calls RemoveByStatusIDs() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) RemoveByStatusIDs(statusIDs ...string) {
|
func (t *StatusTimelines) RemoveByStatusIDs(statusIDs ...string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -162,7 +170,7 @@ func (t *StatusTimelines) RemoveByStatusIDs(statusIDs ...string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveByAccountIDs ...
|
// RemoveByAccountIDs calls RemoveByAccountIDs() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) RemoveByAccountIDs(accountIDs ...string) {
|
func (t *StatusTimelines) RemoveByAccountIDs(accountIDs ...string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -171,7 +179,7 @@ func (t *StatusTimelines) RemoveByAccountIDs(accountIDs ...string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UnprepareByStatusIDs ...
|
// UnprepareByStatusIDs calls UnprepareByStatusIDs() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) UnprepareByStatusIDs(statusIDs ...string) {
|
func (t *StatusTimelines) UnprepareByStatusIDs(statusIDs ...string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -180,7 +188,7 @@ func (t *StatusTimelines) UnprepareByStatusIDs(statusIDs ...string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UnprepareByAccountIDs ...
|
// UnprepareByAccountIDs calls UnprepareByAccountIDs() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) UnprepareByAccountIDs(accountIDs ...string) {
|
func (t *StatusTimelines) UnprepareByAccountIDs(accountIDs ...string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -189,7 +197,7 @@ func (t *StatusTimelines) UnprepareByAccountIDs(accountIDs ...string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unprepare ...
|
// Unprepare attempts to call UnprepareAll() for StatusTimeline{} under key.
|
||||||
func (t *StatusTimelines) Unprepare(key string) {
|
func (t *StatusTimelines) Unprepare(key string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
if tt := (*p)[key]; tt != nil {
|
if tt := (*p)[key]; tt != nil {
|
||||||
|
|
@ -198,7 +206,7 @@ func (t *StatusTimelines) Unprepare(key string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UnprepareAll ...
|
// UnprepareAll calls UnprepareAll() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) UnprepareAll() {
|
func (t *StatusTimelines) UnprepareAll() {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -207,16 +215,16 @@ func (t *StatusTimelines) UnprepareAll() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Trim ...
|
// Trim calls Trim() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) Trim(threshold float64) {
|
func (t *StatusTimelines) Trim() {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
tt.Trim(threshold)
|
tt.Trim()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear ...
|
// Clear attempts to call Clear() for StatusTimeline{} under key.
|
||||||
func (t *StatusTimelines) Clear(key string) {
|
func (t *StatusTimelines) Clear(key string) {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
if tt := (*p)[key]; tt != nil {
|
if tt := (*p)[key]; tt != nil {
|
||||||
|
|
@ -225,7 +233,7 @@ func (t *StatusTimelines) Clear(key string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClearAll ...
|
// ClearAll calls Clear() for each of the stored StatusTimeline{}s.
|
||||||
func (t *StatusTimelines) ClearAll() {
|
func (t *StatusTimelines) ClearAll() {
|
||||||
if p := t.ptr.Load(); p != nil {
|
if p := t.ptr.Load(); p != nil {
|
||||||
for _, tt := range *p {
|
for _, tt := range *p {
|
||||||
|
|
@ -234,7 +242,12 @@ func (t *StatusTimelines) ClearAll() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// StatusTimeline ...
|
// StatusTimeline provides a concurrency-safe timeline
|
||||||
|
// cache of status information. Internally only StatusMeta{}
|
||||||
|
// objects are stored, and the statuses themselves are loaded
|
||||||
|
// as-needed, caching prepared frontend representations where
|
||||||
|
// possible. This is largely wrapping code for our own codebase
|
||||||
|
// to be able to smoothly interact with structr.Timeline{}.
|
||||||
type StatusTimeline struct {
|
type StatusTimeline struct {
|
||||||
|
|
||||||
// underlying timeline cache of *StatusMeta{},
|
// underlying timeline cache of *StatusMeta{},
|
||||||
|
|
@ -247,23 +260,16 @@ type StatusTimeline struct {
|
||||||
idx_BoostOfID *structr.Index //nolint:revive
|
idx_BoostOfID *structr.Index //nolint:revive
|
||||||
idx_BoostOfAccountID *structr.Index //nolint:revive
|
idx_BoostOfAccountID *structr.Index //nolint:revive
|
||||||
|
|
||||||
// lasOrder stores the last fetched direction
|
// cutoff and maximum item lengths.
|
||||||
// of the timeline, which in turn determines
|
// the timeline is trimmed back to
|
||||||
// where we will next trim from in keeping the
|
// cutoff on each call to Trim(),
|
||||||
// timeline underneath configured 'max'.
|
// and maximum len triggers a Trim().
|
||||||
//
|
//
|
||||||
// TODO: this could be more intelligent with
|
// the timeline itself does not
|
||||||
// a sliding average. a problem for future kim!
|
|
||||||
lastOrder atomic.Pointer[structr.Direction]
|
|
||||||
|
|
||||||
// defines the 'maximum' count of
|
|
||||||
// entries in the timeline that we
|
|
||||||
// apply our Trim() call threshold
|
|
||||||
// to. the timeline itself does not
|
|
||||||
// limit items due to complexities
|
// limit items due to complexities
|
||||||
// it would introduce, so we apply
|
// it would introduce, so we apply
|
||||||
// a 'cut-off' at regular intervals.
|
// a 'cut-off' at regular intervals.
|
||||||
max int
|
cut, max int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Init will initialize the timeline for usage,
|
// Init will initialize the timeline for usage,
|
||||||
|
|
@ -294,6 +300,7 @@ func (t *StatusTimeline) Init(cap int) {
|
||||||
AccountID: s.AccountID,
|
AccountID: s.AccountID,
|
||||||
BoostOfID: s.BoostOfID,
|
BoostOfID: s.BoostOfID,
|
||||||
BoostOfAccountID: s.BoostOfAccountID,
|
BoostOfAccountID: s.BoostOfAccountID,
|
||||||
|
repeatBoost: s.repeatBoost,
|
||||||
loaded: nil, // NEVER stored
|
loaded: nil, // NEVER stored
|
||||||
prepared: prepared,
|
prepared: prepared,
|
||||||
}
|
}
|
||||||
|
|
@ -306,7 +313,9 @@ func (t *StatusTimeline) Init(cap int) {
|
||||||
t.idx_BoostOfID = t.cache.Index("BoostOfID")
|
t.idx_BoostOfID = t.cache.Index("BoostOfID")
|
||||||
t.idx_BoostOfAccountID = t.cache.Index("BoostOfAccountID")
|
t.idx_BoostOfAccountID = t.cache.Index("BoostOfAccountID")
|
||||||
|
|
||||||
// Set max.
|
// Set maximum capacity and
|
||||||
|
// cutoff threshold we trim to.
|
||||||
|
t.cut = int(0.60 * float64(cap))
|
||||||
t.max = cap
|
t.max = cap
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -347,11 +356,6 @@ func (t *StatusTimeline) Load(
|
||||||
panic("nil load page func")
|
panic("nil load page func")
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: there's quite a few opportunities for
|
|
||||||
// optimization here, with a lot of frequently
|
|
||||||
// used slices of the same types. depending on
|
|
||||||
// profiles it may be advantageous to pool some.
|
|
||||||
|
|
||||||
// Get paging details.
|
// Get paging details.
|
||||||
lo := page.Min.Value
|
lo := page.Min.Value
|
||||||
hi := page.Max.Value
|
hi := page.Max.Value
|
||||||
|
|
@ -376,9 +380,6 @@ func (t *StatusTimeline) Load(
|
||||||
dir,
|
dir,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Mark last select order.
|
|
||||||
t.lastOrder.Store(&dir)
|
|
||||||
|
|
||||||
// We now reset the lo,hi values to
|
// We now reset the lo,hi values to
|
||||||
// represent the lowest and highest
|
// represent the lowest and highest
|
||||||
// index values of loaded statuses.
|
// index values of loaded statuses.
|
||||||
|
|
@ -506,9 +507,9 @@ func (t *StatusTimeline) Load(
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(justLoaded) > 0 {
|
if len(justLoaded) > 0 {
|
||||||
// Even if we don't return them, insert
|
// Even if not returning them, insert
|
||||||
// the excess (post-filtered) into cache.
|
// the excess (filtered) into cache.
|
||||||
t.cache.Insert(justLoaded...)
|
t.insert(justLoaded...)
|
||||||
}
|
}
|
||||||
|
|
||||||
return apiStatuses, lo, hi, nil
|
return apiStatuses, lo, hi, nil
|
||||||
|
|
@ -643,22 +644,48 @@ func LoadStatusTimeline(
|
||||||
return apiStatuses, lo, hi, nil
|
return apiStatuses, lo, hi, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// InsertOne allows you to insert a single status into the timeline, with optional prepared API model.
|
// InsertOne allows you to insert a single status into the timeline, with optional prepared API model,
|
||||||
func (t *StatusTimeline) InsertOne(status *gtsmodel.Status, prepared *apimodel.Status) {
|
// the return value indicates whether the passed status has been boosted recently on the timeline.
|
||||||
t.cache.Insert(&StatusMeta{
|
func (t *StatusTimeline) InsertOne(status *gtsmodel.Status, prepared *apimodel.Status) (repeatBoost bool) {
|
||||||
|
if status.BoostOfID != "" {
|
||||||
|
const repeatBoostDepth = 40
|
||||||
|
|
||||||
|
// Check through top $repeatBoostDepth number of timeline items.
|
||||||
|
for i, value := range t.cache.RangeUnsafe(structr.Desc) {
|
||||||
|
if i >= repeatBoostDepth {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// If inserted status has already been boosted, or original was posted
|
||||||
|
// within last $repeatBoostDepth, we indicate it as a repeated boost.
|
||||||
|
if value.ID == status.BoostOfID || value.BoostOfID == status.BoostOfID {
|
||||||
|
repeatBoost = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert into timeline.
|
||||||
|
t.insert(&StatusMeta{
|
||||||
ID: status.ID,
|
ID: status.ID,
|
||||||
AccountID: status.AccountID,
|
AccountID: status.AccountID,
|
||||||
BoostOfID: status.BoostOfID,
|
BoostOfID: status.BoostOfID,
|
||||||
BoostOfAccountID: status.BoostOfAccountID,
|
BoostOfAccountID: status.BoostOfAccountID,
|
||||||
Local: *status.Local,
|
Local: *status.Local,
|
||||||
loaded: status,
|
repeatBoost: repeatBoost,
|
||||||
|
loaded: nil,
|
||||||
prepared: prepared,
|
prepared: prepared,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert allows you to bulk insert many statuses into the timeline.
|
func (t *StatusTimeline) insert(metas ...*StatusMeta) {
|
||||||
func (t *StatusTimeline) Insert(statuses ...*gtsmodel.Status) {
|
if t.cache.Insert(metas...) > t.max {
|
||||||
t.cache.Insert(toStatusMeta(statuses)...)
|
// If cache reached beyond
|
||||||
|
// maximum, perform a trim.
|
||||||
|
t.Trim()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveByStatusID removes all cached timeline entries pertaining to
|
// RemoveByStatusID removes all cached timeline entries pertaining to
|
||||||
|
|
@ -784,33 +811,16 @@ func (t *StatusTimeline) UnprepareByAccountIDs(accountIDs ...string) {
|
||||||
// UnprepareAll removes cached frontend API
|
// UnprepareAll removes cached frontend API
|
||||||
// models for all cached timeline entries.
|
// models for all cached timeline entries.
|
||||||
func (t *StatusTimeline) UnprepareAll() {
|
func (t *StatusTimeline) UnprepareAll() {
|
||||||
for value := range t.cache.RangeUnsafe(structr.Asc) {
|
for _, value := range t.cache.RangeUnsafe(structr.Asc) {
|
||||||
value.prepared = nil
|
value.prepared = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Trim will ensure that receiving timeline is less than or
|
// Trim will ensure that receiving timeline is less than or
|
||||||
// equal in length to the given threshold percentage of the
|
// equal in length to the given threshold percentage of the
|
||||||
// timeline's preconfigured maximum capacity. This will trim
|
// timeline's preconfigured maximum capacity. This will always
|
||||||
// from top / bottom depending on which was recently accessed.
|
// trim from the bottom-up to prioritize streamed inserts.
|
||||||
func (t *StatusTimeline) Trim(threshold float64) {
|
func (t *StatusTimeline) Trim() { t.cache.Trim(t.cut, structr.Asc) }
|
||||||
|
|
||||||
// Default trim dir.
|
|
||||||
dir := structr.Asc
|
|
||||||
|
|
||||||
// Calculate maximum allowed no.
|
|
||||||
// items as a percentage of max.
|
|
||||||
max := threshold * float64(t.max)
|
|
||||||
|
|
||||||
// Load last fetched timeline ordering,
|
|
||||||
// using the inverse value for trimming.
|
|
||||||
if p := t.lastOrder.Load(); p != nil {
|
|
||||||
dir = !(*p)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Trim timeline to 'max'.
|
|
||||||
t.cache.Trim(int(max), dir)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear will remove all cached entries from underlying timeline.
|
// Clear will remove all cached entries from underlying timeline.
|
||||||
func (t *StatusTimeline) Clear() { t.cache.Trim(0, structr.Desc) }
|
func (t *StatusTimeline) Clear() { t.cache.Trim(0, structr.Desc) }
|
||||||
|
|
@ -845,6 +855,12 @@ func prepareStatuses(
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if meta.repeatBoost {
|
||||||
|
// This is a repeat boost in
|
||||||
|
// short timespan, skip it.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
if meta.prepared == nil {
|
if meta.prepared == nil {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -383,19 +383,21 @@ func (s *Surface) timelineStatus(
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insert status to timeline cache regardless of
|
// Insert status to timeline cache regardless of
|
||||||
// if API model was successfully prepared or not.
|
// if API model was succesfully prepared or not.
|
||||||
timeline.InsertOne(status, apiModel)
|
repeatBoost := timeline.InsertOne(status, apiModel)
|
||||||
|
|
||||||
if apiModel != nil {
|
if apiModel == nil {
|
||||||
// Only send the status to user's stream if not
|
// Status was
|
||||||
// filtered / muted, i.e. successfully prepared model.
|
// filtered / muted.
|
||||||
s.Stream.Update(ctx, account, apiModel, streamType)
|
return false
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Status was
|
if !repeatBoost {
|
||||||
// filtered / muted.
|
// Only stream if not repeated boost of recent status.
|
||||||
return false
|
s.Stream.Update(ctx, account, apiModel, streamType)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// timelineAndNotifyStatusForTagFollowers inserts the status into the
|
// timelineAndNotifyStatusForTagFollowers inserts the status into the
|
||||||
|
|
|
||||||
5
vendor/codeberg.org/gruf/go-structr/index.go
generated
vendored
5
vendor/codeberg.org/gruf/go-structr/index.go
generated
vendored
|
|
@ -1,6 +1,7 @@
|
||||||
package structr
|
package structr
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
@ -222,10 +223,10 @@ func (i *Index) get(key string, hook func(*indexed_item)) {
|
||||||
func (i *Index) key(buf *byteutil.Buffer, parts []unsafe.Pointer) string {
|
func (i *Index) key(buf *byteutil.Buffer, parts []unsafe.Pointer) string {
|
||||||
buf.B = buf.B[:0]
|
buf.B = buf.B[:0]
|
||||||
if len(parts) != len(i.fields) {
|
if len(parts) != len(i.fields) {
|
||||||
panicf("incorrect number key parts: want=%d received=%d",
|
panic(fmt.Sprintf("incorrect number key parts: want=%d received=%d",
|
||||||
len(i.fields),
|
len(i.fields),
|
||||||
len(parts),
|
len(parts),
|
||||||
)
|
))
|
||||||
}
|
}
|
||||||
if !allow_zero(i.flags) {
|
if !allow_zero(i.flags) {
|
||||||
for x, field := range i.fields {
|
for x, field := range i.fields {
|
||||||
|
|
|
||||||
11
vendor/codeberg.org/gruf/go-structr/runtime.go
generated
vendored
11
vendor/codeberg.org/gruf/go-structr/runtime.go
generated
vendored
|
|
@ -70,7 +70,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
|
||||||
name := names[0]
|
name := names[0]
|
||||||
names = names[1:]
|
names = names[1:]
|
||||||
if !is_exported(name) {
|
if !is_exported(name) {
|
||||||
panicf("field is not exported: %s", name)
|
panic(fmt.Sprintf("field is not exported: %s", name))
|
||||||
}
|
}
|
||||||
return name
|
return name
|
||||||
}
|
}
|
||||||
|
|
@ -94,7 +94,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
|
||||||
|
|
||||||
// Check for valid struct type.
|
// Check for valid struct type.
|
||||||
if t.Kind() != reflect.Struct {
|
if t.Kind() != reflect.Struct {
|
||||||
panicf("field %s is not struct (or ptr-to): %s", t, name)
|
panic(fmt.Sprintf("field %s is not struct (or ptr-to): %s", t, name))
|
||||||
}
|
}
|
||||||
|
|
||||||
var ok bool
|
var ok bool
|
||||||
|
|
@ -102,7 +102,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
|
||||||
// Look for next field by name.
|
// Look for next field by name.
|
||||||
field, ok = t.FieldByName(name)
|
field, ok = t.FieldByName(name)
|
||||||
if !ok {
|
if !ok {
|
||||||
panicf("unknown field: %s", name)
|
panic(fmt.Sprintf("unknown field: %s", name))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set next offset value.
|
// Set next offset value.
|
||||||
|
|
@ -258,11 +258,6 @@ func eface_data(a any) unsafe.Pointer {
|
||||||
return (*eface)(unsafe.Pointer(&a)).data
|
return (*eface)(unsafe.Pointer(&a)).data
|
||||||
}
|
}
|
||||||
|
|
||||||
// panicf provides a panic with string formatting.
|
|
||||||
func panicf(format string, args ...any) {
|
|
||||||
panic(fmt.Sprintf(format, args...))
|
|
||||||
}
|
|
||||||
|
|
||||||
// assert can be called to indicated a block
|
// assert can be called to indicated a block
|
||||||
// of code should not be able to be reached,
|
// of code should not be able to be reached,
|
||||||
// it returns a BUG report with callsite.
|
// it returns a BUG report with callsite.
|
||||||
|
|
|
||||||
44
vendor/codeberg.org/gruf/go-structr/timeline.go
generated
vendored
44
vendor/codeberg.org/gruf/go-structr/timeline.go
generated
vendored
|
|
@ -190,7 +190,8 @@ func (t *Timeline[T, PK]) Select(min, max *PK, length *int, dir Direction) (valu
|
||||||
|
|
||||||
// Insert will insert the given values into the timeline,
|
// Insert will insert the given values into the timeline,
|
||||||
// calling any set invalidate hook on each inserted value.
|
// calling any set invalidate hook on each inserted value.
|
||||||
func (t *Timeline[T, PK]) Insert(values ...T) {
|
// Returns current list length after performing inserts.
|
||||||
|
func (t *Timeline[T, PK]) Insert(values ...T) int {
|
||||||
|
|
||||||
// Acquire lock.
|
// Acquire lock.
|
||||||
t.mutex.Lock()
|
t.mutex.Lock()
|
||||||
|
|
@ -269,6 +270,10 @@ func (t *Timeline[T, PK]) Insert(values ...T) {
|
||||||
// Get func ptrs.
|
// Get func ptrs.
|
||||||
invalid := t.invalid
|
invalid := t.invalid
|
||||||
|
|
||||||
|
// Get length AFTER
|
||||||
|
// insert to return.
|
||||||
|
len := t.list.len
|
||||||
|
|
||||||
// Done with lock.
|
// Done with lock.
|
||||||
t.mutex.Unlock()
|
t.mutex.Unlock()
|
||||||
|
|
||||||
|
|
@ -279,6 +284,8 @@ func (t *Timeline[T, PK]) Insert(values ...T) {
|
||||||
invalid(value)
|
invalid(value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return len
|
||||||
}
|
}
|
||||||
|
|
||||||
// Invalidate invalidates all entries stored in index under given keys.
|
// Invalidate invalidates all entries stored in index under given keys.
|
||||||
|
|
@ -336,8 +343,8 @@ func (t *Timeline[T, PK]) Invalidate(index *Index, keys ...Key) {
|
||||||
//
|
//
|
||||||
// Please note that the entire Timeline{} will be locked for the duration of the range
|
// Please note that the entire Timeline{} will be locked for the duration of the range
|
||||||
// operation, i.e. from the beginning of the first yield call until the end of the last.
|
// operation, i.e. from the beginning of the first yield call until the end of the last.
|
||||||
func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
|
func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(index int, value T) bool) {
|
||||||
return func(yield func(T) bool) {
|
return func(yield func(int, T) bool) {
|
||||||
if t.copy == nil {
|
if t.copy == nil {
|
||||||
panic("not initialized")
|
panic("not initialized")
|
||||||
} else if yield == nil {
|
} else if yield == nil {
|
||||||
|
|
@ -348,7 +355,9 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
|
||||||
t.mutex.Lock()
|
t.mutex.Lock()
|
||||||
defer t.mutex.Unlock()
|
defer t.mutex.Unlock()
|
||||||
|
|
||||||
|
var i int
|
||||||
switch dir {
|
switch dir {
|
||||||
|
|
||||||
case Asc:
|
case Asc:
|
||||||
// Iterate through linked list from bottom (i.e. tail).
|
// Iterate through linked list from bottom (i.e. tail).
|
||||||
for prev := t.list.tail; prev != nil; prev = prev.prev {
|
for prev := t.list.tail; prev != nil; prev = prev.prev {
|
||||||
|
|
@ -360,9 +369,12 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
|
||||||
value := t.copy(item.data.(T))
|
value := t.copy(item.data.(T))
|
||||||
|
|
||||||
// Pass to given function.
|
// Pass to given function.
|
||||||
if !yield(value) {
|
if !yield(i, value) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Iter
|
||||||
|
i++
|
||||||
}
|
}
|
||||||
|
|
||||||
case Desc:
|
case Desc:
|
||||||
|
|
@ -376,9 +388,12 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
|
||||||
value := t.copy(item.data.(T))
|
value := t.copy(item.data.(T))
|
||||||
|
|
||||||
// Pass to given function.
|
// Pass to given function.
|
||||||
if !yield(value) {
|
if !yield(i, value) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Iter
|
||||||
|
i++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -390,8 +405,8 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
|
||||||
//
|
//
|
||||||
// Please note that the entire Timeline{} will be locked for the duration of the range
|
// Please note that the entire Timeline{} will be locked for the duration of the range
|
||||||
// operation, i.e. from the beginning of the first yield call until the end of the last.
|
// operation, i.e. from the beginning of the first yield call until the end of the last.
|
||||||
func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
|
func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(index int, value T) bool) {
|
||||||
return func(yield func(T) bool) {
|
return func(yield func(int, T) bool) {
|
||||||
if t.copy == nil {
|
if t.copy == nil {
|
||||||
panic("not initialized")
|
panic("not initialized")
|
||||||
} else if yield == nil {
|
} else if yield == nil {
|
||||||
|
|
@ -402,7 +417,9 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
|
||||||
t.mutex.Lock()
|
t.mutex.Lock()
|
||||||
defer t.mutex.Unlock()
|
defer t.mutex.Unlock()
|
||||||
|
|
||||||
|
var i int
|
||||||
switch dir {
|
switch dir {
|
||||||
|
|
||||||
case Asc:
|
case Asc:
|
||||||
// Iterate through linked list from bottom (i.e. tail).
|
// Iterate through linked list from bottom (i.e. tail).
|
||||||
for prev := t.list.tail; prev != nil; prev = prev.prev {
|
for prev := t.list.tail; prev != nil; prev = prev.prev {
|
||||||
|
|
@ -411,9 +428,12 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
|
||||||
item := (*timeline_item)(prev.data)
|
item := (*timeline_item)(prev.data)
|
||||||
|
|
||||||
// Pass to given function.
|
// Pass to given function.
|
||||||
if !yield(item.data.(T)) {
|
if !yield(i, item.data.(T)) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Iter
|
||||||
|
i++
|
||||||
}
|
}
|
||||||
|
|
||||||
case Desc:
|
case Desc:
|
||||||
|
|
@ -424,9 +444,12 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
|
||||||
item := (*timeline_item)(next.data)
|
item := (*timeline_item)(next.data)
|
||||||
|
|
||||||
// Pass to given function.
|
// Pass to given function.
|
||||||
if !yield(item.data.(T)) {
|
if !yield(i, item.data.(T)) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Iter
|
||||||
|
i++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1033,6 +1056,9 @@ indexing:
|
||||||
// checking for collisions.
|
// checking for collisions.
|
||||||
if !idx.add(key, i_item) {
|
if !idx.add(key, i_item) {
|
||||||
|
|
||||||
|
// This key already appears
|
||||||
|
// in this unique index. So
|
||||||
|
// drop new timeline item.
|
||||||
t.delete(t_item)
|
t.delete(t_item)
|
||||||
free_buffer(buf)
|
free_buffer(buf)
|
||||||
return last
|
return last
|
||||||
|
|
|
||||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
|
|
@ -277,7 +277,7 @@ codeberg.org/gruf/go-storage/disk
|
||||||
codeberg.org/gruf/go-storage/internal
|
codeberg.org/gruf/go-storage/internal
|
||||||
codeberg.org/gruf/go-storage/memory
|
codeberg.org/gruf/go-storage/memory
|
||||||
codeberg.org/gruf/go-storage/s3
|
codeberg.org/gruf/go-storage/s3
|
||||||
# codeberg.org/gruf/go-structr v0.9.6
|
# codeberg.org/gruf/go-structr v0.9.7
|
||||||
## explicit; go 1.22
|
## explicit; go 1.22
|
||||||
codeberg.org/gruf/go-structr
|
codeberg.org/gruf/go-structr
|
||||||
# github.com/DmitriyVTitov/size v1.5.0
|
# github.com/DmitriyVTitov/size v1.5.0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue