Skip to content

Commit 6a7e06f

Browse files
committed
Skip user bio if no universe is set
1 parent 4c7d00b commit 6a7e06f

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

R/buildtools.R

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ universe_name_fallback <- function(){
589589
sub("https://(.+)\\.r-universe\\.dev", "\\1", Sys.getenv('MY_UNIVERSE'))
590590
}
591591

592-
universe_info <- function(){
592+
universe_bio <- function(){
593593
name <- Sys.getenv('UNIVERSE_NAME', universe_name_fallback())
594594
if(nchar(name)){
595595
universe <- switch(name,
@@ -599,7 +599,16 @@ universe_info <- function(){
599599
'ropensci-champions' = 'ropensci',
600600
name
601601
)
602-
gh::gh(sprintf('/users/%s', universe))
602+
userinfo <- gh::gh(sprintf('/users/%s', universe))
603+
userbio <- list(
604+
uuid = userinfo$id,
605+
type = tolower(userinfo$type),
606+
name = ifelse(length(userinfo$name), userinfo$name, userinfo$login)
607+
)
608+
if(length(userinfo$bio)){
609+
userbio$description <- userinfo$bio
610+
}
611+
return(userinfo)
603612
}
604613
}
605614

@@ -905,16 +914,9 @@ generate_metadata_files <- function(package, repo, subdir, outdir, pkgdir, git_u
905914
if(!length(searchresults)){
906915
searchresults <- current[['_searchresults']]
907916
}
908-
userinfo <- universe_info()
909-
userbio <- list(
910-
uuid = userinfo$id,
911-
type = tolower(userinfo$type),
912-
name = ifelse(length(userinfo$name), userinfo$name, userinfo$login)
913-
)
914-
if(length(userinfo$bio)){
915-
userbio$description <- userinfo$bio
916-
}
917-
contents$userbio <- lapply(userbio, jsonlite::unbox)
917+
userbio <- universe_bio()
918+
if(length(userbio))
919+
contents$userbio <- lapply(userbio, jsonlite::unbox)
918920
if(length(downloads))
919921
contents$downloads <- lapply(downloads, jsonlite::unbox)
920922
if(length(mentions))

0 commit comments

Comments
 (0)