Skip to content

Commit

Permalink
30
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbacorp
sbacorp committed Feb 17, 2023
1 parent 2f578a4 commit 4af278f
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 109 deletions.
7 changes: 5 additions & 2 deletions app/bot/features/welcome.feature.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ const feature = composer.chatType("private");
feature.command("start", async (ctx: Context) => {
const chatId = ctx.chat.id;
try {
await sequelize.authenticate();
await sequelize.authenticate();
await sequelize.sync();
await UserModel.create({chatId})
const user = await UserModel.findOne({ chatId });
if (!user) {
await UserModel.create({ chatId });
}
}
catch (err) {
console.error(err);
Expand Down
5 changes: 4 additions & 1 deletion app/bot/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
paymentsMenu,
countOutputMenu,
subscriptionMenu,
mainMenu
} from "./keyboards/index.ts";
import { settingsHeading } from "./headers.ts";
import { welcomeFeature } from "./features/index.ts";
Expand All @@ -36,14 +37,16 @@ bot.use(rateLimit());
bot.use(hydrateReply);
bot.use(setupSession())
bot.use(subscriptionMenu);
bot.use(marketsMenu);
bot.use(paymentsMenu);
bot.use(settingsMenu);
bot.use(personalAccountMenu);
bot.use(countOutputMenu);
bot.use(marketsMenu);
marketsMenu.register(subscriptionMenu);
personalAccountMenu.register(paymentsMenu);
settingsMenu.register(countOutputMenu);


//handlers
bot.use(welcomeFeature);
bot.hears("⚙️ Настройки", async (ctx: Context) => {
Expand Down
3 changes: 1 addition & 2 deletions app/bot/keyboards/marketsMenu.keyboard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const marketsMenu = new Menu("marketsMenu").text(
urls !== undefined
) {
await ctx.reply(
`*🔎 Фильтры:*\n\n\n📃Количество объявлений: ${ctx.session.countMaxAds}\n📅 Дата регистрации: ${ctx.session.registrationDate}\n🕜 Дата публикации: ${ctx.session.publishDate}\nКатегории : ${ctx.session.urls}`,
`*🔎 Фильтры:*\n\n\n📃Количество объявлений: ${ctx.session.countMaxAds}\n📅 Дата регистрации: ${ctx.session.registrationDate}\n🕜 Дата публикации: ${ctx.session.publishDate}\nКатегории : ${ctx.session.urls}\n📤Количество для выдачи: ${ctx.session.countOutput}\n`,
{ reply_markup: BeginParse }
);
ctx.session.sbazarStep = "startingSbazar";
Expand All @@ -40,7 +40,6 @@ export const marketsMenu = new Menu("marketsMenu").text(
"*🔎 Запуск поиска объявлений*\n\n📃 *Введите максимально допустимое количество активных объявлений у продавца*\n\n Пример : 10",
{ reply_markup: cancel }
);
await ctx.reply({ reply_markup: marketsMenu });
ctx.session.sbazarStep = "countMaxAds";
}
}
Expand Down
244 changes: 140 additions & 104 deletions app/server/parsers/cbazar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const fetchSearched = async () => {
await sequelize.authenticate();
await sequelize.sync();
const searchedItems = await ShopModel.findAll({ raw: true });

return searchedItems;
};

Expand All @@ -105,27 +106,30 @@ const parsePhone = async (url: string) => {
};

const getOutput = async (tmpItems, searchedItems, values, ctx) => {
const chatId = await ctx.chat.id;
console.log(chatId);
let items = [];
const array = removeDuplicates(
tmpItems
.filter((obj) => {
return (
obj.user?.user_service &&
Date.parse(obj.create_date) / 1000 >=
Math.floor(Date.now() / 1000) - 86400 * values.daysAgo
);
})
);
for (let i = 0; i < array.length; i++) {
for (let j = 0; j < searchedItems.length; j++) {
if (searchedItems[j].shopId.toString() == array[i].user.id.toString())
{

}

let array = removeDuplicates(
tmpItems.filter((obj) => {
return (
obj.user?.user_service &&
Date.parse(obj.create_date) / 1000 >=
Math.floor(Date.now() / 1000) - 86400 * values.daysAgo
);
})
).filter((element) => {
const isMatched = searchedItems.some((searchedItem) => {
return (
element.user?.id == searchedItem.shopId &&
(searchedItem.count > 3 ||
searchedItem.shown.includes(ctx.chat.id.toString()))
);
});
if (isMatched) {
console.log("hieeeeten");
}
}

return !isMatched;
});
for (let i = 0; i < array.length; i++) {
const phone = await parsePhone(
`https://www.sbazar.cz/${array[i].user.user_service.shop_url}/detail/${array[i].seo_name}`
Expand All @@ -137,89 +141,112 @@ const getOutput = async (tmpItems, searchedItems, values, ctx) => {
Date.parse(year) / 1000 >=
Math.floor(Date.now() / 1000) - 31556926 * values.year
) {
// if (ctx.session.onlyWithWA === true) {
// if (phone?.wa) {
// items.push(array[i]);
// await addShop(array[i].user.id, ctx);
// await ctx.replyWithPhoto(
// `${
// array[i].images[0]?.url === ""
// ? "./browser.jpeg"
// : `http:${array[i].images[0]?.url}?fl=exf%7Cres,1024,768,1%7Cwrm,/watermark/sbazar.png,10,10%7Cjpg,80,,1`
// }`,
// {
// caption: `${
// !ctx.session.showTitle
// ? ""
// : `✍️ Название :<code>${array[i].name}</code>`
// }
// ${!ctx.session.showPrice ? "" : `💵Цена :${array[i].price} Kč`}
// ${
// !ctx.session.showOwnerName
// ? ""
// : `👨 Продавец: <code>${array[i].user.user_service.shop_url}</code>`
// }
// <a href=\"https://www.sbazar.cz/
// ${array[i].user.user_service.shop_url}/detail/
// ${array[i].seo_name}\">📌Ссылка на обьявление</a>
// 📞️ Номер:<code>${phone?.number ? phone.number : "номера нет"}</code>
// ☎️Перейти в WhatsApp : ${
// phone?.wa
// ? `<a href=\"https://wa.me/${phone.number}\">WhatsApp</a>`
// : "WA нет"
// }
// 🗂Количество товаров :${count}
// 📅Дата публикации: ${array[i].create_date}
// 📅 Дата регистрации: ${year}`,
// disable_web_page_preview: true,
// parse_mode: "HTML",
// }
// );
// }
// }
// if (ctx.session.onlyWithPhone === true) {
// if (phone?.number != null) {
// items.push(array[i]);
// await addShop(array[i].user.id, ctx);
// await ctx.replyWithPhoto(
// `${
// array[i].images[0]?.url === ""
// ? "https://grammy.dev/Y.png"
// : `http:${array[i].images[0]?.url}?fl=exf%7Cres,1024,768,1%7Cwrm,/watermark/sbazar.png,10,10%7Cjpg,80,,1`
// }`,
// {
// caption: `${
// !ctx.session.showTitle
// ? ""
// : `✍️ Название :<code>${array[i].name}</code>`
// }
// ${!ctx.session.showPrice ? "" : `💵Цена :${array[i].price} Kč`}
// ${
// !ctx.session.showOwnerName
// ? ""
// : `👨 Продавец: <code>${array[i].user.user_service.shop_url}</code>`
// }
// <a href=\"https://www.sbazar.cz/
// ${array[i].user.user_service.shop_url}/detail/
// ${array[i].seo_name}\">📌Ссылка на обьявление</a>
// 📞️ Номер:<code>${phone?.number ? phone.number : "номера нет"}</code>
// ☎️Перейти в WhatsApp : ${
// phone?.wa
// ? `<a href=\"https://wa.me/${phone.number}\">WhatsApp</a>`
// : "WA нет"
// }
// 🗂Количество товаров :${count}
// 📅Дата публикации: ${array[i].create_date}
// 📅 Дата регистрации: ${year}`,
// disable_web_page_preview: true,
// parse_mode: "HTML",
// }
// );
// } else {
// continue;
// }
// }
// else if (!ctx.session.onlyWithWA && !ctx.session.onlyWithPhones) {

if (ctx.session.onlyWithPhone === true) {
if (ctx.session.onlyWithWA === true){
if(phone?.wa){
items.push(array[i]);
await addShop(array[i].user.id, ctx);
try {
await ctx.replyWithPhoto(
`${
array[i].images[0]?.url === ""
? "https://grammy.dev/Y.png"
: `http:${array[i].images[0]?.url}?fl=exf%7Cres,1024,768,1%7Cwrm,/watermark/sbazar.png,10,10%7Cjpg,80,,1`
}`,
{
caption: `${
!ctx.session.showTitle
? ""
: `✍️ Название :<code>${array[i].name}</code>`
}
${!ctx.session.showPrice ? "" : `💵Цена :${array[i].price} Kč`}
${
!ctx.session.showOwnerName
? ""
: `👨 Продавец: <code>${array[i].user.user_service.shop_url}</code>`
}
<a href=\"https://www.sbazar.cz/
${array[i].user.user_service.shop_url}/detail/
${array[i].seo_name}\">📌Ссылка на обьявление</a>
📞️ Номер:<code>${phone?.number ? phone.number : "номера нет"}</code>
☎️Перейти в WhatsApp : ${
phone?.wa
? `<a href=\"https://wa.me/${phone.number}\">WhatsApp</a>`
: "WA нет"
}
🗂Количество товаров :${count}
📅Дата публикации: ${array[i].create_date}
📅 Дата регистрации: ${year}
Показано : ${
!searchedItems.filter((el) => el.shopId == array[i].user.id)[0]?.count
? 0
: searchedItems.filter((el) => el.shopId == array[i].user.id)[0]
.count
} раза
`,

disable_web_page_preview: true,
parse_mode: "HTML",
}
);
} catch (error) {
console.log("photo eblan", error);
}
}
}
if (ctx.session.onlyWithWA === false && phone?.number) {
items.push(array[i]);
await addShop(array[i].user.id, ctx);
try {
await ctx.replyWithPhoto(
`${
array[i].images[0]?.url === ""
? "https://grammy.dev/Y.png"
: `http:${array[i].images[0]?.url}?fl=exf%7Cres,1024,768,1%7Cwrm,/watermark/sbazar.png,10,10%7Cjpg,80,,1`
}`,
{
caption: `${
!ctx.session.showTitle
? ""
: `✍️ Название :<code>${array[i].name}</code>`
}
${!ctx.session.showPrice ? "" : `💵Цена :${array[i].price} Kč`}
${
!ctx.session.showOwnerName
? ""
: `👨 Продавец: <code>${array[i].user.user_service.shop_url}</code>`
}
<a href=\"https://www.sbazar.cz/
${array[i].user.user_service.shop_url}/detail/
${array[i].seo_name}\">📌Ссылка на обьявление</a>
📞️ Номер:<code>${phone?.number ? phone.number : "номера нет"}</code>
☎️Перейти в WhatsApp : ${
phone?.wa
? `<a href=\"https://wa.me/${phone.number}\">WhatsApp</a>`
: "WA нет"
}
🗂Количество товаров :${count}
📅Дата публикации: ${array[i].create_date}
📅 Дата регистрации: ${year}
Показано : ${
!searchedItems.filter((el) => el.shopId == array[i].user.id)[0]?.count
? 0
: searchedItems.filter((el) => el.shopId == array[i].user.id)[0]
.count
} раза
`,

disable_web_page_preview: true,
parse_mode: "HTML",
}
);
} catch (error) {
console.log("photo eblan", error);
}
}
}
else if (!ctx.session.onlyWithWA && !ctx.session.onlyWithPhones) {
items.push(array[i]);
await addShop(array[i].user.id, ctx);
try {
Expand Down Expand Up @@ -252,7 +279,15 @@ const getOutput = async (tmpItems, searchedItems, values, ctx) => {
}
🗂Количество товаров :${count}
📅Дата публикации: ${array[i].create_date}
📅 Дата регистрации: ${year}`,
📅 Дата регистрации: ${year}
Показано : ${
!searchedItems.filter((el) => el.shopId == array[i].user.id)[0]?.count
? 0
: searchedItems.filter((el) => el.shopId == array[i].user.id)[0]
.count
} раза
`,

disable_web_page_preview: true,
parse_mode: "HTML",
}
Expand All @@ -261,7 +296,7 @@ const getOutput = async (tmpItems, searchedItems, values, ctx) => {
console.log("photo eblan", error);
}

// }
}
}
}

Expand Down Expand Up @@ -291,5 +326,6 @@ async function doPostRequest(phone) {
payload
);
let data = res.data;

return data.existsWhatsapp;
}

0 comments on commit 4af278f

Please sign in to comment.