fix(octokit): await octokit

Mara-Li · Jun 8, 2023 · 81f0cc3 · 81f0cc3
1 parent 8aff3c2
commit 81f0cc3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/src/commands/callback.ts b/src/commands/callback.ts
@@ -75,7 +75,8 @@ export async function purgeNotesRemoteCallback(plugin: GithubPublisher, repo: Re
 		checkCallback: (checking) => {
 			if (plugin.settings.upload.autoclean.enable && plugin.settings.upload.behavior !== FolderSettings.fixed) {
 				if (!checking) {
-					const publisher = plugin.reloadOctokit();
+					//@ts-ignore
+					const publisher = await plugin.reloadOctokit();
 					purgeNotesRemote(
 						publisher,
 						plugin.settings,
@@ -118,7 +119,8 @@ export async function shareOneNoteCallback(repo: Repository|null, plugin: Github
 				if (!checking) {
 					shareOneNote(
 						branchName,
-						plugin.reloadOctokit(),
+						//@ts-ignore
+						await plugin.reloadOctokit(),
 						plugin.settings,
 						file,
 						repo,
@@ -235,7 +237,8 @@ export async function checkRepositoryValidityCallback(plugin: GithubPublisher, r
 				if (!checking) {
 					checkRepositoryValidity(
 						branchName,
-						plugin.reloadOctokit(),
+						//@ts-ignore
+						await plugin.reloadOctokit(),
 						plugin.settings,
 						repo,
 						plugin.app.workspace.getActiveFile(),

diff --git a/src/commands/plugin_commands.ts b/src/commands/plugin_commands.ts
@@ -59,7 +59,7 @@ export async function shareActiveFile(plugin: GithubPublisher, repo: Repository
 	if (file && frontmatter && isShared(frontmatter, plugin.settings, file, repo)) {
 		await shareOneNote(
 			branchName,
-			plugin.reloadOctokit(),
+			await plugin.reloadOctokit(),
 			plugin.settings,
 			file,
 			repo,
@@ -80,7 +80,7 @@ export async function shareActiveFile(plugin: GithubPublisher, repo: Repository
  */
 export async function deleteCommands(plugin : GithubPublisher, repo: Repository | null, branchName: string) {
 	const repoFrontmatter = getRepoFrontmatter(plugin.settings, repo);
-	const publisher = plugin.reloadOctokit();
+	const publisher = await plugin.reloadOctokit();
 	await purgeNotesRemote(
 		publisher,
 		plugin.settings,
@@ -102,7 +102,7 @@ export async function deleteCommands(plugin : GithubPublisher, repo: Repository
 
 export async function uploadAllNotes(plugin: GithubPublisher, repo: Repository | null, branchName: string) {
 	const statusBarItems = plugin.addStatusBarItem();
-	const publisher = plugin.reloadOctokit();
+	const publisher = await plugin.reloadOctokit();
 	const sharedFiles = publisher.getSharedFiles();
 	await shareAllMarkedNotes(
 		publisher,
@@ -128,7 +128,7 @@ export async function uploadAllNotes(plugin: GithubPublisher, repo: Repository |
  */
 
 export async function uploadNewNotes(plugin: GithubPublisher, branchName: string, repo: Repository|null) {
-	const publisher = plugin.reloadOctokit();
+	const publisher = await plugin.reloadOctokit();
 	await shareNewNote(
 		publisher,
 		publisher.octokit,
@@ -153,7 +153,7 @@ export async function repositoryValidityActiveFile(plugin:GithubPublisher, branc
 	if (file) {
 		await checkRepositoryValidity(
 			branchName,
-			plugin.reloadOctokit(),
+			await plugin.reloadOctokit(),
 			plugin.settings,
 			repo,
 			file,
@@ -171,7 +171,7 @@ export async function repositoryValidityActiveFile(plugin:GithubPublisher, branc
  * @return {Promise<void>}
  */
 export async function uploadAllEditedNotes(plugin: GithubPublisher ,branchName: string, repo: Repository|null=null) {
-	const publisher = plugin.reloadOctokit();
+	const publisher = await plugin.reloadOctokit();
 	await shareAllEditedNotes(
 		publisher,
 		publisher.octokit,
@@ -192,14 +192,14 @@ export async function uploadAllEditedNotes(plugin: GithubPublisher ,branchName:
  * @return {Promise<void>}
  */
 export async function shareEditedOnly(branchName: string, repo: Repository|null, plugin: GithubPublisher) {
-	const publisher = this.reloadOctokit();
+	const publisher = await plugin.reloadOctokit();
 	await shareOnlyEdited(
 		publisher,
 		publisher.octokit,
 		branchName,
 		plugin.app.vault,
 		plugin,
-		getRepoFrontmatter(this.settings, repo) as RepoFrontmatter,
+		getRepoFrontmatter(plugin.settings, repo) as RepoFrontmatter,
 		repo
 	);
 }
diff --git a/src/settings/modals/manage_repo.ts b/src/settings/modals/manage_repo.ts
@@ -254,7 +254,13 @@ class ModalEditingRepository extends Modal {
 					.setButtonText(i18next.t("settings.github.testConnection"))
 					.setClass("github-publisher-connect-button")
 					.onClick(async () => {
-						await checkRepositoryValidity(this.branchName, this.plugin.reloadOctokit(), this.plugin.settings, this.repository, null, this.app.metadataCache);
+						await checkRepositoryValidity(
+							this.branchName, 
+							await this.plugin.reloadOctokit(), 
+							this.plugin.settings, 
+							this.repository, 
+							null, 
+							this.app.metadataCache);
 					})
 			);
 		new Setting(contentEl)