diff options
| author |  tsmethurst <tobi.smethurst@klarrio.com> | 2021-05-29 19:45:07 +0200 |
|---|---|---|
| committer | tsmethurst <tobi.smethurst@klarrio.com> | 2021-05-29 19:45:07 +0200 |
| commit | 5facbed9c04d1b2e11bf5b842a6acda3a9ed54c0 (patch) | |
| tree | 40ae75c3613c9c6915273f98fe7ce41046d11381 /internal/message | |
| parent | first implementation of search feature (diff) | |
| parent | Search (#36) (diff) | |
| download | gotosocial-5facbed9c04d1b2e11bf5b842a6acda3a9ed54c0.tar.xz | |
Merge branch 'main' of github.com:superseriousbusiness/gotosocial into main
Diffstat (limited to 'internal/message')
| -rw-r--r-- | internal/message/fromfederatorprocess.go | 2 | ||||
| -rw-r--r-- | internal/message/searchprocess.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/message/fromfederatorprocess.go b/internal/message/fromfederatorprocess.go index 28ba4430b..b070cc46d 100644 --- a/internal/message/fromfederatorprocess.go +++ b/internal/message/fromfederatorprocess.go @@ -409,7 +409,7 @@ func (p *processor) dereferenceAnnounce(announce *gtsmodel.Status, requestingUse } // now dereference additional fields straight away (we're already async here so we have time) - if err := p.dereferenceStatusFields(boostedStatus, requestingUsername); err != nil { + if err := p.dereferenceStatusFields(boostedStatus, requestingUsername); err != nil { return fmt.Errorf("dereferenceAnnounce: error dereferencing status fields for status with id %s: %s", announce.GTSBoostedStatus.URI, err) } diff --git a/internal/message/searchprocess.go b/internal/message/searchprocess.go index e4e96637b..5634ab51f 100644 --- a/internal/message/searchprocess.go +++ b/internal/message/searchprocess.go @@ -228,7 +228,7 @@ func (p *processor) searchAccountByMention(authed *oauth.Auth, mention string, r // if it's a local account we can skip a whole bunch of stuff maybeAcct := >smodel.Account{} if domain == p.config.Host { - if p.db.GetLocalAccountByUsername(username, maybeAcct); err != nil { + if err = p.db.GetLocalAccountByUsername(username, maybeAcct); err != nil { return } foundAccount = maybeAcct |