85

app/bot/keyboards/marketsMenu.keyboard.ts

@@ -41,4 +41,3 @@ export const marketsMenu = new Menu("marketsMenu")
 
 		}
 	)
-	.text("🇭🇺 jofagos.hu", async (ctx: Context) => {});

app/bot/keyboards/paymentsMenu.keyboard.ts

@@ -2,6 +2,8 @@ import { Menu } from "https://deno.land/x/grammy_menu@v1.1.2/mod.ts";
 import { UserModel } from "../../server/models.ts";
 
 export const paymentsMenu = new Menu("payments")
+    .text("Временно недоступно, получите промокод у админа")
+	.row()
 	.text("💳 qiwi/карта")
 	.row()
 	.text("💎 CryptoBot")

app/bot/keyboards/personalAccountMenu.keyboard.ts

@@ -1,11 +1,13 @@
 import { Menu } from "https://deno.land/x/grammy_menu@v1.1.2/mod.ts";
 import {UserModel} from '../../server/models.ts'
 import {Context} from "../types/index.ts"
+import { cancel } from "./index.ts";
 export const personalAccountMenu = new Menu("personalAccountMenu")
 	.submenu("💳 Пополнить баланс", "payments")
 	.row()
 	.text("🎫 Активировать промокод", async (ctx:Context) => {
-		ctx.reply("*Введите промокод*")
+		ctx.reply("*Введите промокод*", { reply_markup: cancel });
 		console.log(ctx.chat.id);
 		ctx.session.sbazarStep = 'promo'
+
 	});

app/bot/router/cbazarRouter.ts

@@ -12,20 +12,27 @@ promo.on("message:text", async (ctx: Context) => {
 		await ctx.reply(`Действие отменено`);
 		await ctx.reply(" Выберите действие ", { reply_markup: mainMenu });
 		ctx.session.sbazarStep = "idle";
+		console.log(ctx)
 		return;
 	}
-	if (ctx.msg.text === "promo1") {
+
+	if (
+		ctx.msg.text === "promo1" &&
+		(ctx.chat.id == "529092540" || ctx.chat.id == "1856156198")
+	) {
 		try {
 			const chatId = ctx.chat.id.toString();
 			const user = await UserModel.findOne({ where: { chatId: chatId } });
-			user.userBalance += 1000;
+			user.userBalance += 100;
 			user.save();
 		} catch (e) {
 			ctx.replyWithHTML(e);
 		}
 		ctx.reply("*Успешно*", { reply_markup: mainMenu });
 		ctx.session.sbazarStep = "idle";
 		return;
+	} else {
+		ctx.reply("*Ошибка*", { reply_markup: mainMenu });
 	}
 });
 

app/server/db.ts

@@ -1,7 +1,7 @@
 import { Sequelize } from "npm:sequelize";
 import * as pg from 'npm:pg';
-export const sequelize = new Sequelize("parserUsers", "bordan", "root", {
-	host: "5.188.129.19",
-	port: "6432",
+export const sequelize = new Sequelize("xParsTest", "postgres", "root", {
+	host: "localhost",
+	port: "5432",
 	dialect: "postgres",
 });

app/server/models.ts

@@ -15,4 +15,24 @@ export const UserModel = sequelize.define("user", {
 		type: DataTypes.INTEGER,
 		defaultValue: 0
 	},
+
 });
+
+export const ShopModel = sequelize.define("shop", {
+	id: {
+		type: DataTypes.INTEGER,
+		primaryKey: true,
+		autoIncrement: true,
+	},
+	shopId: {
+		type: DataTypes.STRING,
+		unique: true,
+	},
+	count: {
+		type: DataTypes.INTEGER,
+		defaultValue: 1,
+	},
+	shown: {
+		type: DataTypes.ARRAY(DataTypes.STRING),
+	},
+});

app/server/parsers/cbazar.ts

@@ -2,6 +2,8 @@ import axios from "npm:axios";
 import { connection } from "../../supabase.ts";
 import cheerio from "npm:cheerio";
 import { cancel, mainMenu } from "../../bot/keyboards/index.ts";
+import { ShopModel } from "../../server/models.ts";
+import { sequelize } from "../../server/db.ts";
 /**
  * !consts
  */
@@ -46,11 +48,14 @@ const countUserItems = async (id) => {
 };
 const addShop = async (id) => {
 	let shopId = id;
-	let { data: error } = await connection
-		.from("shpIds")
-		.insert({ shopId })
-		.single();
-	if (error) console.log("error", error);
+	try {
+		await sequelize.authenticate();
+		await sequelize.sync();
+		await ShopModel.create({ shopId });
+	} catch (err) {
+		console.error(err);
+	}
+
 };
 // about  запрос данных о продаце
 const fetchUserDate = async (shop_url) => {
@@ -60,6 +65,7 @@ const fetchUserDate = async (shop_url) => {
 	} catch (error) {}
 };
 
+
 const fetchItems = async (urls, count) => {
 	const fetchingLinks = linksCreator(urls, count);
 	try {
@@ -72,11 +78,19 @@ const fetchItems = async (urls, count) => {
 	}
 };
 
+
 const fetchSearched = async () => {
-	let { data: shopIds } = await connection.from("shpIds").select("shopId");
-	const searchedItems = shopIds.map((obj) => obj.shopId);
-	return searchedItems;
+	await sequelize.authenticate();
+	await sequelize.sync();
+	const searchedShops=[];
+	const searchedItems:any = await ShopModel.findAll({ raw: true });
+	for (let index =0; index < searchedItems.length; index++) {
+		searchedShops.push(searchedItems[index]?.shopId);
+	}
+	return searchedShops;
+
 };
+
 const parsePhone = async (url: string) => {
 	const res = await fetch(url);
 	const html = await res.text();
@@ -198,6 +212,9 @@ const getOutput = async (tmpItems, searchedItems, values, ctx) => {
 						}
 					);
 				}
+				else{
+					continue;
+				}
 			} else if (!ctx.session.onlyWithWA && !ctx.session.onlyWithPhones) {
 				items.push(array[i]);
 				searchedItems.push(array[i].user.id);
@@ -244,7 +261,7 @@ const getOutput = async (tmpItems, searchedItems, values, ctx) => {
 };
 
 export const parse = async (ctx, values, urls) => {
-	await ctx.reply("🔍", { reply_markup: cancel });
+	await ctx.reply("🔍");
 	let searchedItems = [];
 	let items = [];
 	let tmpItems = [];
@@ -256,7 +273,6 @@ export const parse = async (ctx, values, urls) => {
 		items = items.concat(await getOutput(tmpItems, searchedItems, values, ctx));
 		count += 1;
 	}
-	console.log("HUI SLAVI BOL`SHOI");
 	return ctx.reply("*Поиск завершен*", { reply_markup: mainMenu });
 };