whatsapp-pi 1.0.3 → 1.0.5

package/README.md

@@ -65,32 +65,6 @@ pi -e whatsapp-pi.ts --verbose
   - **Allow Numbers**: Manage contacts that can interact with Pi
   - **Blocked Numbers**: View ignored numbers (not in allow list) and add them to allow list
 
-## Important Configuration
-
-### Using Your Own WhatsApp Number
-
-If you're using your **own WhatsApp number** (not a separate bot number), you need to modify the message filtering in `src/services/whatsapp.service.ts`:
-
-**Remove this line from `handleIncomingMessages()`:**
-```typescript
-// Ignore messages sent by the bot itself
-if (msg.key.fromMe) return;
-```
-
-**Why?** When using your own number:
-- Pi sends messages from your account (marked with `π` symbol)
-- The `fromMe` filter blocks ALL your outgoing messages, including Pi's responses
-- The `π` symbol check is sufficient to prevent message loops
-
-**Keep this check:**
-```typescript
-// Ignore messages sent by Pi (marked with π)
-const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text || "";
-if (text.endsWith('π')) return;
-```
-
-This ensures Pi doesn't process its own sent messages while still receiving messages from others.
-
 ## Project Structure
 
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",

package/src/services/session.manager.ts

@@ -85,6 +85,11 @@ export class SessionManager {
         return this.ignoredNumbers;
     }
 
+    async removeIgnoredNumber(number: string) {
+        this.ignoredNumbers = this.ignoredNumbers.filter(c => c.number !== number);
+        await this.saveConfig();
+    }
+
     async addNumber(number: any, name?: string) {
         // Handle potential nested objects from legacy bugs
         let cleanNumber = number;

package/src/services/whatsapp.service.ts

@@ -127,10 +127,7 @@ export class WhatsAppService {
     public async handleIncomingMessages(m: any) {
         if (this.sessionManager.getStatus() !== 'connected') return;
         const msg = m.messages[0];
-        if (!msg || !msg.key.remoteJid) return;
-
-        // KEEP IT COMMENTED
-        // if (msg.key.fromMe) return;
+        if (!msg || !msg.key.remoteJid || msg.key.fromMe) return;
 
         // Ignore messages sent by Pi (marked with π)
         const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text || "";

package/src/ui/menu.handler.ts

@@ -91,7 +91,7 @@ export class MenuHandler {
     }
 
     private async manageBlockList(ctx: ExtensionCommandContext) {
-        const list = this.sessionManager.getBlockList();
+        const list = this.sessionManager.getIgnoredNumbers();
         
         if (list.length === 0) {
             ctx.ui.notify('No blocked numbers', 'info');
@@ -115,19 +115,21 @@ export class MenuHandler {
     }
 
     private async manageBlockedNumber(ctx: ExtensionCommandContext, number: string) {
-        const action = await ctx.ui.select(`Manage ${number}`, ['Unblock and Allow', 'Delete', 'Back']);
+        const action = await ctx.ui.select(`Manage ${number}`, ['Allow', 'Delete', 'Back']);
 
-        if (action === 'Unblock and Allow') {
-            const ok = await ctx.ui.confirm('Unblock', `Move ${number} to Allowed Numbers?`);
+        if (action === 'Allow') {
+            const ok = await ctx.ui.confirm('Allow', `Move ${number} to Allowed Numbers?`);
             if (ok) {
-                await this.sessionManager.unblockAndAllow(number);
+                const list = this.sessionManager.getIgnoredNumbers();
+                const contact = list.find(c => c.number === number);
+                await this.sessionManager.addNumber(number, contact?.name);
                 ctx.ui.notify(`${number} moved to Allowed List`, 'info');
             }
             await this.manageBlockList(ctx);
         } else if (action === 'Delete') {
             const ok = await ctx.ui.confirm('Delete', `Remove ${number} from Block List?`);
             if (ok) {
-                await this.sessionManager.unblockNumber(number);
+                await this.sessionManager.removeIgnoredNumber(number);
                 ctx.ui.notify(`${number} removed from Block List`, 'info');
             }
             await this.manageBlockList(ctx);