mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-28 23:06:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[feature] Add from: search operator and account_id query param (#2943)

Browse source 
* Add from: search operator

* Fix whitespace in Swagger YAML comment

* Move query parsing into its own method

* Document search

* Clarify post search scope
This commit is contained in:
Vyr Cossont 2024-05-31 03:57:42 -07:00 • committed by GitHub
commit 04bcde08a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 312 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/db/bundb/search.go
View file

@ -266,8 +266,9 @@ func (s *searchDB) accountText(following bool) *bun.SelectQuery {
// ORDER BY "status"."id" DESC LIMIT 10
func (s *searchDB) SearchForStatuses(
ctx context.Context,
accountID string,
requestingAccountID string,
query string,
fromAccountID string,
maxID string,
minID string,
limit int,
@ -295,9 +296,12 @@ func (s *searchDB) SearchForStatuses(
// accountID or replying to accountID.
WhereGroup(" AND ", func(q *bun.SelectQuery) *bun.SelectQuery {
return q.
Where("? = ?", bun.Ident("status.account_id"), accountID).
WhereOr("? = ?", bun.Ident("status.in_reply_to_account_id"), accountID)
Where("? = ?", bun.Ident("status.account_id"), requestingAccountID).
WhereOr("? = ?", bun.Ident("status.in_reply_to_account_id"), requestingAccountID)
})
if fromAccountID != "" {
q = q.Where("? = ?", bun.Ident("status.account_id"), fromAccountID)
}
// Return only items with a LOWER id than maxID.
if maxID == "" {