Use new `sx-filter-from-nil' macro

4 files changed, 27 insertions, 47 deletions

diff --git a/sx-favorites.el b/sx-favorites.el
index d957167..e86e521 100644
--- a/sx-favorites.el
+++ b/sx-favorites.el
@@ -25,15 +25,11 @@
 (require 'sx-cache)
 (require 'sx-site)
 (require 'sx-networks)
+(require 'sx-filter)
 
 (defvar sx-favorite-list-filter
-  '((.backoff
-     .items
-     .quota_max
-     .quota_remaining
-     question.question_id)
-    nil
-    none))
+  (sx-filter-from-nil
+   (question.question_id)))
 
 (defvar sx-favorites--user-favorite-list nil
   "Alist of questions favorited by the user.
diff --git a/sx-networks.el b/sx-networks.el
index e4660af..20ac65c 100644
--- a/sx-networks.el
+++ b/sx-networks.el
@@ -24,31 +24,23 @@
 (require 'sx-method)
 (require 'sx-cache)
 (require 'sx-site)
+(require 'sx-filter)
 
 (defvar sx-network--user-filter
-  '((.backoff
-     .error_id
-     .error_message
-     .error_name
-     .has_more
-     .items
-     .quota_max
-     .quota_remaining
-     badge_count.bronze
-     badge_count.silver
-     badge_count.gold
-     network_user.account_id
-     network_user.answer_count
-     network_user.badge_counts
-     network_user.creation_date
-     network_user.last_access_date
-     network_user.reputation
-     network_user.site_name
-     network_user.site_url
-     network_user.user_id
-     network_user.user_type)
-    nil
-    none))
+  (sx-filter-from-nil
+   (badge_count.bronze
+    badge_count.silver
+    badge_count.gold
+    network_user.account_id
+    network_user.answer_count
+    network_user.badge_counts
+    network_user.creation_date
+    network_user.last_access_date
+    network_user.reputation
+    network_user.site_name
+    network_user.site_url
+    network_user.user_id
+    network_user.user_type)))
 
 (defun sx-network--get-associated ()
   "Retrieve cached information for network user.
diff --git a/sx-site.el b/sx-site.el
index 1402bb9..1bc86a6 100644
--- a/sx-site.el
+++ b/sx-site.el
@@ -23,25 +23,16 @@
 
 (require 'sx-method)
 (require 'sx-cache)
+(require 'sx-filter)
 
 (defvar sx-site-browse-filter
-  '((.backoff
-     .error_id
-     .error_message
-     .error_name
-     .has_more
-     .items
-     .quota_max
-     .quota_remaining
-     site.site_type
-     site.name
-     site.site_url
-     site.api_site_parameter
-     site.related_sites
-     related_site.api_site_parameter
-     related_site.relation)
-    nil
-    none)
+  (sx-filter-from-nil
+   (site.site_type
+    site.name
+    site.api_site_parameter
+    site.related_sites
+    related_site.api_site_parameter
+    related_site.relation))
   "Filter for browsing sites.")
 
 (defun sx-site--get-site-list ()
diff --git a/sx.el b/sx.el
index 48a7edc..948b8ae 100644
--- a/sx.el
+++ b/sx.el
@@ -145,6 +145,7 @@ If ALIST doesn't have a `site' property, one is created using the
 
 ;;; Browsing filter
 (defvar sx-browse-filter
+  ;; @TODO: Use `sx-filter-from-nil'
   '((question.body_markdown
      question.comments
      question.answers