mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

Merge branch 'main' of github.com:superseriousbusiness/gotosocial into main

This commit is contained in:
tsmethurst 2021-05-29 19:45:07 +02:00
parent 0fe853b1ee 1fe5e36ac3
commit 5facbed9c0
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/db/pg/pg.go
View File

@ -1148,7 +1148,6 @@ func (ps *postgresService) GetNotificationsForAccount(accountID string, limit in
q := ps.conn.Model(&notifications).Where("target_account_id = ?", accountID) q := ps.conn.Model(&notifications).Where("target_account_id = ?", accountID)
if maxID != "" { if maxID != "" {
n := &gtsmodel.Notification{} n := &gtsmodel.Notification{}
if err := ps.conn.Model(n).Where("id = ?", maxID).Select(); err != nil { if err := ps.conn.Model(n).Where("id = ?", maxID).Select(); err != nil {

2
internal/message/searchprocess.go
View File

@ -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 // if it's a local account we can skip a whole bunch of stuff
maybeAcct := &gtsmodel.Account{} maybeAcct := &gtsmodel.Account{}
if domain == p.config.Host { if domain == p.config.Host {
if p.db.GetLocalAccountByUsername(username, maybeAcct); err != nil { if err = p.db.GetLocalAccountByUsername(username, maybeAcct); err != nil {
return return
} }
foundAccount = maybeAcct foundAccount = maybeAcct