Skip to content

Commit d5633e9

Browse files
committed
Merge branch 'fix'
2 parents d21db81 + e6abfd6 commit d5633e9

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/content_scripts/FilesDownloader.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,18 @@ class FilesDownloader extends Event {
7171

7272
/**
7373
* Download files via giving indexes.
74-
* @param {{ indexes: number[], getFilenameFunc: ?Function, extra: ?any }} param
74+
* @param {{ indexes: number[], getFilenameFunc: ?Function, extra: ?any, downloaderRequestOptions: ?any }} param
7575
* @param {*} that
7676
* @returns {DownloadedFile[]}
7777
*/
78-
downloadFiles({ indexes, getFilenameFunc = null, extra = {} }, that) {
78+
downloadFiles({ indexes, getFilenameFunc = null, extra = {}, downloaderRequestOptions = {} }, that) {
7979
return new Promise((resolve, reject) => {
8080
let files = [],
8181
filesNeedDownload = [],
82-
downloader = new Downloader({ processors: this.processors });
82+
downloader = new Downloader({
83+
processors: this.processors,
84+
requestOptions: downloaderRequestOptions
85+
});
8386

8487
downloader.asBlob = false;
8588

src/fanbox/content_scripts/App.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,12 @@ export default {
178178
pos++;
179179
}
180180
181-
post.downloadFiles({ indexes }, post).then(files => {
181+
post.downloadFiles({
182+
indexes,
183+
downloaderRequestOptions: {
184+
credentials: 'include'
185+
}
186+
}, post).then(files => {
182187
post.getPackedFile({ files }).then(result => {
183188
this.lastData = result.data;
184189
this.lastFilename = result.filename;

src/fanbox/modules/PostAdapter.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default class PostAdapter {
3333
this.creatorId = null;
3434
this.postId = null;
3535
this.context = {
36+
illustId: null,
3637
creatorId: null,
3738
userId: null,
3839
userName: null,
@@ -79,6 +80,7 @@ export default class PostAdapter {
7980

8081
let dateFormatter = new DateFormatter(jsonData.body.publishedDatetime);
8182

83+
this.context.illustId = jsonData.body.id;
8284
this.context.userId = jsonData.body.user.userId;
8385
this.context.userName = jsonData.body.user.name;
8486
this.context.postTitle = jsonData.body.title;

0 commit comments

Comments
 (0)