Update app.R

app.R

@@ -9,42 +9,46 @@ library(httr)
 library(patchwork)  # For combining plots
 
 check_patreon_access <- function(email) {
-    campaign_id <- Sys.getenv("PATREON_CAMPAIGN_ID")
-    access_token <- Sys.getenv("PATREON_ACCESS_TOKEN")
-    
-    base_url <- paste0("https://www.patreon.com/api/oauth2/v2/campaigns/", campaign_id, "/members")
-    
-    params <- list(
-        `include` = "user,currently_entitled_tiers",
-        `fields[member]` = "patron_status,email",
-        `fields[tier]` = "title,amount_cents"
-    )
-    
-    response <- GET(
-        base_url,
-        query = params,
-        add_headers(
-            `Authorization` = paste("Bearer", access_token),
-            `User-Agent` = "R/httr"
-        )
+  campaign_id <- Sys.getenv("PATREON_CAMPAIGN_ID")
+  access_token <- Sys.getenv("PATREON_ACCESS_TOKEN")
+  
+  base_url <- paste0("https://www.patreon.com/api/oauth2/v2/campaigns/", campaign_id, "/members")
+  
+  params <- list(
+    `include` = "currently_entitled_tiers",
+    `fields[member]` = "patron_status,email",
+    `fields[tier]` = "title"
+  )
+  
+  response <- GET(
+    base_url,
+    query = params,
+    add_headers(
+      `Authorization` = paste("Bearer", access_token),
+      `User-Agent` = "R/httr"
     )
+  )
+  
+  content <- fromJSON(rawToChar(response$content))
+  
+  # Check in data$attributes for matching email
+  matching_row <- which(content$data$attributes$email == email)
+  
+  if (length(matching_row) > 0) {
+    # Get patron status
+    patron_status <- content$data$attributes$patron_status[matching_row]
     
-    content <- fromJSON(rawToChar(response$content))
-    
-    # Check if email exists and has correct access
-    if (!is.null(content$data$attributes$email)) {
-        user_email <- content$data$attributes$email
-        patron_status <- content$data$attributes$patron_status
-        tier <- content[["included"]][["attributes"]][["title"]][2]
-        
-        # Check conditions
-        if (tolower(user_email) == tolower(email) && 
-            patron_status == "active_patron" && 
-            (tier == "Veteran" || tier == "Hall of Fame")) {
-            return(TRUE)
-        }
+    if (patron_status == "active_patron") {
+      # Get tier info
+      tier_data <- content$data$relationships$currently_entitled_tiers$data[[matching_row]]
+      
+      result <- tier_id %in% c("25062087", "25062090")
+      
+      return(result)
     }
-    return(FALSE)
+  }
+  
+  return(FALSE)
 }
 download_private_csv <- function(repo_id, filename) {
   url <- paste0("https://huggingface.co/datasets/", repo_id, "/resolve/main/", filename)
@@ -113,34 +117,34 @@ fsl <- download_private_csv("TimStats/StatcastDataAll", "FSL.csv")
 
 ui <- page_fluid(
   theme = bs_theme(bg = "#333333", fg = "#ffffff", primary = "#428bca"),
-  uiOutput("page_content"),
-  card(
-    card_header("2020-2024 Filterable Pitcher Heatmaps"),
-    card(
-      layout_columns(
-        col_widths = c(4, 4, 4),
-        card(
-          selectInput("league", "Select League:", choices = c("MLB","AAA","FSL")),
-          selectInput("player", "Select Player:", choices = c("")),
-          sliderInput("concen", "Heatmap Bandwidth Factor", value = .75, step = 0.05, min = .5, max = 1.5)
-        ),
-        card(
-          selectInput("hand1", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
-          selectInput("pitch1", "Pitch:", choices = c("")),
-          dateRangeInput("date1", "Date Range:", start = "2024-02-09", end = "2024-09-05")
-        ),
-        card(
-          selectInput("hand2", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
-          selectInput("pitch2", "Pitch:", choices = c("")),
-          dateRangeInput("date2", "Date Range:", start = "2024-02-09", end = "2024-09-05")
-        )
-      )
-    ),
-    card(
-      downloadButton("download", "Download Plot", class = "btn-primary mb-3"),
-      plotOutput("combined_graph", height = "600px")
-    )
-  )
+  uiOutput("page_content")
+# card(
+#   card_header("2020-2024 Filterable Pitcher Heatmaps"),
+#   card(
+#     layout_columns(
+#       col_widths = c(4, 4, 4),
+#       card(
+#         selectInput("league", "Select League:", choices = c("MLB","AAA","FSL")),
+#         selectInput("player", "Select Player:", choices = c("")),
+#         sliderInput("concen", "Heatmap Bandwidth Factor", value = .75, step = 0.05, min = .5, max = 1.5)
+#       ),
+#       card(
+#         selectInput("hand1", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
+#         selectInput("pitch1", "Pitch:", choices = c("")),
+#         dateRangeInput("date1", "Date Range:", start = "2024-02-09", end = "2024-09-05")
+#       ),
+#       card(
+#         selectInput("hand2", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
+#         selectInput("pitch2", "Pitch:", choices = c("")),
+#         dateRangeInput("date2", "Date Range:", start = "2024-02-09", end = "2024-09-05")
+#       )
+#     )
+#   ),
+#   card(
+#     downloadButton("download", "Download Plot", class = "btn-primary mb-3"),
+#     plotOutput("combined_graph", height = "600px")
+#   )
+# )
 )
 
 # [Server code remains exactly the same]