mirror of
https://github.com/christianselig/apollo-backend
synced 2024-11-22 03:37:43 +00:00
show all to avoid hidden posts
This commit is contained in:
parent
be343deab8
commit
d8bd6dfb37
2 changed files with 27 additions and 4 deletions
|
@ -3,6 +3,7 @@ package worker
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -191,10 +192,16 @@ func (sc *subredditsConsumer) Consume(delivery rmq.Delivery) {
|
||||||
zap.Int("page", page),
|
zap.Int("page", page),
|
||||||
)
|
)
|
||||||
|
|
||||||
sps, err := sc.reddit.SubredditNew(sc,
|
i := rand.Intn(len(watchers))
|
||||||
|
watcher := watchers[i]
|
||||||
|
|
||||||
|
acc, _ := sc.accountRepo.GetByID(sc, watcher.AccountID)
|
||||||
|
rac := sc.reddit.NewAuthenticatedClient(acc.AccountID, acc.RefreshToken, acc.AccessToken)
|
||||||
|
sps, err := rac.SubredditNew(sc,
|
||||||
subreddit.Name,
|
subreddit.Name,
|
||||||
reddit.WithQuery("before", before),
|
reddit.WithQuery("before", before),
|
||||||
reddit.WithQuery("limit", "100"),
|
reddit.WithQuery("limit", "100"),
|
||||||
|
reddit.WithQuery("show", "all"),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -252,9 +259,15 @@ func (sc *subredditsConsumer) Consume(delivery rmq.Delivery) {
|
||||||
zap.String("subreddit#name", subreddit.NormalizedName()),
|
zap.String("subreddit#name", subreddit.NormalizedName()),
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
sps, err := sc.reddit.SubredditHot(sc,
|
i := rand.Intn(len(watchers))
|
||||||
|
watcher := watchers[i]
|
||||||
|
|
||||||
|
acc, _ := sc.accountRepo.GetByID(sc, watcher.AccountID)
|
||||||
|
rac := sc.reddit.NewAuthenticatedClient(acc.AccountID, acc.RefreshToken, acc.AccessToken)
|
||||||
|
sps, err := rac.SubredditHot(sc,
|
||||||
subreddit.Name,
|
subreddit.Name,
|
||||||
reddit.WithQuery("limit", "100"),
|
reddit.WithQuery("limit", "100"),
|
||||||
|
reddit.WithQuery("show", "all"),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -3,6 +3,7 @@ package worker
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -168,7 +169,12 @@ func (tc *trendingConsumer) Consume(delivery rmq.Delivery) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
tps, err := tc.reddit.SubredditTop(tc, subreddit.Name, reddit.WithQuery("t", "week"))
|
// Grab last month's top posts so we calculate a trending average
|
||||||
|
i := rand.Intn(len(watchers))
|
||||||
|
watcher := watchers[i]
|
||||||
|
rac := tc.reddit.NewAuthenticatedClient(watcher.Account.AccountID, watcher.Account.RefreshToken, watcher.Account.AccessToken)
|
||||||
|
|
||||||
|
tps, err := rac.SubredditTop(tc, subreddit.Name, reddit.WithQuery("t", "week"), reddit.WithQuery("show", "all"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tc.logger.Error("failed to fetch weeks's top posts",
|
tc.logger.Error("failed to fetch weeks's top posts",
|
||||||
zap.Error(err),
|
zap.Error(err),
|
||||||
|
@ -219,7 +225,11 @@ func (tc *trendingConsumer) Consume(delivery rmq.Delivery) {
|
||||||
zap.Int64("score", medianScore),
|
zap.Int64("score", medianScore),
|
||||||
)
|
)
|
||||||
|
|
||||||
hps, err := tc.reddit.SubredditHot(tc, subreddit.Name)
|
// Grab hot posts and filter out anything that's > 2 days old
|
||||||
|
i = rand.Intn(len(watchers))
|
||||||
|
watcher = watchers[i]
|
||||||
|
rac = tc.reddit.NewAuthenticatedClient(watcher.Account.AccountID, watcher.Account.RefreshToken, watcher.Account.AccessToken)
|
||||||
|
hps, err := tc.reddit.SubredditHot(tc, subreddit.Name, reddit.WithQuery("show", "all"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tc.logger.Error("failed to fetch hot posts",
|
tc.logger.Error("failed to fetch hot posts",
|
||||||
zap.Error(err),
|
zap.Error(err),
|
||||||
|
|
Loading…
Reference in a new issue