Skip to content

Commit

Permalink
增加新功能,修复一个 bug
Browse files Browse the repository at this point in the history
1. 识别红包消息
2. 将特殊账号和最小刷新时间的阈值变成类属性
3. 账号信息获取时查询公众号、服务号和特殊账号
Changes to be committed:
	modified:   weixin.py
  • Loading branch information
sbilly committed Feb 25, 2016
1 parent b707e2e commit ed66700
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions weixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ def __init__(self):
self.lang = 'zh_CN'
self.lastCheckTs = time.time()
self.memberCount = 0
self.SpecialUsers = ['newsapp', 'fmessage', 'filehelper', 'weibo', 'qqmail', 'fmessage', 'tmessage', 'qmessage', 'qqsync', 'floatbottle', 'lbsapp', 'shakeapp', 'medianote', 'qqfriend', 'readerapp', 'blogapp', 'facebookapp', 'masssendapp', 'meishiapp', 'feedsapp', 'voip', 'blogappweixin', 'weixin', 'brandsessionholder', 'weixinreminder', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'officialaccounts', 'notification_messages', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'wxitil', 'userexperience_alarm', 'notification_messages']
self.TimeOut = 20 # 同步最短时间间隔(单位:秒)


opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookielib.CookieJar()))
Expand Down Expand Up @@ -215,7 +217,7 @@ def webwxstatusnotify(self):
return dic['BaseResponse']['Ret'] == 0

def webwxgetcontact(self):
SpecialUsers = ['newsapp', 'fmessage', 'filehelper', 'weibo', 'qqmail', 'fmessage', 'tmessage', 'qmessage', 'qqsync', 'floatbottle', 'lbsapp', 'shakeapp', 'medianote', 'qqfriend', 'readerapp', 'blogapp', 'facebookapp', 'masssendapp', 'meishiapp', 'feedsapp', 'voip', 'blogappweixin', 'weixin', 'brandsessionholder', 'weixinreminder', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'officialaccounts', 'notification_messages', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'wxitil', 'userexperience_alarm', 'notification_messages']
SpecialUsers = self.SpecialUsers
url = self.base_uri + '/webwxgetcontact?pass_ticket=%s&skey=%s&r=%s' % (self.pass_ticket, self.skey, int(time.time()))
dic = self._post(url, {})

Expand Down Expand Up @@ -413,10 +415,20 @@ def getUserRemarkName(self, id):
# 群
name = self.getGroupName(id)
else:
# 特殊账号
for member in self.SpecialUsersList:
if member['UserName'] == id:
name = member['RemarkName'] if member['RemarkName'] else member['NickName']

# 公众号或服务号
for member in self.PublicUsersList:
if member['UserName'] == id:
name = member['RemarkName'] if member['RemarkName'] else member['NickName']

# 直接联系人
for member in self.ContactList:
if member['UserName'] == id:
name = member['RemarkName'] if member['RemarkName'] else member['NickName']
name = member['RemarkName'] if member['RemarkName'] else member['NickName']
# 群友
for member in self.GroupMemeberList:
if member['UserName'] == id:
Expand Down Expand Up @@ -478,8 +490,12 @@ def _showMsg(self, message):
groupName = dstName
dstName = 'GROUP'

# 收到了红包
if content == '收到红包,请在手机上查看': msg['message'] = content

# 指定了消息内容
if 'message' in msg.keys(): content = msg['message']


if groupName != None:
print '%s |%s| %s -> %s: %s' % (message_id, groupName.strip(), srcName.strip(), dstName.strip(), content.replace('<br/>','\n'))
Expand Down

0 comments on commit ed66700

Please sign in to comment.