summaryrefslogtreecommitdiff
path: root/internal/processing/instance.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2021-08-20 12:26:56 +0200
committerLibravatar GitHub <noreply@github.com>2021-08-20 12:26:56 +0200
commit4920229a3b6e1d7dde536bc9ff766542b05d935c (patch)
treea9423beccec5331c372f01eedf38949dfb171e9e /internal/processing/instance.go
parentText/status parsing fixes (#141) (diff)
downloadgotosocial-4920229a3b6e1d7dde536bc9ff766542b05d935c.tar.xz
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
Diffstat (limited to 'internal/processing/instance.go')
-rw-r--r--internal/processing/instance.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/processing/instance.go b/internal/processing/instance.go
index 89f60f5d4..b151744ef 100644
--- a/internal/processing/instance.go
+++ b/internal/processing/instance.go
@@ -51,8 +51,8 @@ func (p *processor) InstancePatch(form *apimodel.InstanceSettingsUpdateRequest)
}
// fetch the instance account from the db for processing
- ia := &gtsmodel.Account{}
- if err := p.db.GetLocalAccountByUsername(p.config.Host, ia); err != nil {
+ ia, err := p.db.GetInstanceAccount("")
+ if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error fetching instance account %s: %s", p.config.Host, err))
}
@@ -67,8 +67,8 @@ func (p *processor) InstancePatch(form *apimodel.InstanceSettingsUpdateRequest)
// validate & update site contact account if it's set on the form
if form.ContactUsername != nil {
// make sure the account with the given username exists in the db
- contactAccount := &gtsmodel.Account{}
- if err := p.db.GetLocalAccountByUsername(*form.ContactUsername, contactAccount); err != nil {
+ contactAccount, err := p.db.GetLocalAccountByUsername(*form.ContactUsername)
+ if err != nil {
return nil, gtserror.NewErrorBadRequest(err, fmt.Sprintf("account with username %s not retrievable", *form.ContactUsername))
}
// make sure it has a user associated with it