From e681aac5899b4a93d7c71e9a334a67c3f2b00e93 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 10 Sep 2021 14:36:10 +0200
Subject: fixes + db changes (#204)

* fixes + db changes

* make duration more lenient
---
 internal/processing/admin/createdomainblock.go | 2 +-
 internal/processing/admin/deletedomainblock.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'internal/processing/admin')

diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go
index 9c4ff780f..50df056e5 100644
--- a/internal/processing/admin/createdomainblock.go
+++ b/internal/processing/admin/createdomainblock.go
@@ -108,7 +108,7 @@ func (p *processor) initiateDomainBlockSideEffects(ctx context.Context, account
 		instance.ContactAccountUsername = ""
 		instance.ContactAccountID = ""
 		instance.Version = ""
-		if err := p.db.UpdateByID(ctx, instance.ID, instance); err != nil {
+		if err := p.db.UpdateByPrimaryKey(ctx, instance); err != nil {
 			l.Errorf("domainBlockProcessSideEffects: db error updating instance: %s", err)
 		}
 		l.Debug("domainBlockProcessSideEffects: instance entry updated")
diff --git a/internal/processing/admin/deletedomainblock.go b/internal/processing/admin/deletedomainblock.go
index 2563b557d..d11374c78 100644
--- a/internal/processing/admin/deletedomainblock.go
+++ b/internal/processing/admin/deletedomainblock.go
@@ -60,7 +60,7 @@ func (p *processor) DomainBlockDelete(ctx context.Context, account *gtsmodel.Acc
 	}, i); err == nil {
 		i.SuspendedAt = time.Time{}
 		i.DomainBlockID = ""
-		if err := p.db.UpdateByID(ctx, i.ID, i); err != nil {
+		if err := p.db.UpdateByPrimaryKey(ctx, i); err != nil {
 			return nil, gtserror.NewErrorInternalError(fmt.Errorf("couldn't update database entry for instance %s: %s", domainBlock.Domain, err))
 		}
 	}
-- 
cgit v1.2.3