TeamPGM/PagerMaid-Pyro
2
0
Fork 0
mirror of https://github.com/TeamPGM/PagerMaid-Pyro.git synced 2024-11-22 04:39:15 +00:00
Code Issues Actions Projects Releases Wiki Activity

🔖 Update to v1.2.8

Browse Source
This commit is contained in:
xtaodada 2022-09-01 11:04:28 +08:00
parent edf1da1ff9
commit 5ab4f0a54c
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
time: "18:00"
timezone: Asia/Shanghai
open-pull-requests-limit: 10
allow:
- dependency-type: direct
- dependency-type: indirect

2
pagermaid/__init__.py
View File

@ -13,7 +13,7 @@ from pagermaid.scheduler import scheduler
import pyromod.listen import pyromod.listen
from pyrogram import Client from pyrogram import Client
pgm_version = "1.2.7" pgm_version = "1.2.8"
CMD_LIST = {} CMD_LIST = {}
module_dir = __path__[0] module_dir = __path__[0]
working_dir = getcwd() working_dir = getcwd()

19
pagermaid/modules/message.py
View File

@ -60,15 +60,16 @@ async def userid(message: Message):
pass pass
if reply.forward_from_chat: if reply.forward_from_chat:
text += "\n\n**Forward From Channel**\n" \ text += "\n\n**Forward From Channel**\n" \
"id: `" + str(message.forward_from_chat.id) + \ "id: `" + str(reply.forward_from_chat.id) + \
"`\ntitle: `" + message.forward_from_chat.title + "`" "`\ntitle: `" + reply.forward_from_chat.title + "`"
if message.forward_from_chat.username: if reply.forward_from_chat.username:
text += "\nusername: @" + message.forward_from_chat.username text += "\nusername: @" + reply.forward_from_chat.username
text += "\nmessage_id: `" + str(message.forward_from_message_id) + "`" if reply.forward_from_message_id:
if message.forward_sender_name: text += "\nmessage_id: `" + str(reply.forward_from_message_id) + "`"
text += "\npost_author: `" + message.forward_sender_name + "`" if reply.forward_sender_name:
text += "\npost_author: `" + reply.forward_sender_name + "`"
elif reply.forward_from: elif reply.forward_from:
text += "\n\n**Forward From User**\nid: `" + str(message.forward_from.id) + "`" text += "\n\n**Forward From User**\nid: `" + str(reply.forward_from.id) + "`"
try: try:
if reply.forward_from.is_bot: if reply.forward_from.is_bot:
text += f"\nis_bot: {lang('id_is_bot_yes')}" text += f"\nis_bot: {lang('id_is_bot_yes')}"
@ -84,6 +85,8 @@ async def userid(message: Message):
text += "\ndc: `" + str(reply.forward_from.dc_id) + "`" text += "\ndc: `" + str(reply.forward_from.dc_id) + "`"
except AttributeError: except AttributeError:
pass pass
elif reply.forward_sender_name:
text += "\n\n**Forward From User**\nsender_name: `" + str(reply.forward_sender_name) + "`"
await message.edit(text) await message.edit(text)

2
pagermaid/utils.py
View File

@ -45,7 +45,7 @@ async def attach_report(plaintext, file_name, reply_id=None, caption=None):
async def attach_log(plaintext, chat_id, file_name, reply_id=None, caption=None): async def attach_log(plaintext, chat_id, file_name, reply_id=None, caption=None):
""" Attach plaintext as logs. """ """ Attach plaintext as logs. """
with open(file_name, "w+") as file: with open(file_name, "w+", encoding='utf-8') as file:
file.write(plaintext) file.write(plaintext)
await bot.send_document( await bot.send_document(
chat_id, chat_id,

6
requirements.txt
View File

@ -1,4 +1,4 @@
pyrogram==2.0.41 pyrogram==2.0.43
TgCrypto>=1.2.3 TgCrypto>=1.2.3
Pillow>=8.4.0 Pillow>=8.4.0
pytz>=2021.3 pytz>=2021.3
@ -8,7 +8,7 @@ psutil>=5.8.0
httpx httpx
apscheduler apscheduler
sqlitedict sqlitedict
casbin==1.17.0 casbin==1.17.1
mixpanel==4.10.0 mixpanel==4.10.0
mixpanel-py-async mixpanel-py-async
sentry-sdk==1.9.4 sentry-sdk==1.9.6