From 185365628b3088f77713e569c3390898b7848c22 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Wed, 26 Nov 2014 22:10:07 +0000 Subject: Make site a url argument This addresses the apparent api bug which affected both the retrieval of favorites and the site-switching. Se #82 As far as I can see, this issue affects ALL api calls, so it seems reasonable that it should be fixed inside `sx-method-call`. The usage of sx-method-call stays the same, only the internal has changed. --- sx-favorites.el | 3 ++- sx-method.el | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sx-favorites.el b/sx-favorites.el index aaf2734..d957167 100644 --- a/sx-favorites.el +++ b/sx-favorites.el @@ -52,7 +52,8 @@ Added as hook to initialization." (defun sx-favorites--retrieve-favorites (site) "Obtain list of starred QUESTION_IDs for SITE." (sx-method-call 'me - :submethod (format "favorites?site=%s" site) + :submethod 'favorites + :site site :filter sx-favorite-list-filter :auth t)) diff --git a/sx-method.el b/sx-method.el index 4bd98a5..238f46a 100644 --- a/sx-method.el +++ b/sx-method.el @@ -75,7 +75,9 @@ Return the entire response as a complex alist." (when id (format "/%s" id)) (when submethod - (format "/%s" submethod)))) + (format "/%s" submethod)) + (when (stringp site) + (format "?site=%s" site)))) (call 'sx-request-make)) (lwarn "sx-call-method" :debug "A: %S T: %S. M: %S,%s. F: %S" (equal 'warn auth) access-token method-auth full-method filter-auth) @@ -96,10 +98,8 @@ Return the entire response as a complex alist." (error "This request requires authentication.")))) ;; Concatenate all parameters now that filter is ensured. (setq parameters - (cons `(site . ,site) - (cons (cons 'filter - (sx-filter-get-var filter)) - keywords))) + (cons (cons 'filter (sx-filter-get-var filter)) + keywords)) (funcall call full-method parameters -- cgit v1.2.3 From 5c416202f4897e04d8f5eadc0457b86ca643e716 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Wed, 26 Nov 2014 22:42:01 +0000 Subject: Don't do this patch when POSTing --- sx-method.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sx-method.el b/sx-method.el index 238f46a..4810e8c 100644 --- a/sx-method.el +++ b/sx-method.el @@ -76,8 +76,12 @@ Return the entire response as a complex alist." (format "/%s" id)) (when submethod (format "/%s" submethod)) - (when (stringp site) - (format "?site=%s" site)))) + ;; On GET methods site is buggy, so we + ;; need to provide it as a url argument. + (when (and site (string= url-method "GET")) + (prog1 + (format "?site=%s" site) + (setq site nil))))) (call 'sx-request-make)) (lwarn "sx-call-method" :debug "A: %S T: %S. M: %S,%s. F: %S" (equal 'warn auth) access-token method-auth full-method filter-auth) @@ -100,6 +104,8 @@ Return the entire response as a complex alist." (setq parameters (cons (cons 'filter (sx-filter-get-var filter)) keywords)) + (when site + (setq parameters (cons (cons 'site site) parameters))) (funcall call full-method parameters -- cgit v1.2.3 From f9c12d9c09e1dff7c29b3bf94dbccd042f48f078 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Thu, 27 Nov 2014 01:47:11 +0000 Subject: Function quote sx-request-make --- sx-method.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sx-method.el b/sx-method.el index 4810e8c..1b20cbf 100644 --- a/sx-method.el +++ b/sx-method.el @@ -82,7 +82,7 @@ Return the entire response as a complex alist." (prog1 (format "?site=%s" site) (setq site nil))))) - (call 'sx-request-make)) + (call #'sx-request-make)) (lwarn "sx-call-method" :debug "A: %S T: %S. M: %S,%s. F: %S" (equal 'warn auth) access-token method-auth full-method filter-auth) (unless access-token -- cgit v1.2.3