From b4288f3c47a9ff9254b933dcb9ee7274d4a4135c Mon Sep 17 00:00:00 2001
From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 13 Jun 2021 18:42:28 +0200
Subject: Timeline manager (#40)

* start messing about with timeline manager

* i have no idea what i'm doing

* i continue to not know what i'm doing

* it's coming along

* bit more progress

* update timeline with new posts as they come in

* lint and fmt

* Select accounts where empty string

* restructure a bunch, get unfaves working

* moving stuff around

* federate status deletes properly

* mention regex better but not 100% there

* fix regex

* some more hacking away at the timeline code phew

* fix up some little things

* i can't even

* more timeline stuff

* move to ulid

* fiddley

* some lil fixes for kibou compatibility

* timelines working pretty alright!

* tidy + lint
---
 internal/typeutils/internal.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'internal/typeutils/internal.go')

diff --git a/internal/typeutils/internal.go b/internal/typeutils/internal.go
index 626509b34..3b3c8bd1b 100644
--- a/internal/typeutils/internal.go
+++ b/internal/typeutils/internal.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/id"
 	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
 
@@ -25,7 +25,10 @@ func (c *converter) FollowRequestToFollow(f *gtsmodel.FollowRequest) *gtsmodel.F
 func (c *converter) StatusToBoost(s *gtsmodel.Status, boostingAccount *gtsmodel.Account) (*gtsmodel.Status, error) {
 	// the wrapper won't use the same ID as the boosted status so we generate some new UUIDs
 	uris := util.GenerateURIsForAccount(boostingAccount.Username, c.config.Protocol, c.config.Host)
-	boostWrapperStatusID := uuid.NewString()
+	boostWrapperStatusID, err := id.NewULID()
+	if err != nil {
+		return nil, err
+	}
 	boostWrapperStatusURI := fmt.Sprintf("%s/%s", uris.StatusesURI, boostWrapperStatusID)
 	boostWrapperStatusURL := fmt.Sprintf("%s/%s", uris.StatusesURL, boostWrapperStatusID)
 
@@ -56,7 +59,7 @@ func (c *converter) StatusToBoost(s *gtsmodel.Status, boostingAccount *gtsmodel.
 		Emojis:      []string{},
 
 		// the below fields will be taken from the target status
-		Content:             util.HTMLFormat(s.Content),
+		Content:             s.Content,
 		ContentWarning:      s.ContentWarning,
 		ActivityStreamsType: s.ActivityStreamsType,
 		Sensitive:           s.Sensitive,
-- 
cgit v1.2.3