Skip to content

Fix invalidjson error for Wikitext: Get preview (and other commands) #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
David-Gilman wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

Fix invalidjson error for Wikitext: Get preview (and other commands) #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/export_command/wikimedia_function/bot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
apiUrl: config.get("transferProtocol") as string + config.get('host') + config.get("apiPath")
});
// TODO:
const response: any = await bot.login(userInfo);

Check warning on line 59 in src/export_command/wikimedia_function/bot.ts

View workflow job for this annotation

GitHub Actions / Build and Test (24) 

Unexpected any. Specify a different type
if (response.result === 'Success') {
vscode.window.showInformationMessage(`User "${response.lgusername}"(UserID:"${response.lguserid}") Login Result is "${response.result}". Login Token is "${response.token}".`
);
Expand Down Expand Up @@ -131,8 +131,8 @@
meta: Meta.siteInfo,
};

const result: unknown = await tBot.request(args, { method: 'GET' });
const result: unknown = await tBot.request(args);
const re: any = result as any;

Check warning on line 135 in src/export_command/wikimedia_function/bot.ts

View workflow job for this annotation

GitHub Actions / Build and Test (24) 

Unexpected any. Specify a different type

Check warning on line 135 in src/export_command/wikimedia_function/bot.ts

View workflow job for this annotation

GitHub Actions / Build and Test (24) 

Unexpected any. Specify a different type
// TODO: cast

const generator: string = re.query.general.generator;
Expand Down
8 changes: 4 additions & 4 deletions src/export_command/wikimedia_function/page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
meta: 'tokens',
type: 'csrf'
};
const result: unknown = await bot.request(args, { method: 'GET' });
const result: unknown = await bot.request(args);
const reNew: TokensResult = TokensConvert.toResult(result);
const token: string | undefined = reNew.query?.tokens?.csrftoken;
if (token) {
Expand All @@ -47,7 +47,7 @@
action: "tokens",
type: "edit"
};
const result: unknown = await bot.request(args, { method: 'GET' });
const result: unknown = await bot.request(args);
const reOld: OldTokensResult = OldTokensConvert.toResult(result);
const token: string | undefined = reOld.tokens?.edittoken;
if (token) {
Expand Down Expand Up @@ -120,7 +120,7 @@
// if (config.get("redirect")) {
// args['redirect'] = "true";
// }
const result: any = await tBot.request(args, { method: 'POST' });

Check warning on line 123 in src/export_command/wikimedia_function/page.ts

View workflow job for this annotation

GitHub Actions / Build and Test (24) 

Unexpected any. Specify a different type
// TODO: Convert
if (result.edit.nochange !== undefined) {
vscode.window.showWarningMessage(
Expand Down Expand Up @@ -253,7 +253,7 @@
const barMessage: vscode.Disposable = vscode.window.setStatusBarMessage("Wikitext: Getting code...");
try {
// get request result
const result: unknown = await tBot.request(args, { method: 'GET' });
const result: unknown = await tBot.request(args);
// console.log(result);
// Convert result as class
const re: ReadPageResult = ReadPageConvert.toResult(result);
Expand Down Expand Up @@ -361,7 +361,7 @@

const tagList: (number | string)[] = [];
for (; ;) {
const result: unknown = await tBot.request(args, { method: 'GET' });
const result: unknown = await tBot.request(args);
const re: TagsResult = TagsConvert.toResult(result);

tagList.push(
Expand Down
2 changes: 1 addition & 1 deletion src/export_command/wikimedia_function/view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export async function showViewer(currentPanel: vscode.WebviewPanel | string, vie

const barMessage: vscode.Disposable = vscode.window.setStatusBarMessage("Wikitext: Getting view...");
try {
const result: unknown = await tBot.request(args, { method: 'GET' });
const result: unknown = await tBot.request(args);
const re: GetViewResult = ViewConvert.toResult(result);
if (!re.parse) { return undefined; }

Expand Down
Loading