webclipper challenge fixes

anyproto · Mar 2, 2024 · 1500456 · 1500456
1 parent e2a52e6
commit 1500456
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/dist/js/polyfill.js b/dist/js/polyfill.js
@@ -24,7 +24,7 @@ window.Electron = {
     },
 	send: function () {},
 	currentWindow: function () {
-		return { windowId: 1 };
+		return {};
 	},
 	Api: () => {},
 };

diff --git a/extension/entry.tsx b/extension/entry.tsx
@@ -24,7 +24,7 @@ declare global {
 window.$ = $;
 window.isExtension = true;
 window.Electron = {
-	currentWindow: () => ({ windowId: 1 }),
+	currentWindow: () => ({}),
 	Api: () => {},
 };
 
@@ -41,7 +41,7 @@ window.AnytypeGlobalConfig = {
 	emojiUrl: Extension.clipper.emojiUrl, 
 	menuBorderTop: 16, 
 	menuBorderBottom: 16, 
-	debug: {},
+	debug: { mw: true },
 };
 
 let rootId = '';

diff --git a/src/ts/lib/api/dispatcher.ts b/src/ts/lib/api/dispatcher.ts
@@ -166,6 +166,7 @@ class Dispatcher {
 		const electron = UtilCommon.getElectron();
 		const currentWindow = electron.currentWindow();
 		const { windowId } = currentWindow;
+		const isMainWindow = windowId === 1;
 
 		if (traceId) {
 			ctx.push(traceId);
@@ -224,7 +225,7 @@ class Dispatcher {
 				};
 
 				case 'accountLinkChallenge': {
-					if (windowId !== 1) {
+					if (!isMainWindow) {
 						break;
 					};
 
@@ -237,6 +238,7 @@ class Dispatcher {
 						theme: commonStore.getThemeClass(),
 						lang: commonStore.interfaceLang,
 					}, '*'), false);
+					win.focus();
 
 					window.setTimeout(() => {
 						try { win.close(); } catch (e) { /**/ };
@@ -968,7 +970,7 @@ class Dispatcher {
 
 					notificationStore.add(item);
 
-					if ((windowId == 1) && !electron.isFocused()) {
+					if (isMainWindow && !electron.isFocused()) {
 						new window.Notification(UtilCommon.stripTags(item.title), { body: UtilCommon.stripTags(item.text) }).onclick = () => electron.focus();
 					};
 					break;
@@ -980,7 +982,7 @@ class Dispatcher {
 				};
 
 				case 'payloadBroadcast': {
-					if (electron.currentWindow().windowId !== 1) {
+					if (!isMainWindow) {
 						break;
 					};