Merge pull request #125 from soberhacker/develop

Develop
soberhacker · Jun 9, 2023 · 5bd1ec0 · 5bd1ec0
2 parents 257505e + da1d79d
commit 5bd1ec0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 
+## [1.6.1](https://github.com/soberhacker/obsidian-telegram-sync/compare/1.6.0...1.6.1) (2023-06-09)
+
+
+### Bug Fixes
+
+* API_ID_PUBLISHED_FLOOD during loading plugin ([ee96f32](https://github.com/soberhacker/obsidian-telegram-sync/commit/ee96f32e09dbe52aa8309049471678e6e2edb7ea))
+
 ## [1.6.0](https://github.com/soberhacker/obsidian-telegram-sync/compare/1.5.0...1.6.0) (2023-06-08)
 
 

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "telegram-sync",
 	"name": "Telegram Sync",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"minAppVersion": "1.0.0",
 	"description": "Transfer messages and files from Telegram bot to Obsidian.",
 	"author": "soberHacker",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-telegram-sync",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "description": "Transfer messages and files from Telegram bot to Obsidian.",
     "main": "main.js",
     "scripts": {

diff --git a/release-notes.mjs b/release-notes.mjs
@@ -1,5 +1,5 @@
 // if "!"" in version code then notify user about latest release
-export const pluginVersion = "1.6.0!";
+export const pluginVersion = "1.6.1!";
 // change session name when changes in plugin require new client authorization
 export const sessionName = "telegram_sync_160";
 export const newFeatures = `

diff --git a/src/main.ts b/src/main.ts
@@ -106,12 +106,14 @@ export default class TelegramSyncPlugin extends Plugin {
 
 	async initTelegramClient() {
 		try {
-			if (this.settings.appId !== "" && this.settings.apiHash !== "") {
+			if (this.settings.appId !== "" && this.settings.apiHash !== "" && this.settings.botToken !== "") {
 				await GramJs.initClient(+this.settings.appId, this.settings.apiHash, this.currentDeviceId);
 				await GramJs.signInBot(this.settings.botToken);
 			}
 		} catch (e) {
-			await displayAndLogError(this, e, undefined, 60000);
+			if (!e.message.includes("API_ID_PUBLISHED_FLOOD")) {
+				await displayAndLogError(this, e, undefined, 60000);
+			}
 		}
 	}
 

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
@@ -81,6 +81,7 @@ export class TelegramSyncSettingTab extends PluginSettingTab {
 						this.plugin.settings.botToken = value;
 						await this.plugin.saveSettings();
 						this.plugin.initTelegramBot(); // Initialize the bot with the new token
+						this.plugin.initTelegramClient();
 					})
 			);