Fix bugs with sending messages

DESCRIPTION

@@ -13,11 +13,11 @@ Imports:
     base64enc,
     magrittr,
     jsonlite,
-    mime
+    mime,
+    argufy
 Suggests:
     testthat,
-    knitr,
-    argufy
+    knitr
 Remotes:
   gaborcsardi/argufy
 License: MIT + file LICENSE

R/gmailr.R

@@ -339,13 +339,16 @@ print.gmail_thread <- print.gmail_message
 #' @export
 print.gmail_threads <- print.gmail_message
 
+.last_response <- list()
+
 gmailr_query <- function(fun, location, user_id, class = NULL, ...) {
   req <- fun(gmail_path(user_id, location),
              config(token = get_token()),
               ...)
+  .last_response <<- content(req, "parsed")
   stop_for_status(req)
+  res <- .last_response
 
-  res <- content(req, "parsed")
   if (!is.null(class)) {
     class(res) <- class
   }

R/message.R

@@ -260,8 +260,8 @@ send_message <- function(
 
   gmailr_POST(c("messages", "send"), user_id, class = "gmail_message",
     query = list(uploadType = type),
-    body = jsonlite::toJSON(auto_unbox=TRUE,
-      c(threadId = thread_id,
-        raw = base64url_encode(mail))),
+    body = jsonlite::toJSON(auto_unbox=TRUE, null = "null",
+                            c(threadId = thread_id,
+                              list(raw = base64url_encode(mail)))),
     add_headers("Content-Type" = "application/json"))
 }

R/utils.R

@@ -31,8 +31,8 @@ rename <- function(...) {
 }
 not_null <- function(x){ Filter(Negate(is.null), x) }
 
-gmail_path <- function(user, ...) { paste("https://www.googleapis.com/gmail/v1/users", user, ..., sep="/") }
-gmail_upload_path <- function(user, ...) { paste("https://www.googleapis.com/upload/gmail/v1/users", user, ..., sep="/") }
+gmail_path <- function(user, ...) { paste("https://www.googleapis.com/gmail/v1/users", user, paste0(..., collapse = "/"), sep = "/") }
+gmail_upload_path <- function(user, ...) { paste("https://www.googleapis.com/upload/gmail/v1/users", user, paste0(..., collapse = "/"), sep = "/") }
 base64url_decode_to_char <- function(x) { rawToChar(base64decode(gsub("_", "/", gsub("-", "+", x)))) }
 base64url_decode <- function(x) { base64decode(gsub("_", "/", gsub("-", "+", x))) }
 base64url_encode <- function(x) { gsub("/", "_", gsub("\\+", "-", base64encode(charToRaw(as.character(x))))) }

R/zzz.R

@@ -30,4 +30,4 @@ valid_path <- function(path) {
   is_string(path) && dir.exists(path)
 }
 
-if (requireNamespace("argufy", quietly = TRUE)) argufy::argufy_package() else `?` <- function(e1, e2) e1
+argufy::argufy_package()