Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
920f426a
W
wechaty
项目概览
.www.
/
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,发现更多精彩内容 >>
提交
920f426a
编写于
10月 05, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use UserName: string for FriendRequest args
上级
4e49759a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
26 deletion
+27
-26
src/puppet-web/friend-request.js
src/puppet-web/friend-request.js
+17
-16
src/puppet-web/puppet-web.js
src/puppet-web/puppet-web.js
+10
-10
未找到文件。
src/puppet-web/friend-request.js
浏览文件 @
920f426a
...
...
@@ -18,7 +18,6 @@
const
Wechaty
=
require
(
'
../wechaty
'
)
const
Config
=
require
(
'
../config
'
)
const
Contact
=
require
(
'
../contact
'
)
const
FriendRequest
=
require
(
'
../friend-request
'
)
const
log
=
require
(
'
../brolog-env
'
)
...
...
@@ -47,44 +46,46 @@ class PuppetWebFriendRequest extends FriendRequest {
}
this
.
type
=
'
receive
'
return
this
}
confirm
(
contact
)
{
log
.
verbose
(
'
PuppetWebFriendRequest
'
,
'
confirm(%s)
'
,
contact
)
confirm
(
contact
Id
)
{
log
.
verbose
(
'
PuppetWebFriendRequest
'
,
'
confirm(%s)
'
,
contact
Id
)
if
(
!
contact
instanceof
Contact
)
{
contact
=
Contact
.
load
(
contact
)
if
(
!
contact
Id
)
{
throw
new
Error
(
'
contactId not found
'
)
}
this
.
contact
=
contact
this
.
type
=
'
confirm
'
this
.
contact
Id
=
contactId
this
.
type
=
'
confirm
'
}
send
(
contact
,
hello
=
'
Hi
'
)
{
log
.
verbose
(
'
PuppetWebFriendRequest
'
,
'
send(%s)
'
,
contact
)
send
(
contact
Id
,
hello
=
'
Hi
'
)
{
log
.
verbose
(
'
PuppetWebFriendRequest
'
,
'
send(%s)
'
,
contact
Id
)
if
(
!
contact
instanceof
Contact
)
{
contact
=
Contact
.
load
(
contact
)
if
(
!
contact
Id
)
{
throw
new
Error
(
'
contactId not found
'
)
}
this
.
contact
=
contact
this
.
type
=
'
send
'
this
.
contact
Id
=
contactId
this
.
type
=
'
send
'
if
(
hello
)
{
this
.
hello
=
hello
}
return
Config
.
puppetInstance
()
.
friendRequestSend
(
contact
,
hello
)
.
friendRequestSend
(
contact
Id
,
hello
)
}
accept
()
{
log
.
verbose
(
'
FriendRequest
'
,
'
accept() %s
'
,
this
.
contact
)
log
.
verbose
(
'
FriendRequest
'
,
'
accept() %s
'
,
this
.
contact
Id
)
if
(
this
.
type
!==
'
receive
'
)
{
throw
new
Error
(
'
request on a
'
+
this
.
type
+
'
type
'
)
}
return
Config
.
puppetInstance
()
.
friendRequestAccept
(
this
.
contact
,
this
.
ticket
)
.
friendRequestAccept
(
this
.
contact
Id
,
this
.
ticket
)
}
}
...
...
src/puppet-web/puppet-web.js
浏览文件 @
920f426a
...
...
@@ -421,34 +421,34 @@ class PuppetWeb extends Puppet {
/**
* FriendRequest
*/
friendRequestSend
(
contact
,
message
)
{
friendRequestSend
(
contact
Id
,
message
)
{
if
(
!
this
.
bridge
)
{
return
Promise
.
reject
(
new
Error
(
'
fail: no bridge(yet)!
'
))
}
if
(
!
contact
||
!
contact
instanceof
Contact
)
{
throw
new
Error
(
'
contact not found
'
)
if
(
!
contact
Id
)
{
throw
new
Error
(
'
contact
Id
not found
'
)
}
return
this
.
bridge
.
verifyUserRequest
(
contact
.
i
d
,
message
)
return
this
.
bridge
.
verifyUserRequest
(
contact
I
d
,
message
)
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWeb
'
,
'
friendRequestSend(%s, %s) rejected: %s
'
,
contact
,
message
,
e
.
message
)
log
.
warn
(
'
PuppetWeb
'
,
'
friendRequestSend(%s, %s) rejected: %s
'
,
contact
Id
,
message
,
e
.
message
)
throw
e
})
}
friendRequestAccept
(
contact
,
ticket
)
{
friendRequestAccept
(
contact
Id
,
ticket
)
{
if
(
!
this
.
bridge
)
{
return
Promise
.
reject
(
new
Error
(
'
fail: no bridge(yet)!
'
))
}
if
(
!
contact
||
!
contact
instanceof
Contact
||
!
ticket
)
{
throw
new
Error
(
'
contact or ticket not found
'
)
if
(
!
contact
Id
||
!
ticket
)
{
throw
new
Error
(
'
contact
Id
or ticket not found
'
)
}
return
this
.
bridge
.
verifyUserOk
(
contact
.
i
d
,
ticket
)
return
this
.
bridge
.
verifyUserOk
(
contact
I
d
,
ticket
)
.
catch
(
e
=>
{
log
.
warn
(
'
PuppetWeb
'
,
'
friendRequestAccept(%s, %s) rejected: %s
'
,
contact
,
ticket
,
e
.
message
)
log
.
warn
(
'
PuppetWeb
'
,
'
friendRequestAccept(%s, %s) rejected: %s
'
,
contact
Id
,
ticket
,
e
.
message
)
throw
e
})
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录