jxpeng98/obsidian-to-NotionNext
1
0
Fork 0
mirror of https://github.com/jxpeng98/obsidian-to-NotionNext synced 2026-07-30 00:48:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

modify the notionapi variable

Browse Source
This commit is contained in:
Jiaxin Peng
2023-12-29 00:36:29 +00:00
parent 35746f1c51
commit 4abbbecd37
6 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/upload/upload_general/BaseUpload2NotionGeneral.ts
View File

@@ -4,23 +4,27 @@ import {markdownToBlocks,} from "@tryfabric/martian";
import * as yamlFrontMatter from "yaml-front-matter"; import * as yamlFrontMatter from "yaml-front-matter";
// import * as yaml from "yaml" // import * as yaml from "yaml"
import MyPlugin from "src/main"; import MyPlugin from "src/main";
import {DatabaseDetails} from "../../ui/settingTabs";
export class UploadBaseGeneral { export class UploadBaseGeneral {
plugin: MyPlugin; plugin: MyPlugin;
notion: Client; notion: Client;
agent: any; agent: any;
dbDetails: DatabaseDetails
constructor(plugin: MyPlugin) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
this.plugin = plugin; this.plugin = plugin;
this.dbDetails = dbDetails
} }
async deletePage(notionID: string) { async deletePage(notionID: string) {
const {notionAPI} = this.dbDetails
return requestUrl({ return requestUrl({
url: `https://api.notion.com/v1/blocks/${notionID}`, url: `https://api.notion.com/v1/blocks/${notionID}`,
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
}, },
body: '' body: ''
@@ -28,11 +32,12 @@ export class UploadBaseGeneral {
} }
async getDataBase(databaseID: string) { async getDataBase(databaseID: string) {
const {notionAPI} = this.dbDetails
const response = await requestUrl({ const response = await requestUrl({
url: `https://api.notion.com/v1/databases/${databaseID}`, url: `https://api.notion.com/v1/databases/${databaseID}`,
method: 'GET', method: 'GET',
headers: { headers: {
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
} }
} }

2
src/upload/upload_general/Upload2NotionGeneral.ts
View File

@@ -13,7 +13,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
dbDetails: DatabaseDetails; dbDetails: DatabaseDetails;
constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
super(plugin); super(plugin, dbDetails);
this.dbDetails = dbDetails; this.dbDetails = dbDetails;
} }

12
src/upload/upload_next/BaseUpload2NotionNext.ts
View File

@@ -4,23 +4,27 @@ import { markdownToBlocks, } from "@tryfabric/martian";
import * as yamlFrontMatter from "yaml-front-matter"; import * as yamlFrontMatter from "yaml-front-matter";
// import * as yaml from "yaml" // import * as yaml from "yaml"
import MyPlugin from "src/main"; import MyPlugin from "src/main";
import {DatabaseDetails} from "../../ui/settingTabs";
export class UploadBaseNext { export class UploadBaseNext {
plugin: MyPlugin; plugin: MyPlugin;
notion: Client; notion: Client;
agent: any; agent: any;
dbDetails: DatabaseDetails
constructor(plugin: MyPlugin) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
this.plugin = plugin; this.plugin = plugin;
this.dbDetails = dbDetails
} }
async deletePage(notionID: string) { async deletePage(notionID: string) {
const {notionAPI} = this.dbDetails
return requestUrl({ return requestUrl({
url: `https://api.notion.com/v1/blocks/${notionID}`, url: `https://api.notion.com/v1/blocks/${notionID}`,
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
}, },
body: '' body: ''
@@ -28,11 +32,13 @@ export class UploadBaseNext {
} }
async getDataBase(databaseID: string) { async getDataBase(databaseID: string) {
const {notionAPI} = this.dbDetails
const response = await requestUrl({ const response = await requestUrl({
url: `https://api.notion.com/v1/databases/${databaseID}`, url: `https://api.notion.com/v1/databases/${databaseID}`,
method: 'GET', method: 'GET',
headers: { headers: {
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
} }
} }

2
src/upload/upload_next/Upload2NotionNext.ts
View File

@@ -14,7 +14,7 @@ export class Upload2NotionNext extends UploadBaseNext {
dbDetails: DatabaseDetails dbDetails: DatabaseDetails
constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
super(plugin); super(plugin, dbDetails);
this.dbDetails = dbDetails this.dbDetails = dbDetails
} }

11
src/upload/upoload_custom/BaseUpload2NotionCustom.ts
View File

@@ -4,23 +4,27 @@ import {markdownToBlocks,} from "@tryfabric/martian";
import * as yamlFrontMatter from "yaml-front-matter"; import * as yamlFrontMatter from "yaml-front-matter";
// import * as yaml from "yaml" // import * as yaml from "yaml"
import MyPlugin from "src/main"; import MyPlugin from "src/main";
import {DatabaseDetails} from "../../ui/settingTabs";
export class UploadBaseCustom { export class UploadBaseCustom {
plugin: MyPlugin; plugin: MyPlugin;
notion: Client; notion: Client;
agent: any; agent: any;
dbDetails: DatabaseDetails
constructor(plugin: MyPlugin) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
this.plugin = plugin; this.plugin = plugin;
this.dbDetails = dbDetails
} }
async deletePage(notionID: string) { async deletePage(notionID: string) {
const {notionAPI} = this.dbDetails
return requestUrl({ return requestUrl({
url: `https://api.notion.com/v1/blocks/${notionID}`, url: `https://api.notion.com/v1/blocks/${notionID}`,
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
}, },
body: '' body: ''
@@ -28,11 +32,12 @@ export class UploadBaseCustom {
} }
async getDataBase(databaseID: string) { async getDataBase(databaseID: string) {
const {notionAPI} = this.dbDetails
const response = await requestUrl({ const response = await requestUrl({
url: `https://api.notion.com/v1/databases/${databaseID}`, url: `https://api.notion.com/v1/databases/${databaseID}`,
method: 'GET', method: 'GET',
headers: { headers: {
'Authorization': 'Bearer ' + this.plugin.settings.notionAPINext, 'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28', 'Notion-Version': '2022-06-28',
} }
} }

4
src/upload/upoload_custom/Upload2NotionCustom.ts
View File

@@ -13,7 +13,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
dbDetails: DatabaseDetails; dbDetails: DatabaseDetails;
constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) { constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
super(plugin); super(plugin, dbDetails);
this.dbDetails = dbDetails; this.dbDetails = dbDetails;
} }
@@ -116,7 +116,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
"Content-Type": "application/json", "Content-Type": "application/json",
// 'User-Agent': 'obsidian.md', // 'User-Agent': 'obsidian.md',
Authorization: Authorization:
"Bearer " + this.plugin.settings.notionAPIGeneral, "Bearer " + notionAPI,
"Notion-Version": "2022-06-28", "Notion-Version": "2022-06-28",
}, },
body: JSON.stringify(bodyString), body: JSON.stringify(bodyString),