diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-10-06 12:48:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-10-06 12:48:17 +0200 |
| commit | 5cf0f9950a95cf46fda6ba8f479aa4728eba5ec4 (patch) | |
| tree | 560428ae18c9f9890e4195da1abcbd76401d3a1c /internal/db/bundb | |
| parent | [feature] Add emoji image size to instance response (#892) (diff) | |
| download | gotosocial-5cf0f9950a95cf46fda6ba8f479aa4728eba5ec4.tar.xz | |
[bugfix] Fix new domain block date (#893)
Diffstat (limited to 'internal/db/bundb')
| -rw-r--r-- | internal/db/bundb/domain.go | 8 | ||||
| -rw-r--r-- | internal/db/bundb/domain_test.go | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/internal/db/bundb/domain.go b/internal/db/bundb/domain.go index 5d262c676..9fc4bb276 100644 --- a/internal/db/bundb/domain.go +++ b/internal/db/bundb/domain.go @@ -47,7 +47,7 @@ func normalizeDomain(domain string) (out string, err error) { return out, err } -func (d *domainDB) CreateDomainBlock(ctx context.Context, block gtsmodel.DomainBlock) db.Error { +func (d *domainDB) CreateDomainBlock(ctx context.Context, block *gtsmodel.DomainBlock) db.Error { domain, err := normalizeDomain(block.Domain) if err != nil { return err @@ -56,13 +56,13 @@ func (d *domainDB) CreateDomainBlock(ctx context.Context, block gtsmodel.DomainB // Attempt to insert new domain block if _, err := d.conn.NewInsert(). - Model(&block). - Exec(ctx, &block); err != nil { + Model(block). + Exec(ctx); err != nil { return d.conn.ProcessError(err) } // Cache this domain block - d.cache.Put(block.Domain, &block) + d.cache.Put(block.Domain, block) return nil } diff --git a/internal/db/bundb/domain_test.go b/internal/db/bundb/domain_test.go index 48c4a7798..41a73ff80 100644 --- a/internal/db/bundb/domain_test.go +++ b/internal/db/bundb/domain_test.go @@ -34,13 +34,9 @@ type DomainTestSuite struct { func (suite *DomainTestSuite) TestIsDomainBlocked() { ctx := context.Background() - now := time.Now() - domainBlock := >smodel.DomainBlock{ ID: "01G204214Y9TNJEBX39C7G88SW", Domain: "some.bad.apples", - CreatedAt: now, - UpdatedAt: now, CreatedByAccountID: suite.testAccounts["admin_account"].ID, CreatedByAccount: suite.testAccounts["admin_account"], } @@ -50,13 +46,14 @@ func (suite *DomainTestSuite) TestIsDomainBlocked() { suite.NoError(err) suite.False(blocked) - err = suite.db.CreateDomainBlock(ctx, *domainBlock) + err = suite.db.CreateDomainBlock(ctx, domainBlock) suite.NoError(err) // domain block now exists blocked, err = suite.db.IsDomainBlocked(ctx, domainBlock.Domain) suite.NoError(err) suite.True(blocked) + suite.WithinDuration(time.Now(), domainBlock.CreatedAt, 10*time.Second) } func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII() { @@ -82,7 +79,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII() { suite.NoError(err) suite.False(blocked) - err = suite.db.CreateDomainBlock(ctx, *domainBlock) + err = suite.db.CreateDomainBlock(ctx, domainBlock) suite.NoError(err) // domain block now exists @@ -118,7 +115,7 @@ func (suite *DomainTestSuite) TestIsDomainBlockedNonASCII2() { suite.NoError(err) suite.False(blocked) - err = suite.db.CreateDomainBlock(ctx, *domainBlock) + err = suite.db.CreateDomainBlock(ctx, domainBlock) suite.NoError(err) // domain block now exists |