2.2.7

增加'我的照片翻页获取'，'删除照片'接口

@@ -4,5 +4,5 @@ SERVER:
  reconnect_interval: 3
  reconnect_interval: 3
 
 
 VERSION:
 VERSION:
- code: 116
- name: 2.2.6
+ code: 117
+ name: 2.2.7

@@ -25,6 +25,7 @@ import retrying
 from bs4 import BeautifulSoup
 from bs4 import BeautifulSoup
 from fbchat import (Client, FBchatException, FBchatUserError, Message, Sticker,
 from fbchat import (Client, FBchatException, FBchatUserError, Message, Sticker,
  ThreadType, _exception, _graphql, _util, log)
  ThreadType, _exception, _graphql, _util, log)
+from furl import furl
 
 
 from lib import common, download, google_map, graph
 from lib import common, download, google_map, graph
 from lib._mqtt import MqttClient
 from lib._mqtt import MqttClient
@@ -2025,8 +2026,10 @@ class FacebookClient(Client):
  pic_id = li.attrs.get('data-fbid', None)
  pic_id = li.attrs.get('data-fbid', None)
  url = li.attrs.get('data-starred-src', None)
  url = li.attrs.get('data-starred-src', None)
  label = li.a.attrs.get('aria-label', None)
  label = li.a.attrs.get('aria-label', None)
+ set_id = furl(li.a.attrs['href']).args.get('set', None)
  data = {
  data = {
  'pic_id': pic_id,
  'pic_id': pic_id,
+ 'set_id': set_id,
  'url': url,
  'url': url,
  'label': label
  'label': label
  }
  }
@@ -2039,7 +2042,7 @@ class FacebookClient(Client):
  else:
  else:
  num_list = cache.get(f'{self.email}:AllPhotosAppCollectionPagelet')
  num_list = cache.get(f'{self.email}:AllPhotosAppCollectionPagelet')
  pagelet_token = cache.get(f'{self.email}:AllPhotosAppCollectionPagelet:pagelet_token')
  pagelet_token = cache.get(f'{self.email}:AllPhotosAppCollectionPagelet:pagelet_token')
- assert num_list is not None, '游标失效，请重新获取首页游标。'
+ assert num_list is not None, 'cursor失效。'
  get_data = {"collection_token": f"{num_list[0]}:{num_list[1]}:{num_list[2]}",
  get_data = {"collection_token": f"{num_list[0]}:{num_list[1]}:{num_list[2]}",
  "cursor": cursor,
  "cursor": cursor,
  "disablepager": False, "overview": False, "profile_id": num_list[0],
  "disablepager": False, "overview": False, "profile_id": num_list[0],
@@ -2058,15 +2061,17 @@ class FacebookClient(Client):
  f = self._state._get(url, {})
  f = self._state._get(url, {})
  except Exception as err:
  except Exception as err:
  print(err)
  print(err)
- soup = BeautifulSoup(f, 'lxml')
+ soup = BeautifulSoup(f['payload'], 'lxml')
  lis = soup.find_all("li", {"class": "fbPhotoStarGridElement"})
  lis = soup.find_all("li", {"class": "fbPhotoStarGridElement"})
  data_list = list()
  data_list = list()
  for li in lis:
  for li in lis:
  pic_id = li.attrs.get('data-fbid', None)
  pic_id = li.attrs.get('data-fbid', None)
  url = li.attrs.get('data-starred-src', None)
  url = li.attrs.get('data-starred-src', None)
  label = li.a.attrs.get('aria-label', None)
  label = li.a.attrs.get('aria-label', None)
+ set_id = furl(li.a.attrs['href']).args.get('set', None)
  data = {
  data = {
  'pic_id': pic_id,
  'pic_id': pic_id,
+ 'set_id': set_id,
  'url': url,
  'url': url,
  'label': label
  'label': label
  }
  }
@@ -2077,6 +2082,28 @@ class FacebookClient(Client):
  }
  }
  return res
  return res
 
 
+ def delete_dialog(self, pic_id, set_id):
+ """
+ 删除照片
+ """
+ data = {
+ 'fbid': pic_id,
+ 'version': '9',
+ 'set': set_id,
+ 'next': '3143051995809753',
+ 'dpr': '2',
+ 'fb_dtsg': self._state.fb_dtsg_ag,
+ 'jazoest': self._state.jazoest,
+ 'confirmed': 1
+ }
+
+ url = '/ajax/photos/photo/delete/dialog.php'
+ try:
+ res = self._post(url, data)
+ return {"success": True}
+ except:
+ return {"success": False}
+
  ###############graph接口 start ##############
  ###############graph接口 start ##############
 
 
  def checkVaild(self):
  def checkVaild(self):