added crop

Author: arcbtc

.github/workflows/release-android.yml

@@ -35,6 +35,7 @@ jobs:
       - run: npx cap add android
       - run: npm run icons
       - run: npx cap sync android
+      - run: npm run cap:patch:links
       - run: ./gradlew assembleDebug
         working-directory: android
       - run: mkdir -p release && cp android/app/build/outputs/apk/debug/app-debug.apk release/Nostr-Social-Android.apk

electron/main.cjs

@@ -5,6 +5,9 @@ const http = require('http');
 const path = require('path');
 
 let server;
+let mainWindow;
+let appBaseUrl;
+let pendingNostrUrl = '';
 const secureSessionFile = 'secure-private-key-session.dat';
 
 function createStaticServer() {
@@ -41,8 +44,8 @@ function createStaticServer() {
 }
 
 async function createWindow() {
-  const baseUrl = await createStaticServer();
-  const window = new BrowserWindow({
+  appBaseUrl = appBaseUrl || (await createStaticServer());
+  mainWindow = new BrowserWindow({
     width: 1180,
     height: 840,
     minWidth: 420,
@@ -58,11 +61,53 @@ async function createWindow() {
     }
   });
 
-  window.webContents.setWindowOpenHandler(({ url }) => {
+  mainWindow.webContents.setWindowOpenHandler(({ url }) => {
     void shell.openExternal(url);
     return { action: 'deny' };
   });
-  await window.loadURL(baseUrl);
+  mainWindow.on('closed', () => {
+    mainWindow = undefined;
+  });
+  await mainWindow.loadURL(appBaseUrl);
+  if (pendingNostrUrl) {
+    const url = pendingNostrUrl;
+    pendingNostrUrl = '';
+    openNostrUrl(url);
+  }
+}
+
+function registerNostrProtocol() {
+  if (process.defaultApp) {
+    if (process.argv.length >= 2) app.setAsDefaultProtocolClient('nostr', process.execPath, [path.resolve(process.argv[1])]);
+  } else {
+    app.setAsDefaultProtocolClient('nostr');
+  }
+}
+
+function findNostrUrl(argv = process.argv) {
+  return argv.find((argument) => /^nostr:/i.test(argument)) || '';
+}
+
+function nostrIdentifierFromUrl(url = '') {
+  const clean = String(url).trim();
+  if (!/^nostr:/i.test(clean)) return '';
+  try {
+    return decodeURIComponent(clean.replace(/^nostr:(?:\/\/)?/i, '').replace(/^\/+/, '').split(/[?#]/, 1)[0] || '').trim();
+  } catch {
+    return clean.replace(/^nostr:(?:\/\/)?/i, '').replace(/^\/+/, '').split(/[?#]/, 1)[0] || '';
+  }
+}
+
+function openNostrUrl(url) {
+  const identifier = nostrIdentifierFromUrl(url);
+  if (!identifier) return;
+  pendingNostrUrl = url;
+  if (!mainWindow || !appBaseUrl) return;
+  pendingNostrUrl = '';
+  if (mainWindow.isMinimized()) mainWindow.restore();
+  mainWindow.show();
+  mainWindow.focus();
+  void mainWindow.loadURL(`${appBaseUrl}/${encodeURIComponent(identifier)}`);
 }
 
 function contentType(filePath) {
@@ -122,10 +167,27 @@ function registerSecureSessionHandlers() {
   ipcMain.handle('secure-session:clear', () => clearSecureSession());
 }
 
-app.whenReady().then(() => {
-  registerSecureSessionHandlers();
-  return createWindow();
-});
+registerNostrProtocol();
+openNostrUrl(findNostrUrl());
+
+const gotSingleInstanceLock = app.requestSingleInstanceLock();
+if (!gotSingleInstanceLock) {
+  app.quit();
+} else {
+  app.on('second-instance', (_event, argv) => {
+    openNostrUrl(findNostrUrl(argv));
+  });
+
+  app.on('open-url', (event, url) => {
+    event.preventDefault();
+    openNostrUrl(url);
+  });
+
+  app.whenReady().then(() => {
+    registerSecureSessionHandlers();
+    return createWindow();
+  });
+}
 
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') app.quit();

package.json

@@ -21,7 +21,8 @@
     "desktop:linux": "npm run icons && npm run build && electron-builder --linux AppImage --x64 --publish never",
     "cap:add:ios": "cap add ios",
     "cap:add:android": "cap add android",
-    "cap:sync": "npm run icons && npm run build && cap sync && npm run icons"
+    "cap:patch:links": "node scripts/patch-native-links.cjs",
+    "cap:sync": "npm run icons && npm run build && cap sync && npm run cap:patch:links && npm run icons"
   },
   "dependencies": {
     "@capacitor/android": "^7.4.4",
@@ -56,6 +57,14 @@
       "output": "release"
     },
     "icon": "icon",
+    "protocols": [
+      {
+        "name": "Nostr URI",
+        "schemes": [
+          "nostr"
+        ]
+      }
+    ],
     "mac": {
       "target": "dmg",
       "artifactName": "Nostr-Social-macOS-${arch}.${ext}"

scripts/patch-native-links.cjs

@@ -0,0 +1,59 @@
+const fs = require('node:fs');
+const path = require('node:path');
+
+patchAndroidManifest();
+patchIosInfoPlist();
+
+function patchAndroidManifest() {
+  const manifestPath = path.join('android', 'app', 'src', 'main', 'AndroidManifest.xml');
+  if (!fs.existsSync(manifestPath)) return;
+
+  const source = fs.readFileSync(manifestPath, 'utf8');
+  if (source.includes('android:scheme="nostr"')) return;
+
+  const intentFilter = `
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="nostr" />
+            </intent-filter>
+`;
+
+  const activityPattern = /(<activity\b[^>]*android:name="[^"]*MainActivity"[\s\S]*?)(\n\s*<\/activity>)/;
+  const next = source.replace(activityPattern, `$1${intentFilter}$2`);
+  if (next === source) throw new Error(`Could not find MainActivity in ${manifestPath}`);
+
+  fs.writeFileSync(manifestPath, next);
+  console.log(`Patched ${manifestPath} for nostr: links`);
+}
+
+function patchIosInfoPlist() {
+  const plistPath = path.join('ios', 'App', 'App', 'Info.plist');
+  if (!fs.existsSync(plistPath)) return;
+
+  const source = fs.readFileSync(plistPath, 'utf8');
+  if (source.includes('<string>nostr</string>')) return;
+
+  const urlTypes = `
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.nostr.social</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>nostr</string>
+			</array>
+		</dict>
+	</array>
+`;
+
+  const next = source.replace(/\n<\/dict>\s*\n<\/plist>\s*$/, `${urlTypes}</dict>\n</plist>\n`);
+  if (next === source) throw new Error(`Could not patch ${plistPath}`);
+
+  fs.writeFileSync(plistPath, next);
+  console.log(`Patched ${plistPath} for nostr: links`);
+}