Merge branch 'master' into dev

Moleculor · May 6, 2021 · f126afd · f126afd
2 parents e9a2368 + 78d42ec
commit f126afd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/common/loghooks.go b/common/loghooks.go
@@ -157,6 +157,11 @@ var (
 		Help: "Number of http requests to the discord API",
 	}, []string{"path"})
 
+	metrics429Path = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "yagpdb_discord_http_429_path_total",
+		Help: "Number of http requests to the discord API",
+	}, []string{"path"})
+
 	metricsNumRequestsResponseCode = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "yagpdb_discord_http_requests_response_code_total",
 		Help: "Number of http requests to the discord API",
@@ -201,6 +206,10 @@ func (t *LoggingTransport) RoundTrip(request *http.Request) (*http.Response, err
 		path = numberRemover.Replace(path)
 
 		metricsHTTPLatency.Observe(since)
+
+		if code == 429 {
+			metrics429Path.With(prometheus.Labels{"path": path}).Inc()
+		}
 		// metricsNumRequests.With(prometheus.Labels{"path": path})
 		metricsNumRequestsResponseCode.With(prometheus.Labels{"response_code": strconv.Itoa(code)}).Inc()
 

diff --git a/common/patreon/poller.go b/common/patreon/poller.go
@@ -186,7 +186,7 @@ func (p *Poller) Poll() {
 				patron.Name = user.FirstName
 			}
 
-			if user.SocialConnections.Discord != nil && user.SocialConnections.Discord.UserID != "" {
+			if user.SocialConnections != nil && user.SocialConnections.Discord != nil && user.SocialConnections.Discord.UserID != "" {
 				discordID, _ := strconv.ParseInt(user.SocialConnections.Discord.UserID, 10, 64)
 				patron.DiscordID = discordID
 			}

diff --git a/premium/premium.go b/premium/premium.go
@@ -247,7 +247,9 @@ func (p *Plugin) UpdateFeatureFlags(guildID int64) ([]string, error) {
 			return nil, errors.WithMessage(err, "GuildPremiumTier")
 		}
 
-		if tier > highestTier {
+		if tier == PremiumTierPremium {
+			highestTier = tier
+		} else if highestTier == PremiumTierNone {
 			highestTier = tier
 		}
 	}

diff --git a/yagpdb_docker/app.example.env b/yagpdb_docker/app.example.env
@@ -38,6 +38,12 @@ YAGPDB_BOTLEAVESJOINS=
 YAGPDB_AYLIENAPPID=aylien app id here
 YAGPDB_AYLIENAPPKEY=aylien app key here
 
+#Twitter
+YAGPDB_TWITTER_ACCESS_TOKEN=Twitter Access Token
+YAGPDB_TWITTER_ACCESS_TOKEN_SECRET=Twitter Access Token Secret
+YAGPDB_TWITTER_CONSUMER_KEY=Twitter Consumer Key
+YAGPDB_TWITTER_CONSUMER_SECRET=Twitter Consumer Secret
+
 # Reddit
 YAGPDB_REDDIT_CLIENTID=Reddit application clientid here
 YAGPDB_REDDIT_CLIENTSECRET=Reddit application client secret here