fixed conflict issues

Author: akashnai

src/commands/play.ts

@@ -19,8 +19,6 @@ export const info = {
   cooldown: 5000,
 };
 
-<<<<<<< HEAD
-=======
 Platform.shim.eval = async (
   data: Types.BuildScriptResult,
   env: Record<string, Types.VMPrimative>,
@@ -40,7 +38,6 @@ Platform.shim.eval = async (
   return new Function(code)();
 };
 
->>>>>>> upstream/master
 async function safeDownload(
   yt: Innertube,
   id: string,

src/commands/video.ts

@@ -16,8 +16,6 @@ export const info = {
   cooldown: 5000,
 };
 
-<<<<<<< HEAD
-=======
 Platform.shim.eval = async (
   data: Types.BuildScriptResult,
   env: Record<string, Types.VMPrimative>,
@@ -37,7 +35,6 @@ Platform.shim.eval = async (
   return new Function(code)();
 };
 
->>>>>>> upstream/master
 async function safeDownload(
   yt: Innertube,
   id: string,

src/components/events/message.ts

@@ -140,50 +140,7 @@ export default async function (msg: Message, type: string): Promise<void> {
           )
             return;
 
-<<<<<<< HEAD
-          react.react = async (reaction: string): Promise<void> => {
-            // add delay for more
-            // humanly like interaction
-            const min = 2000;
-            const max = 6000;
-            const randomMs = Math.floor(Math.random() * (max - min + 1)) + min;
-
-            await sleep(randomMs);
-            const isEmoji = /.*[A-Za-z0-9].*/.test(reaction);
-            log.info("AutoReact", lid, reaction);
-            await redis.set(`react:${msg.id.id}`, "1", {
-              expiration: {
-                type: "EX",
-                value: 3600, // 1 hour
-              },
-            });
-
-            if (Math.random() < 0.1 && !isEmoji)
-              if (Math.random() < 0.2)
-                (await client()).sendMessage(react.id.remote, reaction);
-              else await msg.reply(reaction);
-            else await msg.react(reaction);
-          };
-
-          const emojis = [
-            ...new Set([...react.body.matchAll(regex)].map((m) => m[0])),
-          ];
-          if (emojis.length > 0) {
-            await react.react(
-              emojis[Math.floor(Math.random() * emojis.length)],
-            );
-          } else if (containsAny(react.body, funD)) {
-            await react.react("🤣");
-          } else if (containsAny(react.body, happyEE)) {
-            await msg.reply(funD[Math.floor(Math.random() * funD.length)]);
-          } else if (containsAny(react.body, sadEE)) {
-            await react.react("😭");
-          } else if (containsAny(react.body, loveEE)) {
-            await react.react("❤️");
-          }
-=======
           reactQueue.add(() => autoReaction(msg));
->>>>>>> upstream/master
         })(),
         (async () => {
           const botId = (await client()).info.wid._serialized;
@@ -232,17 +189,13 @@ export default async function (msg: Message, type: string): Promise<void> {
     }
 
     log.info("Message", lid, key);
-<<<<<<< HEAD
-    msg.body = newMessageBody;
-=======
 
     if (newMessageBody.split(" ").length === 1 && msg.hasQuotedMsg) {
       const qoutedMessage = await msg.getQuotedMessage();
       msg.body = (newMessageBody + " " + qoutedMessage.body).trim();
     } else {
       msg.body = newMessageBody;
     }
->>>>>>> upstream/master
 
     /*
      *
@@ -258,13 +211,9 @@ export default async function (msg: Message, type: string): Promise<void> {
       options?: MessageSendOptions,
     ): Promise<Message> => {
       let messageBody = typeof content === "string" ? Font(content) : content;
-<<<<<<< HEAD
-      log.info("Reply", lid, key);
-=======
       const latency = Date.now() - receivedAt;
       const latencySec = (latency / 1000).toFixed(2);
       log.info("Reply", lid, `${key} ${latencySec}s`);
->>>>>>> upstream/master
 
       if (!msg.fromMe) {
         const chat = await msg.getChat();

src/components/events/revoke.ts

@@ -46,16 +46,13 @@ export default async function (
       : null;
 
     log.info("RevokeMessage", lid);
-<<<<<<< HEAD
-=======
 
     // cant include captions under this certain messages
     // so caption will be send first before the deleted message
     if (["sticker", "ptt"].includes(msg.type) || msg.isGif) {
       await msg.reply(caption);
     }
 
->>>>>>> upstream/master
     await Promise.all([
       addMessage(lid, revoked_msg.body, "revoke"),
       msg.reply(media || caption, undefined, {

src/components/utils/quiz.ts

@@ -36,11 +36,7 @@ export default async function (msg: Message): Promise<void> {
         redis.del(key),
         addUserQuizPoints(msg, true),
         quoted.delete(true, true),
-<<<<<<< HEAD
-        startNewQuiz(msg),
-=======
         startNewQuiz(msg, true),
->>>>>>> upstream/master
       ]);
     } else {
       log.info("QuizAnswered", quizAttempt.quiz_id, "wrong");

src/components/utils/riddle.ts

@@ -36,11 +36,8 @@ export default async function (msg: Message): Promise<void> {
         redis.del(key),
         addUserQuizPoints(msg, true, 20),
         quoted.delete(true, true),
-<<<<<<< HEAD
-        startNewRiddle(msg),
-=======
         startNewRiddle(msg, true),
->>>>>>> upstream/master
+
       ]);
     } else {
       log.info("RiddleAnsweredWrong", riddleAttempt.quiz_id, "wrong");