Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.www.
wechaty
提交
b277ecbb
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,发现更多精彩内容 >>
提交
b277ecbb
编写于
5月 25, 2018
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactoring FriendRequestPayload to use id instead of the instance
上级
82c5f729
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
21 addition
and
19 deletion
+21
-19
src/friend-request.ts
src/friend-request.ts
+21
-19
未找到文件。
src/friend-request.ts
浏览文件 @
b277ecbb
...
@@ -39,7 +39,7 @@ export enum FriendRequestType {
...
@@ -39,7 +39,7 @@ export enum FriendRequestType {
}
}
export
interface
FriendRequestPayload
{
export
interface
FriendRequestPayload
{
contact
?
:
Contact
,
contact
Id
?
:
string
,
hello
?
:
string
,
hello
?
:
string
,
ticket
?
:
string
ticket
?
:
string
type
?
:
FriendRequestType
,
type
?
:
FriendRequestType
,
...
@@ -69,8 +69,8 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -69,8 +69,8 @@ export class FriendRequest extends PuppetAccessory {
)
)
const
sentRequest
=
new
this
({
const
sentRequest
=
new
this
({
type
:
FriendRequestType
.
Send
,
type
:
FriendRequestType
.
Send
,
contact
,
contact
Id
:
contact
.
id
,
hello
,
hello
,
})
})
...
@@ -85,8 +85,8 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -85,8 +85,8 @@ export class FriendRequest extends PuppetAccessory {
)
)
const
confirmedRequest
=
new
this
({
const
confirmedRequest
=
new
this
({
type
:
FriendRequestType
.
Confirm
,
type
:
FriendRequestType
.
Confirm
,
contact
,
contact
Id
:
contact
.
id
,
})
})
return
confirmedRequest
return
confirmedRequest
...
@@ -104,8 +104,8 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -104,8 +104,8 @@ export class FriendRequest extends PuppetAccessory {
)
)
const
receivedRequest
=
new
this
({
const
receivedRequest
=
new
this
({
type
:
FriendRequestType
.
Receive
,
type
:
FriendRequestType
.
Receive
,
contact
,
contact
Id
:
contact
.
id
,
hello
,
hello
,
ticket
,
ticket
,
})
})
...
@@ -139,15 +139,15 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -139,15 +139,15 @@ export class FriendRequest extends PuppetAccessory {
public
async
send
():
Promise
<
void
>
{
public
async
send
():
Promise
<
void
>
{
if
(
!
this
.
payload
)
{
if
(
!
this
.
payload
)
{
throw
new
Error
(
'
no payload
'
)
throw
new
Error
(
'
no payload
'
)
}
else
if
(
!
this
.
payload
.
contact
)
{
}
else
if
(
!
this
.
payload
.
contact
Id
)
{
throw
new
Error
(
'
no contact
'
)
throw
new
Error
(
'
no contact
'
)
}
else
if
(
this
.
payload
.
type
!==
FriendRequest
.
Type
.
Send
)
{
}
else
if
(
this
.
payload
.
type
!==
FriendRequest
.
Type
.
Send
)
{
throw
new
Error
(
'
not a send request
'
)
throw
new
Error
(
'
not a send request
'
)
}
}
log
.
verbose
(
'
PuppeteerFriendRequest
'
,
'
send() to %s
'
,
this
.
payload
.
contact
)
log
.
verbose
(
'
PuppeteerFriendRequest
'
,
'
send() to %s
'
,
this
.
payload
.
contact
Id
)
await
this
.
puppet
.
friendRequestSend
(
await
this
.
puppet
.
friendRequestSend
(
this
.
payload
.
contact
.
i
d
,
this
.
payload
.
contact
I
d
,
this
.
payload
.
hello
,
this
.
payload
.
hello
,
)
)
}
}
...
@@ -155,16 +155,16 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -155,16 +155,16 @@ export class FriendRequest extends PuppetAccessory {
public
async
accept
():
Promise
<
void
>
{
public
async
accept
():
Promise
<
void
>
{
if
(
!
this
.
payload
)
{
if
(
!
this
.
payload
)
{
throw
new
Error
(
'
no payload
'
)
throw
new
Error
(
'
no payload
'
)
}
else
if
(
!
this
.
payload
.
contact
)
{
}
else
if
(
!
this
.
payload
.
contact
Id
)
{
throw
new
Error
(
'
no contact
'
)
throw
new
Error
(
'
no contact
Id
'
)
}
else
if
(
!
this
.
payload
.
ticket
)
{
}
else
if
(
!
this
.
payload
.
ticket
)
{
throw
new
Error
(
'
no ticket
'
)
throw
new
Error
(
'
no ticket
'
)
}
else
if
(
this
.
payload
.
type
!==
FriendRequest
.
Type
.
Receive
)
{
}
else
if
(
this
.
payload
.
type
!==
FriendRequest
.
Type
.
Receive
)
{
throw
new
Error
(
'
not a receive request, its a
'
+
FriendRequest
.
Type
[
this
.
payload
.
type
!
])
throw
new
Error
(
'
not a receive request, its a
'
+
FriendRequest
.
Type
[
this
.
payload
.
type
!
])
}
}
log
.
verbose
(
'
FriendRequest
'
,
'
accept() to %s
'
,
this
.
payload
.
contact
)
log
.
verbose
(
'
FriendRequest
'
,
'
accept() to %s
'
,
this
.
payload
.
contact
Id
)
await
this
.
puppet
.
friendRequestAccept
(
this
.
payload
.
contact
.
i
d
,
this
.
payload
.
ticket
)
await
this
.
puppet
.
friendRequestAccept
(
this
.
payload
.
contact
I
d
,
this
.
payload
.
ticket
)
const
max
=
20
const
max
=
20
const
backoff
=
300
const
backoff
=
300
...
@@ -202,10 +202,12 @@ export class FriendRequest extends PuppetAccessory {
...
@@ -202,10 +202,12 @@ export class FriendRequest extends PuppetAccessory {
public
contact
():
Contact
{
public
contact
():
Contact
{
if
(
!
this
.
payload
)
{
if
(
!
this
.
payload
)
{
throw
new
Error
(
'
no payload
'
)
throw
new
Error
(
'
no payload
'
)
}
else
if
(
!
this
.
payload
.
contact
)
{
}
else
if
(
!
this
.
payload
.
contact
Id
)
{
throw
new
Error
(
'
no contact
'
)
throw
new
Error
(
'
no contact
'
)
}
}
return
this
.
payload
.
contact
const
contact
=
this
.
puppet
.
Contact
.
load
(
this
.
payload
.
contactId
)
return
contact
}
}
public
async
reject
():
Promise
<
void
>
{
public
async
reject
():
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录