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/fromfederator.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'internal/processing/fromfederator.go')

diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go
index 949a734c7..c95c27778 100644
--- a/internal/processing/fromfederator.go
+++ b/internal/processing/fromfederator.go
@@ -100,8 +100,8 @@ func (p *processor) processFromFederator(federatorMsg gtsmodel.FromFederator) er
 			}
 			incomingAnnounce.ID = incomingAnnounceID
 
-			if err := p.db.Put(incomingAnnounce); err != nil {
-				if _, ok := err.(db.ErrAlreadyExists); !ok {
+			if err := p.db.PutStatus(incomingAnnounce); err != nil {
+				if err != db.ErrNoEntries {
 					return fmt.Errorf("error adding dereferenced announce to the db: %s", err)
 				}
 			}
@@ -164,14 +164,14 @@ func (p *processor) processFromFederator(federatorMsg gtsmodel.FromFederator) er
 			}
 
 			// delete all attachments for this status
-			for _, a := range statusToDelete.Attachments {
+			for _, a := range statusToDelete.AttachmentIDs {
 				if err := p.mediaProcessor.Delete(a); err != nil {
 					return err
 				}
 			}
 
 			// delete all mentions for this status
-			for _, m := range statusToDelete.Mentions {
+			for _, m := range statusToDelete.MentionIDs {
 				if err := p.db.DeleteByID(m, &gtsmodel.Mention{}); err != nil {
 					return err
 				}
-- 
cgit v1.2.3