From f674fe2a402061b4d566223531ee255674b11005 Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Wed, 3 Jan 2024 14:47:55 +0100
Subject: [PATCH] revert

---
 src/inc/trigger/debug.mjs  |  5 +++--
 src/inc/trigger/parser.mjs | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/inc/trigger/debug.mjs b/src/inc/trigger/debug.mjs
index 7e5222e..4a6a379 100644
--- a/src/inc/trigger/debug.mjs
+++ b/src/inc/trigger/debug.mjs
@@ -8,8 +8,9 @@ let context = vm.createContext({
   e: null,
   bot: null,
   admins: null,
-  fetch: fetch,
-  lib: lib,
+  fetch,
+  lib,
+  console,
 
   a: null,
   resolve: null
diff --git a/src/inc/trigger/parser.mjs b/src/inc/trigger/parser.mjs
index 6331346..b79baef 100644
--- a/src/inc/trigger/parser.mjs
+++ b/src/inc/trigger/parser.mjs
@@ -13,6 +13,7 @@ const regex = {
   yt:    /(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\/?\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/gi,
   imgur: /^https?:\/\/(\w+\.)?imgur.com\/(\w*\d\w*)+(\.[a-zA-Z]{3,4})?/gi
 };
+const mediagroupids = new Set();
 
 export default async bot => {
 
@@ -35,6 +36,7 @@ export default async bot => {
       if(!e.channel.includes("f0ck") && (!e.message.match(/\!f(0ck)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
         return false;
 
+<<<<<<< Updated upstream
       //if(e.type === 'tg' && !e.message.match(/\!f(0ck)?\b/i) && typeof e.raw.forward_from == 'undefined')
       //  return false;
       if(e.type === 'tg' &&
@@ -43,6 +45,18 @@ export default async bot => {
       ) {
         return false;
       }
+=======
+      if(e.type === 'tg' && // proto: tg
+        !e.message.match(/\!f(0ck)?\b/i) && // !f / !f0ck
+        !e.raw.forward_date && // is forwarded?
+        !mediagroupids.has(e.raw.media_group_id) // prepared mediagroup?
+      ) {
+        return false;
+      }
+      else if(e.raw.media_group_id && e.message.match(/\!f(0ck)?\b/i)) {
+        mediagroupids.add(e.raw.media_group_id);
+      }
+>>>>>>> Stashed changes
 
       console.log(`parsing ${links.length} link${links.length > 1 ? "s" : ""}...`);