profitroll/TelegramPoster
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Improved naming

Browse Source
This commit is contained in:
Profitroll
2023-10-15 18:14:22 +02:00
parent c4d31c955f
commit a0616ff285
9 changed files with 201 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/commands/general.py
View File

@@ -15,14 +15,14 @@ from modules.utils import USERS_WITH_CONTEXT
@Client.on_message(
~filters.scheduled & filters.command(["shutdown"], prefixes=["", "/"])
)
async def cmd_kill(app: PyroClient, msg: Message):
if msg.from_user.id not in app.admins:
async def cmd_kill(app: PyroClient, message: Message):
if message.from_user.id not in app.admins:
return
user = await app.find_user(msg.from_user)
user = await app.find_user(message.from_user)
if len(USERS_WITH_CONTEXT) > 0:
await msg.reply_text(
await message.reply_text(
app._("shutdown_confirm", "message", locale=user.locale).format(
len(USERS_WITH_CONTEXT)
),

12
plugins/commands/mode_submit.py
View File

@@ -11,13 +11,13 @@ from modules import custom_filters
& ~filters.scheduled
& filters.command(["start"], prefixes="/")
)
async def cmd_start(app: PyroClient, msg: Message):
user = await app.find_user(msg.from_user)
async def cmd_start(app: PyroClient, message: Message):
user = await app.find_user(message.from_user)
if user.banned:
return
await msg.reply_text(app._("start", "message", locale=user.locale))
await message.reply_text(app._("start", "message", locale=user.locale))
@Client.on_message(
@@ -25,10 +25,10 @@ async def cmd_start(app: PyroClient, msg: Message):
& ~filters.scheduled
& filters.command(["rules", "help"], prefixes="/")
)
async def cmd_rules(app: PyroClient, msg: Message):
user = await app.find_user(msg.from_user)
async def cmd_rules(app: PyroClient, message: Message):
user = await app.find_user(message.from_user)
if user.banned:
return
await msg.reply_text(app._("rules", "message", locale=user.locale))
await message.reply_text(app._("rules", "message", locale=user.locale))

62
plugins/commands/photos.py
View File

@@ -37,27 +37,27 @@ logger = logging.getLogger(__name__)
@Client.on_message(~filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
async def cmd_import(app: PyroClient, msg: Message):
if msg.from_user.id not in app.admins:
async def cmd_import(app: PyroClient, message: Message):
if message.from_user.id not in app.admins:
return
global USERS_WITH_CONTEXT
if msg.from_user.id not in USERS_WITH_CONTEXT:
USERS_WITH_CONTEXT.append(msg.from_user.id)
if message.from_user.id not in USERS_WITH_CONTEXT:
USERS_WITH_CONTEXT.append(message.from_user.id)
else:
return
user = await app.find_user(msg.from_user)
user = await app.find_user(message.from_user)
await msg.reply_text(app._("import_request", "message", locale=user.locale))
await message.reply_text(app._("import_request", "message", locale=user.locale))
answer = await listen_message(app, msg.chat.id, timeout=600)
answer = await listen_message(app, message.chat.id, timeout=600)
USERS_WITH_CONTEXT.remove(msg.from_user.id)
USERS_WITH_CONTEXT.remove(message.from_user.id)
if answer is None:
await msg.reply_text(
await message.reply_text(
app._("import_ignored", "message", locale=user.locale),
quote=True,
)
@@ -86,7 +86,7 @@ async def cmd_import(app: PyroClient, msg: Message):
return
if disk_usage(getcwd())[2] < (answer.document.file_size) * 3:
await msg.reply_text(
await message.reply_text(
app._("import_too_big", "message", locale=user.locale).format(
answer.document.file_size // (2**30),
disk_usage(getcwd())[2] // (2**30),
@@ -172,7 +172,7 @@ async def cmd_import(app: PyroClient, msg: Message):
Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
exc,
)
await msg.reply_text(
await message.reply_text(
app._(
"import_upload_error_other",
"message",
@@ -193,7 +193,7 @@ async def cmd_import(app: PyroClient, msg: Message):
)
if len(uploaded_dict["duplicates"]) > 0:
await msg.reply_text(
await message.reply_text(
app._(
"import_upload_error_duplicate",
"message",
@@ -202,7 +202,7 @@ async def cmd_import(app: PyroClient, msg: Message):
disable_notification=True,
)
else:
await msg.reply_text(
await message.reply_text(
app._(
"import_upload_error_other",
"message",
@@ -235,35 +235,35 @@ async def cmd_import(app: PyroClient, msg: Message):
@Client.on_message(~filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
async def cmd_export(app: PyroClient, msg: Message):
if msg.from_user.id not in app.admins:
async def cmd_export(app: PyroClient, message: Message):
if message.from_user.id not in app.admins:
return
@Client.on_message(~filters.scheduled & filters.command(["remove"], prefixes=["", "/"]))
async def cmd_remove(app: PyroClient, msg: Message):
if msg.from_user.id not in app.admins:
async def cmd_remove(app: PyroClient, message: Message):
if message.from_user.id not in app.admins:
return
global USERS_WITH_CONTEXT
if msg.from_user.id not in USERS_WITH_CONTEXT:
USERS_WITH_CONTEXT.append(msg.from_user.id)
if message.from_user.id not in USERS_WITH_CONTEXT:
USERS_WITH_CONTEXT.append(message.from_user.id)
else:
return
user = await app.find_user(msg.from_user)
user = await app.find_user(message.from_user)
await msg.reply_text(app._("remove_request", "message", locale=user.locale))
await message.reply_text(app._("remove_request", "message", locale=user.locale))
answer_id = await app.listen.Message(
filters.text & ~filters.me, id=filters.user(msg.from_user.id), timeout=600
filters.text & ~filters.me, id=filters.user(message.from_user.id), timeout=600
)
USERS_WITH_CONTEXT.remove(msg.from_user.id)
USERS_WITH_CONTEXT.remove(message.from_user.id)
if answer_id is None:
await msg.reply_text(
await message.reply_text(
app._("remove_ignored", "message", locale=user.locale),
quote=True,
)
@@ -273,7 +273,7 @@ async def cmd_remove(app: PyroClient, msg: Message):
await answer_id.reply_text(app._("remove_abort", "message", locale=user.locale))
return
await msg.reply_text(
await message.reply_text(
app._("remove_kind", "message", locale=user.locale),
reply_markup=ReplyKeyboardMarkup(
[
@@ -287,16 +287,16 @@ async def cmd_remove(app: PyroClient, msg: Message):
),
)
USERS_WITH_CONTEXT.append(msg.from_user.id)
USERS_WITH_CONTEXT.append(message.from_user.id)
answer_kind = await app.listen.Message(
filters.text & ~filters.me, id=filters.user(msg.from_user.id), timeout=600
filters.text & ~filters.me, id=filters.user(message.from_user.id), timeout=600
)
USERS_WITH_CONTEXT.remove(msg.from_user.id)
USERS_WITH_CONTEXT.remove(message.from_user.id)
if answer_kind is None:
await msg.reply_text(
await message.reply_text(
app._("remove_ignored", "message", locale=user.locale),
quote=True,
reply_markup=ReplyKeyboardRemove(),
@@ -355,6 +355,6 @@ async def cmd_remove(app: PyroClient, msg: Message):
@Client.on_message(~filters.scheduled & filters.command(["purge"], prefixes=["", "/"]))
async def cmd_purge(app: PyroClient, msg: Message):
if msg.from_user.id not in app.admins:
async def cmd_purge(app: PyroClient, message: Message):
if message.from_user.id not in app.admins:
return

19
plugins/commands/report.py
View File

@@ -14,24 +14,25 @@ from modules import custom_filters
& filters.reply
& filters.command(["report"], prefixes=["", "/"])
)
async def command_report(app: PyroClient, msg: Message):
if msg.reply_to_message.forward_from_chat.id != app.config["posting"]["channel"]:
async def command_report(app: PyroClient, message: Message):
if (
message.reply_to_message.forward_from_chat.id
!= app.config["posting"]["channel"]
):
return
user = await app.find_user(msg.from_user)
user = await app.find_user(message.from_user)
await msg.reply_text(
await message.reply_text(
app._(
"report_sent",
"message",
locale=user.locale if msg.from_user is not None else None,
locale=user.locale if message.from_user is not None else None,
)
)
print(msg)
report_sent = await msg.reply_to_message.forward(app.owner)
sender = msg.from_user if msg.from_user is not None else msg.sender_chat
report_sent = await message.reply_to_message.forward(app.owner)
sender = message.from_user if message.from_user is not None else message.sender_chat
sender_name = sender.first_name if isinstance(sender, User) else sender.title