1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Improvements to twitterstats code from review

* Unmarshal directly into a `TwitterStats` struct by using json struct annotations
 * Pull stats fetching for a single user out into its own function so that closing the request body is done after each request and the HTTP request can be re-used for multiple usernames' stats
 * Improve type casting code used in settings parsing logic
This commit is contained in:
Casey Primozic 2019-10-23 11:49:33 -07:00
parent 3c95d8e39d
commit d82eda1933
No known key found for this signature in database
GPG Key ID: 2A02222DA3425B99
2 changed files with 34 additions and 38 deletions

View File

@ -19,8 +19,8 @@ type Client struct {
// TwitterStats Represents a stats snapshot for a single Twitter user at a point in time // TwitterStats Represents a stats snapshot for a single Twitter user at a point in time
type TwitterStats struct { type TwitterStats struct {
followerCount int64 FollowerCount int64 `json:"followers_count"`
tweetCount int64 TweetCount int64 `json:"statuses_count"`
} }
const ( const (
@ -31,15 +31,10 @@ const (
func NewClient(settings *Settings) *Client { func NewClient(settings *Settings) *Client {
usernames := make([]string, len(settings.screenNames)) usernames := make([]string, len(settings.screenNames))
for i, username := range settings.screenNames { for i, username := range settings.screenNames {
switch username.(type) { var ok bool
default: if usernames[i], ok = username.(string); !ok {
{ log.Fatalf("All `screenName`s in twitterstats config must be of type string")
log.Fatalf("All `screenName`s in twitterstats config must be of type string")
}
case string:
usernames[i] = username.(string)
} }
} }
conf := &clientcredentials.Config{ conf := &clientcredentials.Config{
@ -57,38 +52,39 @@ func NewClient(settings *Settings) *Client {
return &client return &client
} }
// GetStatsForUser Fetches stats for a single user. If there is an error fetching or parsing the response
// from the Twitter API, an empty stats struct will be returned.
func (client *Client) GetStatsForUser(username string) TwitterStats {
stats := TwitterStats{
FollowerCount: 0,
TweetCount: 0,
}
url := fmt.Sprintf("%s?screen_name=%s", userTimelineURL, username)
res, err := client.httpClient.Get(url)
if err != nil {
return stats
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return stats
}
// If there is an error while parsing, just discard the error and return the empty stats
json.Unmarshal(body, &stats)
return stats
}
// GetStats Returns a slice of `TwitterStats` structs for each username in `client.screenNames` in the same // GetStats Returns a slice of `TwitterStats` structs for each username in `client.screenNames` in the same
// order of `client.screenNames` // order of `client.screenNames`
func (client *Client) GetStats() []TwitterStats { func (client *Client) GetStats() []TwitterStats {
stats := make([]TwitterStats, len(client.screenNames)) stats := make([]TwitterStats, len(client.screenNames))
for i, username := range client.screenNames { for i, username := range client.screenNames {
stats[i] = TwitterStats{ stats[i] = client.GetStatsForUser(username)
followerCount: 0,
tweetCount: 0,
}
res, err := client.httpClient.Get(fmt.Sprintf("%s?screen_name=%s", userTimelineURL, username))
if err != nil {
continue
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
if err != nil {
continue
}
var parsed map[string]interface{}
err = json.Unmarshal(body, &parsed)
if err != nil {
continue
}
stats[i] = TwitterStats{
followerCount: int64(parsed["followers_count"].(float64)),
tweetCount: int64(parsed["statuses_count"].(float64)),
}
} }
return stats return stats

View File

@ -39,8 +39,8 @@ func (widget *Widget) content() (string, string, bool) {
// Add rows for each of the followed usernames // Add rows for each of the followed usernames
for i, username := range usernames { for i, username := range usernames {
followerCount := stats[i].followerCount followerCount := stats[i].FollowerCount
tweetCount := stats[i].tweetCount tweetCount := stats[i].TweetCount
str += fmt.Sprintf("%-16s %8d %8d\n", username, followerCount, tweetCount) str += fmt.Sprintf("%-16s %8d %8d\n", username, followerCount, tweetCount)
} }