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/util_test.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go
index 4bf508848..9c282eb52 100644
--- a/internal/processing/status/util_test.go
+++ b/internal/processing/status/util_test.go
@@ -91,19 +91,19 @@ func (suite *UtilTestSuite) TestProcessMentions1() {
 	err := suite.status.ProcessMentions(form, creatingAccount.ID, status)
 	assert.NoError(suite.T(), err)
 
-	assert.Len(suite.T(), status.GTSMentions, 1)
-	newMention := status.GTSMentions[0]
+	assert.Len(suite.T(), status.Mentions, 1)
+	newMention := status.Mentions[0]
 	assert.Equal(suite.T(), mentionedAccount.ID, newMention.TargetAccountID)
 	assert.Equal(suite.T(), creatingAccount.ID, newMention.OriginAccountID)
 	assert.Equal(suite.T(), creatingAccount.URI, newMention.OriginAccountURI)
 	assert.Equal(suite.T(), status.ID, newMention.StatusID)
 	assert.Equal(suite.T(), fmt.Sprintf("@%s@%s", mentionedAccount.Username, mentionedAccount.Domain), newMention.NameString)
-	assert.Equal(suite.T(), mentionedAccount.URI, newMention.MentionedAccountURI)
-	assert.Equal(suite.T(), mentionedAccount.URL, newMention.MentionedAccountURL)
-	assert.NotNil(suite.T(), newMention.GTSAccount)
+	assert.Equal(suite.T(), mentionedAccount.URI, newMention.TargetAccountURI)
+	assert.Equal(suite.T(), mentionedAccount.URL, newMention.TargetAccountURL)
+	assert.NotNil(suite.T(), newMention.OriginAccount)
 
-	assert.Len(suite.T(), status.Mentions, 1)
-	assert.Equal(suite.T(), newMention.ID, status.Mentions[0])
+	assert.Len(suite.T(), status.MentionIDs, 1)
+	assert.Equal(suite.T(), newMention.ID, status.MentionIDs[0])
 }
 
 func (suite *UtilTestSuite) TestProcessContentFull1() {
@@ -232,19 +232,19 @@ func (suite *UtilTestSuite) TestProcessMentions2() {
 	err := suite.status.ProcessMentions(form, creatingAccount.ID, status)
 	assert.NoError(suite.T(), err)
 
-	assert.Len(suite.T(), status.GTSMentions, 1)
-	newMention := status.GTSMentions[0]
+	assert.Len(suite.T(), status.Mentions, 1)
+	newMention := status.Mentions[0]
 	assert.Equal(suite.T(), mentionedAccount.ID, newMention.TargetAccountID)
 	assert.Equal(suite.T(), creatingAccount.ID, newMention.OriginAccountID)
 	assert.Equal(suite.T(), creatingAccount.URI, newMention.OriginAccountURI)
 	assert.Equal(suite.T(), status.ID, newMention.StatusID)
 	assert.Equal(suite.T(), fmt.Sprintf("@%s@%s", mentionedAccount.Username, mentionedAccount.Domain), newMention.NameString)
-	assert.Equal(suite.T(), mentionedAccount.URI, newMention.MentionedAccountURI)
-	assert.Equal(suite.T(), mentionedAccount.URL, newMention.MentionedAccountURL)
-	assert.NotNil(suite.T(), newMention.GTSAccount)
+	assert.Equal(suite.T(), mentionedAccount.URI, newMention.TargetAccountURI)
+	assert.Equal(suite.T(), mentionedAccount.URL, newMention.TargetAccountURL)
+	assert.NotNil(suite.T(), newMention.OriginAccount)
 
-	assert.Len(suite.T(), status.Mentions, 1)
-	assert.Equal(suite.T(), newMention.ID, status.Mentions[0])
+	assert.Len(suite.T(), status.MentionIDs, 1)
+	assert.Equal(suite.T(), newMention.ID, status.MentionIDs[0])
 }
 
 func (suite *UtilTestSuite) TestProcessContentFull2() {
-- 
cgit v1.2.3