Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit 22ad5c9

Browse files
InukaAsithᴅɪᴘᴀɴsʜᴜlucifeermorningstarannihilatorrrrAmarnath C
committed
Major Update v2.3.6
Released » @DaisyXBot v2.3.6-H3.0 🙋‍♀️ WHAT'S NEW Admin tools: [+] /invitelink: Create invite links for your group [+] /kickme: Kicks you [+] /banme: bans you [+] /setdescription: Set group description [+] /setsticker: Set group sticker [+] /unmuteall: Unmute all muted members [+] /unbanall: Unban all banned members [+] /kickthefools: Kick inactive members from group (one week) [+] /users: Get users list of group [+] /lowpromote: Promote a member with low rights [+] /midpromote: Promote a member with mid rights [+] /highpromote: Promote a member with max rights [+] /lowdemote: Demote an admin to low permissions [+] /middemote: Demote an admin to mid permissions Stickers: [+] /sticker_id: Get id of a sticker Pinning: [+] /permapin [reply]: Pin a custom message through the bot [+] /unpinall: Unpins all pinned messages. [+] /antichannelpin [yes/no/on/off]: Don't let telegram auto-pin linked channels [+] /cleanlinked [yes/no/on/off]: Delete messages sent by the linked channel. Inline: [+] @DaisyXBot wiki [QUERY] : Search wikipedia [+] @DaisyXBot ping [QUERY] : Check ping rate of bot Restrictions: [+] /globalmode [ON/OFF]: Force Members to speak English [+] /profanity [ON/OFF]: Enable/Disable Slag word cleaning More tools: [+] /getqr: ReadQR [+] /makeqr: make QR [+] /cash: Cash converter [+] /namehistory: Check username history (Beta) [+] /send [MESSAGE]: Send given text by bot. Filters: [+] Added classic filters for those who aren't like /addfilter. Use`/cfilterhelp` to know more 🐞 FIXED Most of the Daisy's bugs are fixed by now. If you found any bug Don't forget to let us know @DaisySupport_official [+] AI chat replies when edited message [+] /banme command not working error [+] Improved speed [+] /q , /quotly command Fixed [+] Locks module completely fixed [+] New and beautified Help menu [+] UI Improvements [+] /afk now recognize replies too (fixed not showing afk message if replied) [+] Music module bugs fixed [+] Added math module back [+] Completely fixed security issues [+] Fixed help menu of Filters module [+] Support Group button of pm menu will take you to support group now Co-Authored-By: ᴅɪᴘᴀɴsʜᴜ <[email protected]> Co-Authored-By: Devil <[email protected]> Co-Authored-By: ÁÑÑÍHÌLÅTØR SPÄRK <[email protected]> Co-Authored-By: Amarnath C <[email protected]> Co-Authored-By: Akshay Rajput <[email protected]>
1 parent eafe100 commit 22ad5c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3905
-1234
lines changed

DaisyX/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,9 @@
7272
BOT_ID = bot_info.id
7373
POSTGRESS_URL = get_str_key("DATABASE_URL", required=True)
7474
TEMP_DOWNLOAD_DIRECTORY = "./"
75+
76+
# Sudo Users
77+
SUDO_USERS = get_str_key("SUDO_USERS", required=True)
78+
79+
# String Session
80+
STRING_SESSION = get_str_key("STRING_SESSION", required=True)

DaisyX/db/mongo_helpers/lockurl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from DaisyX.services.mongo import mongodb as db_x
22

3-
lockurl = db_x["LOCKURL"]
3+
lockurl = db_x["Lockurlp"]
44

55

66
def add_chat(chat_id):

DaisyX/function/inlinehelper.py

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import json
22
import sys
33
from time import time
4-
4+
from random import randint
5+
from pyrogram.raw.functions import Ping
56
import aiohttp
67
from googletrans import Translator
78
from motor import version as mongover
@@ -338,3 +339,36 @@ async def torrent_func(answers, text):
338339
except (KeyError, ValueError):
339340
pass
340341
return answers
342+
343+
async def wiki_func(answers, text):
344+
data = await arq.wiki(text)
345+
msg = f"""
346+
**QUERY:**
347+
{data['title']}
348+
**ANSWER:**
349+
__{data['answer']}__"""
350+
answers.append(
351+
InlineQueryResultArticle(
352+
title=data['title'],
353+
description=data['answer'],
354+
input_message_content=InputTextMessageContent(msg)
355+
)
356+
)
357+
return answers
358+
359+
360+
361+
async def ping_func(answers):
362+
t1 = time()
363+
ping = Ping(ping_id=randint(696969, 6969696))
364+
await app.send(ping)
365+
t2 = time()
366+
ping = f"{str(round((t2 - t1), 2))} Seconds"
367+
answers.append(
368+
InlineQueryResultArticle(
369+
title=ping,
370+
input_message_content=InputTextMessageContent(
371+
f"__**{ping}**__")
372+
)
373+
)
374+
return answers

DaisyX/function/pluginhelpers.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,34 @@ async def member_permissions(chat_id, user_id):
354354
return perms
355355

356356

357+
async def current_chat_permissions(chat_id):
358+
perms = []
359+
perm = (await pbot.get_chat(chat_id)).permissions
360+
if perm.can_send_messages:
361+
perms.append("can_send_messages")
362+
if perm.can_send_media_messages:
363+
perms.append("can_send_media_messages")
364+
if perm.can_send_stickers:
365+
perms.append("can_send_stickers")
366+
if perm.can_send_animations:
367+
perms.append("can_send_animations")
368+
if perm.can_send_games:
369+
perms.append("can_send_games")
370+
if perm.can_use_inline_bots:
371+
perms.append("can_use_inline_bots")
372+
if perm.can_add_web_page_previews:
373+
perms.append("can_add_web_page_previews")
374+
if perm.can_send_polls:
375+
perms.append("can_send_polls")
376+
if perm.can_change_info:
377+
perms.append("can_change_info")
378+
if perm.can_invite_users:
379+
perms.append("can_invite_users")
380+
if perm.can_pin_messages:
381+
perms.append("can_pin_messages")
382+
383+
return perms
384+
357385
# URL LOCK
358386

359387

DaisyX/function/readme.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Here we define functions
2+
3+
## Essentials
4+
### Importing Pyrogram admin check
5+
```python3
6+
from DaisyX.function.pluginhelpers import admins_only
7+
8+
@admins_only
9+
```
10+
11+
### Getting text from cmd
12+
```python3
13+
from DaisyX.function.pluginhelpers import get_text
14+
15+
async def hi(client,message):
16+
args = get_text(message)
17+
```
18+
19+
### Edit or reply
20+
```python3
21+
from DaisyX.function.pluginhelpers import edit_or_reply
22+
23+
async def hi(client,message):
24+
await edit_or_reply("Hi")
25+
```

DaisyX/localization/en.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ STRINGS:
196196
btn_lang: "🇺🇸 Language"
197197
btn_channel: "🙋‍♀️ Daisy News"
198198
btn_group_help: "Click me for help!"
199-
back: Back
199+
back: "🏃‍♂️ Back"
200200

201201
# /help
202202
help_header: "Hi Boss! I'm <b>Daisy</b>. An anime themed super powerful group management bot with many handy tools. So why are you waiting. Let me to assist you"

DaisyX/modules/AI_Chat.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,16 @@ async def hmm(_, message):
120120

121121

122122
@daisyx.on_message(
123-
filters.text & filters.reply & ~filters.bot & ~filters.via_bot & ~filters.forwarded,
123+
filters.text & filters.reply & ~filters.bot & ~filters.edited & ~filters.via_bot & ~filters.forwarded,
124124
group=2,
125125
)
126126
async def hmm(client, message):
127127
if not get_session(int(message.chat.id)):
128-
message.continue_propagation()
128+
return
129+
if not message.reply_to_message:
130+
return
129131
if message.reply_to_message.from_user.id != BOT_ID:
130-
message.continue_propagation()
132+
return
131133
msg = message.text
132134
chat_id = message.chat.id
133135
if msg.startswith("/") or msg.startswith("@"):
@@ -188,7 +190,7 @@ async def hmm(client, message):
188190
else:
189191
rm = msg
190192
# print (rm)
191-
lan = translator.detect(rm)
193+
lan = translator.detect(rm)
192194
test = rm
193195
if not "en" in lan and not lan == "":
194196
test = translator.translate(test, lang_tgt="en")
@@ -225,7 +227,7 @@ async def hmm(client, message):
225227
print(e)
226228

227229

228-
@daisyx.on_message(filters.text & filters.private & filters.reply & ~filters.bot)
230+
@daisyx.on_message(filters.text & filters.private & ~filters.edited & filters.reply & ~filters.bot)
229231
async def inuka(client, message):
230232
msg = message.text
231233
if msg.startswith("/") or msg.startswith("@"):
@@ -258,7 +260,7 @@ async def inuka(client, message):
258260
else:
259261
rm = msg
260262
# print (rm)
261-
lan = translator.detect(rm)
263+
lan = translator.detect(rm)
262264
test = rm
263265
if not "en" in lan and not lan == "":
264266
test = translator.translate(test, lang_tgt="en")
@@ -302,6 +304,7 @@ async def inuka(client, message):
302304
& ~filters.forwarded
303305
& ~filters.reply
304306
& ~filters.channel
307+
& ~filters.edited
305308
)
306309
async def inuka(client, message):
307310
msg = message.text
@@ -335,7 +338,7 @@ async def inuka(client, message):
335338
else:
336339
rm = msg
337340
# print (rm)
338-
lan = translator.detect(rm)
341+
lan = translator.detect(rm)
339342
test = rm
340343
if not "en" in lan and not lan == "":
341344
test = translator.translate(test, lang_tgt="en")
@@ -379,18 +382,11 @@ async def inuka(client, message):
379382
* DaisyAI can detect and reply upto 200 languages by now *
380383
- /chatbot EN : Enables English only chatbot
381384
382-
<b> Lydia </b>
383-
<i> PRESENTING DAISY'S LYDIA, EXCLUSIVE CHAT FEATURE DETECT UPTO 200 LANGUAGES & REPLY USING LYDIA AI</i>
384-
- /addlydia: Activates lydia on your group
385-
* Daisy AI can detect and reply upto 200 languages by now *
386-
- /enlydia : Enables English only chat AI
387-
- /rmlydia : Deactivates lydia on your group (UNSTABLE)
388385
389386
<b> Assistant </b>
390387
- /ask <i>question</i>: Ask question from daisy
391388
- /ask <i> reply to voice note</i>: Get voice reply
392389
393-
<i> Lydia AI can be unstable sometimes </i>
394390
"""
395391

396392
__mod_name__ = "AI Assistant"

DaisyX/modules/UrlLock.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,4 @@ async def hi(client, message):
8888
message.continue_propagation()
8989

9090

91-
__mod_name__ = "URL Block"
92-
__help__ = """
93-
<b> Block links sent by users in your group </b>
9491

95-
- /urllock [on/off]: Enable/Disable URL Lock
96-
97-
"""

DaisyX/modules/_webss.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,31 @@
22
# All Credit to WilliamButcherBot.
33

44

5-
import time
6-
75
from pyrogram import filters
86

97
from DaisyX.function.pluginhelpers import admins_only, fetch
108
from DaisyX.services.pyrogram import pbot as app
119

1210

13-
@app.on_message(filters.command("webss") & ~filters.edited & ~filters.bot)
11+
12+
13+
14+
15+
@app.on_message(filters.command("webss"))
1416
@admins_only
1517
async def take_ss(_, message):
1618
if len(message.command) != 2:
1719
await message.reply_text("Give A Url To Fetch Screenshot.")
1820
return
1921
url = message.text.split(None, 1)[1]
20-
start_time = time.time()
2122
m = await message.reply_text("**Taking Screenshot**")
22-
screenshot = await fetch(f"https://patheticprogrammers.cf/ss?site={url}")
2323
await m.edit("**Uploading**")
24-
end_time = time.time()
25-
await app.send_photo(
26-
message.chat.id,
27-
photo=screenshot["url"],
28-
caption=(f"{url}\n__Took {round(end_time - start_time)} Seconds.__"),
29-
)
24+
try:
25+
await app.send_photo(
26+
message.chat.id,
27+
photo=f"https://webshot.amanoteam.com/print?q={url}",
28+
)
29+
except TypeError:
30+
await m.edit("No Such Website.")
31+
return
3032
await m.delete()

0 commit comments

Comments
 (0)