Skip to content

Commit 884e5ef

Browse files
committed
fix missing cookie
1 parent 7282b0d commit 884e5ef

9 files changed

Lines changed: 28 additions & 17 deletions

File tree

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/IArticleApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ Task<BiliApiResponse> AddCoinForArticleAsync(
5353
)]
5454
[Header("Origin", "https://www.bilibili.com")]
5555
[HttpPost("/x/article/like?id={cvid}&type=1&csrf={csrf}")]
56-
Task<BiliApiResponse> LikeAsync(long cvid, string csrf);
56+
Task<BiliApiResponse> LikeAsync(long cvid, string csrf, [Header("Cookie")] string ck);
5757
}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/ILiveApi.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ Task<BiliApiResponse<Silver2CoinResponse>> Silver2Coin(
6666
//[Header("Referer", "https://link.bilibili.com/p/center/index?visit_id=1ddo4yl01q00")]
6767
[Header("Origin", "https://link.bilibili.com")]
6868
[HttpGet("/xlive/revenue/v1/wallet/getStatus")]
69-
Task<BiliApiResponse<LiveWalletStatusResponse>> GetLiveWalletStatus();
69+
Task<BiliApiResponse<LiveWalletStatusResponse>> GetLiveWalletStatus(
70+
[Header("Cookie")] string ck
71+
);
7072

7173
[HttpGet("/xlive/web-interface/v1/index/getWebAreaList?source_id=2")]
7274
Task<BiliApiResponse<GetArteaListResponse>> GetAreaList([Header("Cookie")] string ck);
@@ -112,7 +114,10 @@ Task<BiliApiResponse<CheckTianXuanDto>> CheckTianXuan(
112114
/// <param name="request"></param>
113115
/// <returns></returns>
114116
[HttpPost("/xlive/lottery-interface/v1/Anchor/Join")]
115-
Task<BiliApiResponse<JoinTianXuanResponse>> Join([FormContent] JoinTianXuanRequest request);
117+
Task<BiliApiResponse<JoinTianXuanResponse>> Join(
118+
[FormContent] JoinTianXuanRequest request,
119+
[Header("Cookie")] string ck
120+
);
116121

117122
/// <summary>
118123
/// 获取用户的粉丝勋章

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Interfaces/IVipBigPointApi.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ Task<BiliApiResponse> CompleteV2(
8484
/// <param name="request"></param>
8585
/// <returns></returns>
8686
[HttpPost("/pgc/activity/deliver/task/complete")]
87-
Task<BiliApiResponse> ViewComplete([FormContent] ViewRequest request);
87+
Task<BiliApiResponse> ViewComplete(
88+
[FormContent] ViewRequest request,
89+
[Header("Cookie")] string ck
90+
);
8891

8992
[HttpGet("/x/vip/privilege/my")]
9093
Task<BiliApiResponse<VouchersInfoResponse>> GetVouchersInfoAsync([Header("Cookie")] string ck);

src/Ray.BiliBiliTool.Application/VipBigPointAppService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ private async Task ViewAnimate(BiliCookie ck)
323323
}
324324

325325
logger.LogInformation("开始完成任务");
326-
var re = await CompleteView(code);
326+
var re = await CompleteView(code, ck);
327327

328328
//确认
329329
if (re)
@@ -533,13 +533,13 @@ private async Task<bool> CompleteV2(string taskCode, BiliCookie ck)
533533
}
534534
}
535535

536-
private async Task<bool> CompleteView(string code)
536+
private async Task<bool> CompleteView(string code, BiliCookie ck)
537537
{
538538
logger.LogInformation("开始浏览");
539539
await Task.Delay(10 * 1000);
540540

541541
var request = new ViewRequest(code);
542-
var re = await vipApi.ViewComplete(request);
542+
var re = await vipApi.ViewComplete(request, ck.ToString());
543543
if (re.Code == 0)
544544
{
545545
logger.LogInformation("浏览完成");

src/Ray.BiliBiliTool.DomainService/AccountDomainService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public async Task UnfollowBatched(BiliCookie ck)
181181
tagId
182182
);
183183
var modifyReq = new ModifyRelationRequest(info.Mid, ck.BiliJct);
184-
var re = await relationApi.ModifyRelation(modifyReq, modifyReferer);
184+
var re = await relationApi.ModifyRelation(modifyReq, ck.ToString(), modifyReferer);
185185

186186
if (re.Code == 0)
187187
{
@@ -207,10 +207,10 @@ public async Task UnfollowBatched(BiliCookie ck)
207207
/// </summary>
208208
/// <param name="groupName"></param>
209209
/// <returns></returns>
210-
private async Task<TagDto> GetTag(string groupName, BiliCookie cookie)
210+
private async Task<TagDto> GetTag(string groupName, BiliCookie ck)
211211
{
212-
string getTagsReferer = string.Format(RelationApiConstant.GetTagsReferer, cookie.UserId);
213-
List<TagDto> tagList = (await relationApi.GetTags(getTagsReferer)).Data;
212+
string getTagsReferer = string.Format(RelationApiConstant.GetTagsReferer, ck.UserId);
213+
List<TagDto> tagList = (await relationApi.GetTags(getTagsReferer, ck.ToString())).Data;
214214
TagDto tag = tagList.FirstOrDefault(x => x.Name == groupName);
215215
return tag;
216216
}

src/Ray.BiliBiliTool.DomainService/ArticleDomainService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ IWbiService wbiService
3939

4040
public async Task LikeArticle(long cvid, BiliCookie ck)
4141
{
42-
await articleApi.LikeAsync(cvid, ck.BiliJct);
42+
await articleApi.LikeAsync(cvid, ck.BiliJct, ck.ToString());
4343
}
4444

4545
/// <summary>
@@ -121,6 +121,7 @@ public async Task<bool> AddCoinForArticle(long cvid, long mid, BiliCookie ck)
121121
$"https://www.bilibili.com/read/cv{cvid}/?from=search&spm_id_from=333.337.0.0";
122122
result = await articleApi.AddCoinForArticleAsync(
123123
new AddCoinForArticleRequest(cvid, mid, ck.BiliJct),
124+
ck.ToString(),
124125
refer
125126
);
126127
}

src/Ray.BiliBiliTool.DomainService/LiveDomainService.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ public async Task<bool> ExchangeSilver2Coin(BiliCookie ck)
100100
return false;
101101
}
102102

103-
BiliApiResponse<LiveWalletStatusResponse> queryStatus = await liveApi.GetLiveWalletStatus();
103+
BiliApiResponse<LiveWalletStatusResponse> queryStatus = await liveApi.GetLiveWalletStatus(
104+
ck.ToString()
105+
);
104106
logger.LogInformation("【银瓜子余额】 {silver}", queryStatus.Data.Silver);
105107
logger.LogInformation("【硬币余额】 {coin}", queryStatus.Data.Coin);
106108
logger.LogInformation("【今日剩余兑换次数】 {left}", queryStatus.Data.Silver_2_coin_left);
@@ -259,7 +261,7 @@ await liveApi.CheckTianXuan(target.Roomid, ck.ToString())
259261
Gift_num = check.Gift_num,
260262
Csrf = ck.BiliJct,
261263
};
262-
var re = await liveApi.Join(request);
264+
var re = await liveApi.Join(request, ck.ToString());
263265
if (re.Code == 0)
264266
{
265267
logger.LogInformation("【抽奖】成功 √" + Environment.NewLine);
@@ -316,7 +318,7 @@ public async Task GroupFollowing(BiliCookie ck)
316318
targetGroupId.ToString(),
317319
ck.BiliJct
318320
);
319-
var re = await relationApi.CopyUpsToGroup(req, referer);
321+
var re = await relationApi.CopyUpsToGroup(req, ck.ToString(), referer);
320322

321323
if (re.Code == 0)
322324
{

test/Ray.BiliBiliTool.Agent.FunctionalTests/ArticleApiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public async Task LikeAsync_AlreadyLike_GetResultSuccess()
132132
var cvid = 34150576;
133133

134134
// Act
135-
var re = await _api.LikeAsync(cvid, _ck.BiliJct);
135+
var re = await _api.LikeAsync(cvid, _ck.BiliJct, null);
136136

137137
// Assert
138138
re.Code.Should()

test/Ray.BiliBiliTool.Agent.FunctionalTests/LiveApiTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void GetLiveWalletStatus_Normal_Success()
7676
var ck = scope.ServiceProvider.GetRequiredService<CookieStrFactory<BiliCookie>>();
7777
var api = scope.ServiceProvider.GetRequiredService<ILiveApi>();
7878

79-
BiliApiResponse<LiveWalletStatusResponse> re = api.GetLiveWalletStatus().Result;
79+
BiliApiResponse<LiveWalletStatusResponse> re = api.GetLiveWalletStatus(null).Result;
8080

8181
if (ck.Count > 0)
8282
{

0 commit comments

Comments
 (0)