From 4920229a3b6e1d7dde536bc9ff766542b05d935c Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 20 Aug 2021 12:26:56 +0200
Subject: Database updates (#144)

* start moving some database stuff around

* continue moving db stuff around

* more fiddling

* more updates

* and some more

* and yet more

* i broke SOMETHING but what, it's a mystery

* tidy up

* vendor ttlcache

* use ttlcache

* fix up some tests

* rename some stuff

* little reminder

* some more updates
---
 internal/processing/status/create.go | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'internal/processing/status/create.go')

diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go
index 0e99b5f4a..fc112ed8b 100644
--- a/internal/processing/status/create.go
+++ b/internal/processing/status/create.go
@@ -38,27 +38,22 @@ func (p *processor) Create(account *gtsmodel.Account, application *gtsmodel.Appl
 		Text:                     form.Status,
 	}
 
-	// check if replyToID is ok
 	if err := p.ProcessReplyToID(form, account.ID, newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// check if mediaIDs are ok
 	if err := p.ProcessMediaIDs(form, account.ID, newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// check if visibility settings are ok
 	if err := p.ProcessVisibility(form, account.Privacy, newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// handle language settings
 	if err := p.ProcessLanguage(form, account.Language, newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// handle mentions
 	if err := p.ProcessMentions(form, account.ID, newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -75,20 +70,11 @@ func (p *processor) Create(account *gtsmodel.Account, application *gtsmodel.Appl
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// put the new status in the database, generating an ID for it in the process
-	if err := p.db.Put(newStatus); err != nil {
+	// put the new status in the database
+	if err := p.db.PutStatus(newStatus); err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	// change the status ID of the media attachments to the new status
-	for _, a := range newStatus.GTSMediaAttachments {
-		a.StatusID = newStatus.ID
-		a.UpdatedAt = time.Now()
-		if err := p.db.UpdateByID(a.ID, a); err != nil {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
-	}
-
 	// send it back to the processor for async processing
 	p.fromClientAPI <- gtsmodel.FromClientAPI{
 		APObjectType:   gtsmodel.ActivityStreamsNote,
-- 
cgit v1.2.3