From b32e3148c171a6d9fca15a816bb50b43b383bb27 Mon Sep 17 00:00:00 2001
From: chenjunxue <1523825571@qq.com>
Date: Thu, 20 Aug 2020 14:23:01 +0800
Subject: [PATCH] 2.1.7 mutliQuery接口增加故乡 城市等信息

---
 conf/config.yaml | 4 ++--
 core/monitor.py  | 3 +--
 lib/facebook.py  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 97ce1bf..6e6294a 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -4,5 +4,5 @@ SERVER:
   reconnect_interval: 3
 
 VERSION:
-  code: 106
-  name: 2.1.6
\ No newline at end of file
+  code: 107
+  name: 2.1.7
\ No newline at end of file
diff --git a/core/monitor.py b/core/monitor.py
index 229af1c..e21bc58 100644
--- a/core/monitor.py
+++ b/core/monitor.py
@@ -116,8 +116,7 @@ class Monitor(callback.CallBack):
             return client.info()
         else:
             if user_agent is None or user_agent == '':
-                user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) " \
-                             "Chrome/84.0.4147.105 Safari/537.36"
+                w
             obj = self.onLoggingIn(email, password, cookie, user_agent, proxy)
             try:
                 client = FacebookClient(obj, logout_call=functools.partial(self.logout, obj.email),
diff --git a/lib/facebook.py b/lib/facebook.py
index 69bb4ce..b8dd4fe 100644
--- a/lib/facebook.py
+++ b/lib/facebook.py
@@ -2030,7 +2030,7 @@ class FacebookClient(Client):
         if isinstance(include_fields, list) and include_fields:
             ext_field = "," + ','.join(include_fields)
 
-        sql_tmpl = 'SELECT uid,name,friend_count,sex,current_location,locale,online_presence,birthday_date' + ext_field + ' FROM user WHERE uid = {}'
+        sql_tmpl = 'SELECT uid,name,friend_count,sex,state,city,current_location,locale,online_presence,birthday_date' + ext_field + ' FROM user WHERE uid = {}'
         fql_queries = dict()
         if isinstance(ids, str):  ids = [ids]
 
--
libgit2 0.24.0