2.3.2

重构异步消息处理类

新增"戳你一下"
新增"打招呼消息"

@@ -4,5 +4,5 @@ SERVER:
  reconnect_interval: 3
  reconnect_interval: 3
 
 
 VERSION:
 VERSION:
- code: 121
- name: 2.3.1
+ code: 122
+ name: 2.3.2

@@ -181,7 +181,7 @@ class CallBack():
  else:
  else:
  if thread_type == ThreadType.GROUP:
  if thread_type == ThreadType.GROUP:
  body['roomSender'] = author_id
  body['roomSender'] = author_id
-
+ print(message_object)
  if message_object.text:
  if message_object.text:
  body['content'] = message_object.text
  body['content'] = message_object.text
  self._notify_(type_="textMsg", client=client, body=body)
  self._notify_(type_="textMsg", client=client, body=body)
@@ -225,6 +225,7 @@ class CallBack():
  self._notify_(type_="stickerMsg", client=client, body=body)
  self._notify_(type_="stickerMsg", client=client, body=body)
  else:
  else:
  print(message_object)
  print(message_object)
+ self.onUnknownMesssageType(client=client, msg=msg)
 
 
  if not self.queue:
  if not self.queue:
  client.markAsDelivered(thread_id, message_object.uid)
  client.markAsDelivered(thread_id, message_object.uid)
@@ -1126,6 +1127,11 @@ class CallBack():
  msg: A full set of the data received
  msg: A full set of the data received
  """
  """
  type_ = msg.get('type')
  type_ = msg.get('type')
+ try:
+ lwa_type = msg['attachments'][0]['mercury']['extensible_attachment']['story_attachment']['target'][
+ 'lwa_type']
+ except:
+ lwa_type = None
 
 
  if type_ == 'jewel_friending_notifs':
  if type_ == 'jewel_friending_notifs':
  self.onFriendConfirmRequest(client)
  self.onFriendConfirmRequest(client)
@@ -1133,6 +1139,8 @@ class CallBack():
  self.onAdminTextMessage(client, msg)
  self.onAdminTextMessage(client, msg)
  elif type_ == 'live_poke':
  elif type_ == 'live_poke':
  self.onLivePoke(client, msg)
  self.onLivePoke(client, msg)
+ elif lwa_type == 'WAVE':
+ self.onWavePoke(client, msg)
  else:
  else:
  log.debug("message : {}".format(msg))
  log.debug("message : {}".format(msg))
 
 
@@ -1186,6 +1194,25 @@ class CallBack():
  }
  }
  self._notify_(type_="systemMsg", client=client, body=body)
  self._notify_(type_="systemMsg", client=client, body=body)
 
 
+ def onWavePoke(self, client, msg):
+ messageMetadata = msg['messageMetadata']
+ attachments = msg['attachments'][0]
+ image = attachments['mercury']['extensible_attachment']['story_attachment']['media']['image']
+ description = attachments['mercury']['extensible_attachment']['story_attachment']['description']
+ title_with_entities = attachments['mercury']['extensible_attachment']['story_attachment']['title_with_entities']
+ body = {
+ 'to': client.uid,
+ 'from': messageMetadata['actorFbId'],
+ 'content': title_with_entities['text'],
+ 'image': image,
+ 'description': description['text'],
+ 'wave_time': messageMetadata['timestamp'],
+ 'type': 'wave_poke',
+ 'class': 'LightweightAction',
+ 'msgId': messageMetadata['messageId']
+ }
+ self._notify_(type_="systemMsg", client=client, body=body)
+
  def onWebNotice(self, client, kwargs):
  def onWebNotice(self, client, kwargs):
  self._notify_(type_="webNotice", client=client, body=kwargs)
  self._notify_(type_="webNotice", client=client, body=kwargs)
  if kwargs['notif_type'] == 'family_request':
  if kwargs['notif_type'] == 'family_request':

@@ -259,4 +259,3 @@ class Executor():
  item['type'] = 'unknown'
  item['type'] = 'unknown'
  list_msg.append(item)
  list_msg.append(item)
  return list_msg
  return list_msg
-

@@ -25,8 +25,6 @@ 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
 from lib.common import College, WorkPlace
 from lib.common import College, WorkPlace
@@ -2028,7 +2026,7 @@ 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)
+ set_id = furl.furl(li.a.attrs['href']).args.get('set', None)
  data = {
  data = {
  'pic_id': pic_id,
  'pic_id': pic_id,
  'set_id': set_id,
  'set_id': set_id,
@@ -2070,7 +2068,7 @@ 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)
+ set_id = furl.furl(li.a.attrs['href']).args.get('set', None)
  data = {
  data = {
  'pic_id': pic_id,
  'pic_id': pic_id,
  'set_id': set_id,
  'set_id': set_id,