revert: back to 07f0ea2 and e963a39 (ignore revoke message)

Author: mrepol742

src/components/events/revoke.ts

@@ -3,19 +3,10 @@ import { addMessage, getMessage } from "../services/message";
 import log from "../utils/log";
 import { getSetting } from "../services/settings";
 import path from "path";
-import client from "../client";
 
 export default async function (msg: Message, revoked_msg?: Message) {
   try {
-    const myJid = (await client()).info.wid._serialized;
-    if (
-      msg.fromMe ||
-      !revoked_msg ||
-      revoked_msg.fromMe ||
-      revoked_msg?.author === myJid ||
-      revoked_msg?.id?.id === myJid
-    )
-      return;
+    if (msg.fromMe || !revoked_msg || revoked_msg.fromMe) return;
 
     const lid = (msg.author ?? msg.from).split("@")[0];
 

src/components/utils/instantdl/downloader.ts

@@ -16,7 +16,7 @@ function md5FromUrl(url: string) {
 }
 
 const facebookUrlRegex =
-  /^(https?:\/\/)?(www\.)?(facebook\.com\/(watch\/\?v=\d+|[^\/]+\/videos\/\d+|reel\/\d+)|fb\.watch\/[A-Za-z0-9_-]+)\/?$/i;
+  /^(https?:\/\/)?(www\.)?(facebook\.com|fb\.watch)\/[^\s?#]+(\?[^\s#]*)?(#[^\s]*)?$/i;
 const youtubeShortsUrlRegex =
   /^(https?:\/\/)?(www\.)?youtube\.com\/shorts\/([A-Za-z0-9_-]{11})(\?[^\s#]*)?(#[^\s]*)?$/i;