farhan/fedilogue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating API

Browse Source
This commit is contained in:
farhan 2023-10-18 00:10:15 -04:00
parent f041f0443e
commit 91c206cd96
Signed by: farhan
GPG Key ID: 45FE45AD7E54F59B
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
restapi/restapi.go
View File

@ -51,7 +51,7 @@ func runMetrics() {
data, err := json.Marshal(totalJson) data, err := json.Marshal(totalJson)
if err != nil { if err != nil {
log.Fatalf("error marshaling combined activity: %v\n", err) log.Fatalf("error marshaling combined activity 1: %v\n", err)
} }
metricsText = string(data) metricsText = string(data)
@ -176,15 +176,15 @@ func getSearch(w http.ResponseWriter, r *http.Request) {
if exists_search && searchKey != "" { if exists_search && searchKey != "" {
if offsetKey == -1 { if offsetKey == -1 {
rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' WHERE activities.normalized_tsvector @@ plainto_tsquery($1) ORDER BY activities.id DESC LIMIT 10", searchKey) rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document, activities.instance FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' WHERE activities.normalized_tsvector @@ plainto_tsquery($1) ORDER BY activities.id DESC LIMIT 10", searchKey)
} else { } else {
rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' WHERE activities.normalized_tsvector @@ plainto_tsquery($1) AND activities.id < $2 ORDER BY activities.id DESC LIMIT 10", searchKey, offsetKey) rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document, activities.instance, FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' WHERE activities.normalized_tsvector @@ plainto_tsquery($1) AND activities.id < $2 ORDER BY activities.id DESC LIMIT 10", searchKey, offsetKey)
} }
} else { } else {
if offsetKey == -1 { if offsetKey == -1 {
rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' ORDER BY activities.id DESC LIMIT 10") rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document, activities.instance FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' ORDER BY activities.id DESC LIMIT 10")
} else { } else {
rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' AND activities.id < $1 ORDER BY activities.id DESC LIMIT 10", offsetKey) rows, err = pool.Query(context.Background(), "SELECT activities.id, activities.document, actors.document, activities.instance FROM activities as activities INNER JOIN actors as actors ON activities.document->>'actor' = actors.document->>'id' AND activities.id < $1 ORDER BY activities.id DESC LIMIT 10", offsetKey)
} }
} }
@ -200,9 +200,10 @@ func getSearch(w http.ResponseWriter, r *http.Request) {
var id int var id int
var activityRaw string var activityRaw string
var actorRaw string var actorRaw string
var instance string
var activityJson map[string]json.RawMessage var activityJson map[string]json.RawMessage
err = rows.Scan(&id, &activityRaw, &actorRaw) err = rows.Scan(&id, &activityRaw, &actorRaw, &instance)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -217,6 +218,14 @@ func getSearch(w http.ResponseWriter, r *http.Request) {
earliestid = id earliestid = id
} }
// Add the instance string
rawInstance, err := json.Marshal(instance)
if err != nil {
fmt.Println("Error marshaling instance string:", err)
return
}
activityJson["instance"] = json.RawMessage(rawInstance)
activityJson["actor"] = json.RawMessage(actorRaw) activityJson["actor"] = json.RawMessage(actorRaw)
activitiesJson = append(activitiesJson, activityJson) activitiesJson = append(activitiesJson, activityJson)
} }
@ -230,7 +239,7 @@ func getSearch(w http.ResponseWriter, r *http.Request) {
data, err := json.Marshal(totalJson) data, err := json.Marshal(totalJson)
if err != nil { if err != nil {
log.Fatalf("error marshaling combined activity: %v\n", err) log.Fatalf("error marshaling combined activity 2: %v\n", err)
} }
fmt.Fprintf(w, "%s", data) fmt.Fprintf(w, "%s", data)
} }