diff --git a/conf/config.yaml b/conf/config.yaml index 6fea03c..0f81660 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -5,5 +5,5 @@ SERVER: control: http://fbchat.xyz:39002/api/terminal mark: ntkj VERSION: - code: 520 - name: 5.2.0 \ No newline at end of file + code: 521 + name: 5.2.1 \ No newline at end of file diff --git a/db/models.py b/db/models.py index 44368c3..acf7178 100644 --- a/db/models.py +++ b/db/models.py @@ -17,8 +17,14 @@ engine = create_engine('sqlite:///{}'.format(os.path.join(user_db_path, "userlis poolclass=SingletonThreadPool, connect_args={'check_same_thread': False}) -Session = sessionmaker(bind=engine) -session = Session() + +def NewSession(): + DbSession = sessionmaker(bind=engine) + session = DbSession() + return session + + +session = NewSession() class Config(Base): diff --git a/lib/facebook.py b/lib/facebook.py index c6bfb2f..3b4c6a1 100644 --- a/lib/facebook.py +++ b/lib/facebook.py @@ -750,7 +750,7 @@ class FacebookClient(Client): def FriendingCometPYMKPanelPaginationQuery(self, cursor: str = '', details: bool = False): """获取推荐好友新""" - variables = {"count": 30, "location": "FRIENDS_CENTER", "scale": 2} + variables = {"count": 30, "location": "FRIENDS_CENTER", "scale": 1} if cursor: variables.update({'cursor': cursor}) res = self.graphql_api('FriendingCometPYMKPanelPaginationQuery', '3364519643627555', variables) @@ -2142,7 +2142,7 @@ class FacebookClient(Client): # search 搜索好友取消 var = {"input": {"cancelled_friend_requestee_id": friend_requester_id, "source": source, "actor_id": self.uid, "client_mutation_id": self.get_client_mutation_id()}, - "scale": 2} + "scale": 1} res = self.graphql_api('FriendingCometFriendRequestCancelMutation', '3226051994092510', var) return self.f_res(res) # try: @@ -2201,7 +2201,7 @@ class FacebookClient(Client): var = { "input": {"friend_requestee_ids": ids, "refs": [None], "source": source, "actor_id": self.uid, - "client_mutation_id": self.get_client_mutation_id()}, "scale": 2} + "client_mutation_id": self.get_client_mutation_id()}, "scale": 1} if source in source_list.keys(): var['input']['people_you_may_know_location'] = source_list[source] # proxy = '161.117.81.181:24000' @@ -2210,7 +2210,7 @@ class FacebookClient(Client): # "https": "http://%(proxy)s" % {'proxy': proxy} # } # res = self._post_graphql_api_proxy('FriendingCometFriendRequestSendMutation', '3384847541611194', var,proxies) - res = self.graphql_api('FriendingCometFriendRequestSendMutation', '3423207681122092', var) + res = self.graphql_api('FriendingCometFriendRequestSendMutation', '5115554325182722', var) res = self.res_deal(res) try: # 数据太大需要处理简化 @@ -4217,9 +4217,9 @@ class FacebookClient(Client): 'server_timestamps': True, 'doc_id': doc_id, 'dpr': 2, - 'fb_api_analytics_tags': ['qpl_active_flow_ids=30605361'], - '__csr': 'gtYh4RfqflcneQyiiPsgIvkRbGCLLiyd9khiQVtaGWHVkFUzyGllmGhlYzGjC8J4h6J4rJGcGXyaBAGiaBiDFaHF4zaqmF5ByrypKinariK9LAK9AAC8WKVGxih5Hz4EjyF9agG8y8hCGaxq8UyXGexa6bxuuLh8oyECmp5zVEhwVDxeqVoK4pWiz9-dzopDw_nK9Axi1JBxe5Esx52rSuUW2Sax528twNAwAwIFogg9E5m9hUswRw-wwz9oS324ongfo4K1RU0bJ804zGfwl80pKAwywrpomwOzoeo114cwmEdUkwNzEdbzpm0jRG1T4KcgCmsE2hG6A7u09Uo0BS0um3y1bw', - '__dyn': '7AzHxqU5a5Q2m3mbG2KnFw9uu2i5U4e0yoW3q322aewXwnEbotwp8O2S1DwUx609vCxS320om78-0BE88427Uy11xmfz83WwgEcHzoaEaoG0Boy1PwBgK7qxS18wc61uwPyoox22K263ifK6E7e58jwGzEaE766Fobrxu5Elxm3y2K5ojUlDw-wUws8SEmwHwLw' + # 'fb_api_analytics_tags': ['qpl_active_flow_ids=30605361'], + '__csr': 'gacan6hcr2spifn2fiuD6insIOkj9uPiRl9YYRR7jsDYPXIINabmnbFlKJKAyu_ahsCVHHbSA_kADFsx2d4FiKWGmFKBKDKWhrlaHFaiAmWXThqKrHy9i6Vi4CKWXh27wwCALBVbdluB-8JUyhfiK8hUCaHghJBxnzoBehaF8F6BzbLDiDGeuexlGQiVr-tabADAGUShy8gGq2CAuil4Z1ycxyCidK1aydoLgy9y_zpUS266AWKibhXVFEqp8C44UkxmqdG9K8QczUtgFpp8-i8xulVESGgde2Dx2V8CUjhQi68N1S5Au4Gwh9oN1-3uEkxqUK2K2C68jxmq6UK4U1mK09Gg05xa16w1Tdw7izU2Og9zwDG7EJU6e3u0f_g3uw8W1zwSyt1yfwOzoK2uF8oxpa8P3d0NwhErxRwXw4AAx98BF0j8eo2ywsEWdDg45wmET81bBw1lxw2lo0jSw', + '__dyn': '7AzHxqU5a5Q2m3m8GEnxenFw9uu2i5U4e1NyUJ3odEc88EW0CEboG4E6icwJwpUe8hw2nVEtwMw65xOfwwwto88427Uy11xmfz83WwgEcHzoaEaoG0Boy1PwBgK7qxS18wc61axe3e9xy48aU8od8-UqwsUkxe2GewGwkUtxGm2SUnxq5olwUwHxm4-5pUfEdbws9o8oy5oO2-3a0BFo-' } if is_mutli_json: return self._post_multi('/api/graphql/', data)