This commit is contained in:
Haskely
2017-02-21 13:51:18 +08:00
parent 343dcb1c19
commit 28bb790819
+5 -5
View File
@@ -641,24 +641,24 @@ class WebWeixin(object):
for member in self.SpecialUsersList: for member in self.SpecialUsersList:
if member['UserName'] == id: if member['UserName'] == id:
name = member['RemarkName'] if member[ name = member['RemarkName'] if member[
b'RemarkName'] else member['NickName'] 'RemarkName'] else member['NickName']
# 公众号或服务号 # 公众号或服务号
for member in self.PublicUsersList: for member in self.PublicUsersList:
if member['UserName'] == id: if member['UserName'] == id:
name = member['RemarkName'] if member[ name = member['RemarkName'] if member[
b'RemarkName'] else member['NickName'] 'RemarkName'] else member['NickName']
# 直接联系人 # 直接联系人
for member in self.ContactList: for member in self.ContactList:
if member['UserName'] == id: if member['UserName'] == id:
name = member['RemarkName'] if member[ name = member['RemarkName'] if member[
b'RemarkName'] else member['NickName'] 'RemarkName'] else member['NickName']
# 群友 # 群友
for member in self.GroupMemeberList: for member in self.GroupMemeberList:
if member['UserName'] == id: if member['UserName'] == id:
name = member['DisplayName'] if member[ name = member['DisplayName'] if member[
b'DisplayName'] else member['NickName'] 'DisplayName'] else member['NickName']
if name == '未知群' or name == '陌生人': if name == '未知群' or name == '陌生人':
logging.debug(id) logging.debug(id)
@@ -910,7 +910,7 @@ class WebWeixin(object):
def sendMsgToAll(self, word): def sendMsgToAll(self, word):
for contact in self.ContactList: for contact in self.ContactList:
name = contact['RemarkName'] if contact[ name = contact['RemarkName'] if contact[
b'RemarkName'] else contact['NickName'] 'RemarkName'] else contact['NickName']
id = contact['UserName'] id = contact['UserName']
self._echo('-> ' + name + ': ' + word) self._echo('-> ' + name + ': ' + word)
if self.webwxsendmsg(word, id): if self.webwxsendmsg(word, id):