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

18
internal/api/client/search/searchget.go
View File

@ -128,16 +128,16 @@ func (m *Module) SearchGETHandler(c *gin.Context) {
} }
searchQuery := &model.SearchQuery{ searchQuery := &model.SearchQuery{
AccountID: accountID, AccountID: accountID,
MaxID: maxID, MaxID: maxID,
MinID: minID, MinID: minID,
Type: searchType, Type: searchType,
ExcludeUnreviewed: excludeUnreviewed, ExcludeUnreviewed: excludeUnreviewed,
Query: query, Query: query,
Resolve: resolve, Resolve: resolve,
Limit: limit, Limit: limit,
Offset: offset, Offset: offset,
Following: following, Following: following,
} }
results, errWithCode := m.processor.SearchGet(authed, searchQuery) results, errWithCode := m.processor.SearchGet(authed, searchQuery)

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/fromfederatorprocess.go
View File

@ -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) // 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) return fmt.Errorf("dereferenceAnnounce: error dereferencing status fields for status with id %s: %s", announce.GTSBoostedStatus.URI, err)
} }

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

2
internal/typeutils/converter.go
View File

@ -145,7 +145,7 @@ type TypeConverter interface {
/* /*
WRAPPER CONVENIENCE FUNCTIONS WRAPPER CONVENIENCE FUNCTIONS
*/ */
// WrapPersonInUpdate // WrapPersonInUpdate
WrapPersonInUpdate(person vocab.ActivityStreamsPerson, originAccount *gtsmodel.Account) (vocab.ActivityStreamsUpdate, error) WrapPersonInUpdate(person vocab.ActivityStreamsPerson, originAccount *gtsmodel.Account) (vocab.ActivityStreamsUpdate, error)
} }

8
internal/typeutils/internal.go
View File

@ -40,10 +40,10 @@ func (c *converter) StatusToBoost(s *gtsmodel.Status, boostingAccount *gtsmodel.
URL: boostWrapperStatusURL, URL: boostWrapperStatusURL,
// the boosted status is not created now, but the boost certainly is // the boosted status is not created now, but the boost certainly is
CreatedAt: time.Now(), CreatedAt: time.Now(),
UpdatedAt: time.Now(), UpdatedAt: time.Now(),
Local: local, Local: local,
AccountID: boostingAccount.ID, AccountID: boostingAccount.ID,
// replies can be boosted, but boosts are never replies // replies can be boosted, but boosts are never replies
InReplyToID: "", InReplyToID: "",