yasirarism/pyrofork
1
0
Fork 0
mirror of https://github.com/Mayuri-Chan/pyrofork.git synced 2026-01-03 14:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pyrofork: Refactor ShippingQuery

Browse source 
Signed-off-by: wulan17 <wulan17@nusantararom.org>
This commit is contained in:
wulan17 2025-03-26 22:29:03 +07:00
parent bf3dba50ee
commit af228e50c7
No known key found for this signature in database
GPG key ID: 318CD6CD3A6AC0A5
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pyrogram/types/business/pre_checkout_query.py
View file

@ -17,14 +17,11 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrofork. If not, see <http://www.gnu.org/licenses/>. # along with Pyrofork. If not, see <http://www.gnu.org/licenses/>.
from typing import Union, List, Match, Optional
import pyrogram import pyrogram
from pyrogram import raw, enums from pyrogram import raw, types
from pyrogram import types
from ..object import Object from ..object import Object
from ..update import Update from ..update import Update
from ... import utils
class PreCheckoutQuery(Object, Update): class PreCheckoutQuery(Object, Update):
@ -76,7 +73,11 @@ class PreCheckoutQuery(Object, Update):
self.payment_info = payment_info self.payment_info = payment_info
@staticmethod @staticmethod
async def _parse(client: "pyrogram.Client", pre_checkout_query, users) -> "PreCheckoutQuery": async def _parse(
client: "pyrogram.Client",
pre_checkout_query: "raw.types.UpdateBotPrecheckoutQuery",
users
) -> "PreCheckoutQuery":
# Try to decode pre-checkout query payload into string. If that fails, fallback to bytes instead of decoding by # Try to decode pre-checkout query payload into string. If that fails, fallback to bytes instead of decoding by
# ignoring/replacing errors, this way, button clicks will still work. # ignoring/replacing errors, this way, button clicks will still work.
try: try:

1
pyrogram/types/business/shipping_option.py
View file

@ -1,5 +1,6 @@
# Pyrogram - Telegram MTProto API Client Library for Python # Pyrogram - Telegram MTProto API Client Library for Python
# Copyright (C) 2017-present Dan <https://github.com/delivrance> # Copyright (C) 2017-present Dan <https://github.com/delivrance>
# Copyright (C) 2022-present Mayuri-Chan <https://github.com/Mayuri-Chan>
# #
# This file is part of Pyrogram. # This file is part of Pyrogram.
# #

26
pyrogram/types/business/shipping_query.py
View file

@ -1,5 +1,6 @@
# Pyrogram - Telegram MTProto API Client Library for Python # Pyrogram - Telegram MTProto API Client Library for Python
# Copyright (C) 2017-present Dan <https://github.com/delivrance> # Copyright (C) 2017-present Dan <https://github.com/delivrance>
# Copyright (C) 2022-present Mayuri-Chan <https://github.com/Mayuri-Chan>
# #
# This file is part of Pyrogram. # This file is part of Pyrogram.
# #
@ -16,8 +17,6 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
from typing import Union, Optional
import pyrogram import pyrogram
from pyrogram import raw, types from pyrogram import raw, types
@ -49,14 +48,14 @@ class ShippingQuery(Object, Update):
client: "pyrogram.Client" = None, client: "pyrogram.Client" = None,
id: str, id: str,
from_user: "types.User", from_user: "types.User",
invoice_payload: str, payload: str,
shipping_address: "types.ShippingAddress" = None shipping_address: "types.ShippingAddress" = None
): ):
super().__init__(client) super().__init__(client)
self.id = id self.id = id
self.from_user = from_user self.from_user = from_user
self.invoice_payload = invoice_payload self.payload = payload
self.shipping_address = shipping_address self.shipping_address = shipping_address
@staticmethod @staticmethod
@ -72,19 +71,12 @@ class ShippingQuery(Object, Update):
except (UnicodeDecodeError, AttributeError): except (UnicodeDecodeError, AttributeError):
payload = shipping_query.payload payload = shipping_query.payload
return types.PreCheckoutQuery( return ShippingQuery(
id=str(shipping_query.query_id), client=client,
from_user=types.User._parse(client, users[shipping_query.user_id]), id=shipping_query.query_id,
invoice_payload=payload, from_user=types.User._parse(client, shipping_query.user_id, users),
shipping_address=types.ShippingAddress( payload=payload,
country_code=shipping_query.shipping_address.country_iso2, shipping_address=types.ShippingAddress._parse(client, shipping_query.shipping_address)
state=shipping_query.shipping_address.state,
city=shipping_query.shipping_address.city,
street_line1=shipping_query.shipping_address.street_line1,
street_line2=shipping_query.shipping_address.street_line2,
post_code=shipping_query.shipping_address.post_code
),
client=client
) )
async def answer( async def answer(