Skip to content

Commit e16b055

Browse files
committed
exported fields so they can get populated by YAML data
1 parent fba31b9 commit e16b055

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

docker-compose.yml

Whitespace-only changes.

internal/glance/widget-reddit.go

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ var (
2525
type redditWidget struct {
2626
logger *slog.Logger
2727
widgetBase `yaml:",inline"`
28-
redditAccessToken string
29-
redditAppName string `yaml:"reddit-app-name"`
30-
redditClientID string `yaml:"reddit-client-id"`
31-
redditClientSecret string `yaml:"reddit-client-secret"`
28+
RedditAccessToken string
29+
RedditAppName string `yaml:"reddit-app-name"`
30+
RedditClientID string `yaml:"reddit-client-id"`
31+
RedditClientSecret string `yaml:"reddit-client-secret"`
3232
Posts forumPostList `yaml:"-"`
3333
Subreddit string `yaml:"subreddit"`
3434
Proxy proxyOptionsField `yaml:"proxy"`
@@ -54,13 +54,13 @@ type redditTokenResponse struct {
5454

5555
func (widget *redditWidget) fetchRedditAccessToken() error {
5656
// Only execute if a matching configuration is provider
57-
if widget.redditAppName == "" || widget.redditClientID == "" || widget.redditClientSecret == "" {
57+
if widget.RedditAppName == "" || widget.RedditClientID == "" || widget.RedditClientSecret == "" {
5858
return nil
5959
}
6060

61-
widget.logger.Info("Found reddit API credentials", "app-name", widget.redditAppName, "client-id", widget.redditClientID, "client-secret", widget.redditClientSecret)
61+
widget.logger.Info("Found reddit API credentials", "app-name", widget.RedditAppName, "client-id", widget.RedditClientID, "client-secret", widget.RedditClientSecret)
6262

63-
auth := base64.StdEncoding.EncodeToString([]byte(widget.redditClientID + ":" + widget.redditClientSecret))
63+
auth := base64.StdEncoding.EncodeToString([]byte(widget.RedditClientID + ":" + widget.RedditClientSecret))
6464

6565
// Prepare form data
6666
data := url.Values{}
@@ -74,7 +74,7 @@ func (widget *redditWidget) fetchRedditAccessToken() error {
7474

7575
// Set headers
7676
req.Header.Add("Authorization", "Basic "+auth)
77-
req.Header.Add("User-Agent", fmt.Sprintf("%s/1.0", widget.redditAppName))
77+
req.Header.Add("User-Agent", fmt.Sprintf("%s/1.0", widget.RedditAppName))
7878
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
7979

8080
// Make the request
@@ -103,7 +103,7 @@ func (widget *redditWidget) fetchRedditAccessToken() error {
103103
return fmt.Errorf("unmarshalling Reddit API response: %w", err)
104104
}
105105

106-
widget.redditAccessToken = tokenResp.AccessToken
106+
widget.RedditAccessToken = tokenResp.AccessToken
107107

108108
widget.logger.Info("Successfully fetched Reddit access token", "access-token", tokenResp.AccessToken)
109109

@@ -178,8 +178,8 @@ func (widget *redditWidget) update(ctx context.Context) {
178178
widget.RequestUrlTemplate,
179179
widget.Proxy.client,
180180
widget.ShowFlairs,
181-
widget.redditAppName,
182-
widget.redditAccessToken,
181+
widget.RedditAppName,
182+
widget.RedditAccessToken,
183183
)
184184

185185
if !widget.canContinueUpdateAfterHandlingErr(err) {
@@ -261,6 +261,9 @@ func fetchSubredditPosts(
261261
query := url.Values{}
262262
var requestUrl string
263263

264+
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
265+
logger.Info("Fetching subreddit posts", "app-name", redditAppName)
266+
264267
if search != "" {
265268
query.Set("q", search+" subreddit:"+subreddit)
266269
query.Set("sort", sort)
@@ -274,6 +277,7 @@ func fetchSubredditPosts(
274277

275278
if redditAccessToken != "" {
276279
baseURL = "https://oauth.reddit.com"
280+
logger.Info("using oauth url")
277281
} else {
278282
baseURL = "https://www.reddit.com"
279283
}
@@ -302,6 +306,7 @@ func fetchSubredditPosts(
302306
setBrowserUserAgentHeader(request)
303307
} else {
304308
request.Header.Set("User-Agent", fmt.Sprintf("%s/1.0", redditAppName))
309+
logger.Info("setting app user agent", "app-name", redditAppName)
305310
}
306311

307312
if redditAccessToken != "" {

0 commit comments

Comments
 (0)