Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46011646
wechaty
提交
ad87decd
W
wechaty
项目概览
weixin_46011646
/
wechaty
与 Fork 源项目一致
Fork自
wechaty / wechaty
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wechaty
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad87decd
编写于
10月 06, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#32 Room Event: `join` & `leave`
上级
12a81eb8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
75 addition
and
55 deletion
+75
-55
src/puppet-web/event.js
src/puppet-web/event.js
+46
-42
src/puppet-web/firer.js
src/puppet-web/firer.js
+23
-13
src/room.js
src/room.js
+6
-0
未找到文件。
src/puppet-web/event.js
浏览文件 @
ad87decd
...
...
@@ -336,52 +336,56 @@ function onServerLogout(data) {
function
onServerMessage
(
data
)
{
let
m
=
new
Message
(
data
)
/**
* Fire Events if match message type & content
*/
switch
(
m
.
type
())
{
// data.MsgType
case
Message
.
Type
.
VERIFYMSG
:
Firer
.
fireFriendRequest
.
call
(
this
,
m
)
break
case
Message
.
Type
.
SYS
:
if
(
m
.
room
())
{
Firer
.
fireRoomJoin
.
call
(
this
,
m
)
Firer
.
fireRoomLeave
.
call
(
this
,
m
)
}
else
{
Firer
.
fireFriendConfirm
.
call
(
this
,
m
)
}
break
}
/**
* Check Type for special Message
* reload if needed
*/
switch
(
m
.
type
())
{
case
Message
.
Type
.
IMAGE
:
// log.verbose('PuppetWebEvent', 'onServerMessage() IMAGE message')
m
=
new
MediaMessage
(
data
)
break
}
co
.
call
(
this
,
function
*
()
{
yield
m
.
ready
()
// To Be Deleted: set self...
if
(
this
.
userId
)
{
m
.
set
(
'
self
'
,
this
.
userId
)
}
else
{
log
.
warn
(
'
PuppetWebEvent
'
,
'
onServerMessage() without this.userId
'
)
}
/**
* Fire Events if match message type & content
*/
switch
(
m
.
type
())
{
// data.MsgType
case
Message
.
Type
.
VERIFYMSG
:
Firer
.
fireFriendRequest
.
call
(
this
,
m
)
break
case
Message
.
Type
.
SYS
:
if
(
m
.
room
())
{
Firer
.
fireRoomJoin
.
call
(
this
,
m
)
Firer
.
fireRoomLeave
.
call
(
this
,
m
)
}
else
{
Firer
.
fireFriendConfirm
.
call
(
this
,
m
)
}
break
}
m
.
ready
()
// TODO: EventEmitter2 for video/audio/app/sys....
.
then
(
_
=>
this
.
emit
(
'
message
'
,
m
))
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWebEvent
'
,
'
onServerMessage() message ready exception: %s
'
,
e
)
// console.log(e)
/**
*
FIXME: add retry here...
*
setTimeout(onServerMessage.bind(this, data, ++attempt), 1000)
*
Check Type for special Message
*
reload if needed
*/
switch
(
m
.
type
())
{
case
Message
.
Type
.
IMAGE
:
// log.verbose('PuppetWebEvent', 'onServerMessage() IMAGE message')
m
=
new
MediaMessage
(
data
)
break
}
// To Be Deleted: set self...
if
(
this
.
userId
)
{
m
.
set
(
'
self
'
,
this
.
userId
)
}
else
{
log
.
warn
(
'
PuppetWebEvent
'
,
'
onServerMessage() without this.userId
'
)
}
m
.
ready
()
// TODO: EventEmitter2 for video/audio/app/sys....
.
then
(
_
=>
this
.
emit
(
'
message
'
,
m
))
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWebEvent
'
,
'
onServerMessage() message ready exception: %s
'
,
e
)
// console.log(e)
/**
* FIXME: add retry here...
* setTimeout(onServerMessage.bind(this, data, ++attempt), 1000)
*/
})
})
}
...
...
src/puppet-web/firer.js
浏览文件 @
ad87decd
...
...
@@ -115,19 +115,27 @@ function fireRoomJoin(m) {
let
inviterContact
,
inviteeContact
if
(
inviter
===
"
You've
"
)
{
inviterContact
=
Contact
.
load
(
this
.
userId
)
}
else
{
inviterContact
=
room
.
member
(
inviter
)
}
inviteeContact
=
room
.
member
(
invitee
)
if
(
!
inviterContact
||
!
inviteeContact
)
{
log
.
error
(
'
PuppetWebEvent
'
,
'
inivter or invitee not found for %s, %s
'
,
inviter
,
invitee
)
return
}
room
.
emit
(
'
join
'
,
inviteeContact
,
inviterContact
)
co
.
call
(
this
,
function
*
()
{
yield
room
.
refresh
()
yield
new
Promise
(
resolve
=>
{
setTimeout
(
_
=>
resolve
(),
1000
)
})
if
(
inviter
===
"
You've
"
)
{
inviterContact
=
Contact
.
load
(
this
.
userId
)
}
else
{
inviterContact
=
room
.
member
(
inviter
)
}
inviteeContact
=
room
.
member
(
invitee
)
if
(
!
inviterContact
||
!
inviteeContact
)
{
log
.
error
(
'
PuppetWebEvent
'
,
'
inivter or invitee not found for %s, %s
'
,
inviter
.
name
(),
invitee
.
name
())
return
}
room
.
emit
(
'
join
'
,
inviteeContact
,
inviterContact
)
})
}
function
checkRoomLeave
(
content
)
{
...
...
@@ -151,6 +159,7 @@ function fireRoomLeave(m) {
}
const
room
=
m
.
room
()
leaverContact
=
room
.
member
(
leaver
)
if
(
!
leaverContact
)
{
...
...
@@ -158,6 +167,7 @@ function fireRoomLeave(m) {
return
}
room
.
emit
(
'
leave
'
,
leaverContact
)
room
.
refresh
()
}
module
.
exports
=
PuppetWebFirer
src/room.js
浏览文件 @
ad87decd
...
...
@@ -214,12 +214,18 @@ class Room extends EventEmitter{
}
member
(
name
)
{
log
.
verbose
(
'
Room
'
,
'
member(%s)
'
,
name
)
if
(
!
this
.
obj
.
memberList
)
{
log
.
warn
(
'
Room
'
,
'
member() not ready
'
)
return
null
}
const
nickMap
=
this
.
obj
.
nickMap
const
idList
=
Object
.
keys
(
nickMap
)
.
filter
(
k
=>
nickMap
[
k
]
===
name
)
log
.
silly
(
'
Room
'
,
'
member() check nickMap: %s
'
,
JSON
.
stringify
(
nickMap
))
if
(
idList
.
length
)
{
return
Contact
.
load
(
idList
[
0
])
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录