From 90f9a605de16fd07b57a9899bbbae424949e80a9 Mon Sep 17 00:00:00 2001 From: dolfies Date: Sat, 25 Mar 2023 22:12:29 -0400 Subject: [PATCH] Rename appinfo.py -> application.py --- discord/__init__.py | 2 +- discord/{appinfo.py => application.py} | 2 +- discord/client.py | 2 +- discord/commands.py | 2 +- discord/guild.py | 2 +- discord/http.py | 95 ++++++++++---------- discord/integrations.py | 2 +- discord/invite.py | 4 +- discord/library.py | 4 +- discord/modal.py | 2 +- discord/profile.py | 2 +- discord/state.py | 4 +- discord/store.py | 6 +- discord/team.py | 6 +- discord/types/{appinfo.py => application.py} | 0 discord/types/gateway.py | 2 +- discord/types/integration.py | 2 +- discord/types/invite.py | 2 +- discord/types/library.py | 2 +- discord/types/store.py | 2 +- 20 files changed, 73 insertions(+), 72 deletions(-) rename discord/{appinfo.py => application.py} (99%) rename discord/types/{appinfo.py => application.py} (100%) diff --git a/discord/__init__.py b/discord/__init__.py index be511f555..9872f72ce 100644 --- a/discord/__init__.py +++ b/discord/__init__.py @@ -22,7 +22,7 @@ from typing import Literal, NamedTuple from . import abc as abc, opus as opus, utils as utils from .activity import * from .affinity import * -from .appinfo import * +from .application import * from .asset import * from .audit_logs import * from .billing import * diff --git a/discord/appinfo.py b/discord/application.py similarity index 99% rename from discord/appinfo.py rename to discord/application.py index 9a51cc8b7..a61374a06 100644 --- a/discord/appinfo.py +++ b/discord/application.py @@ -78,7 +78,7 @@ if TYPE_CHECKING: from .metadata import MetadataObject from .state import ConnectionState from .store import ContentRating - from .types.appinfo import ( + from .types.application import ( EULA as EULAPayload, Achievement as AchievementPayload, ActivityStatistics as ActivityStatisticsPayload, diff --git a/discord/client.py b/discord/client.py index e806081ed..7f8a92900 100644 --- a/discord/client.py +++ b/discord/client.py @@ -71,7 +71,7 @@ from .utils import MISSING from .object import Object, OLDEST_OBJECT from .backoff import ExponentialBackoff from .webhook import Webhook -from .appinfo import Application, ApplicationActivityStatistics, Company, EULA, PartialApplication +from .application import Application, ApplicationActivityStatistics, Company, EULA, PartialApplication from .stage_instance import StageInstance from .threads import Thread from .sticker import GuildSticker, StandardSticker, StickerPack, _sticker_factory diff --git a/discord/commands.py b/discord/commands.py index ec54dee5a..80b5ee0ae 100644 --- a/discord/commands.py +++ b/discord/commands.py @@ -34,7 +34,7 @@ from .utils import _generate_nonce, _get_as_snowflake if TYPE_CHECKING: from .abc import Messageable, Snowflake - from .appinfo import IntegrationApplication + from .application import IntegrationApplication from .file import File from .guild import Guild from .interactions import Interaction diff --git a/discord/guild.py b/discord/guild.py index 5d56dae9c..6f618430a 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -89,7 +89,7 @@ from .object import OLDEST_OBJECT, Object from .profile import MemberProfile from .partial_emoji import PartialEmoji from .welcome_screen import * -from .appinfo import PartialApplication +from .application import PartialApplication from .guild_premium import PremiumGuildSubscription from .entitlements import Entitlement diff --git a/discord/http.py b/discord/http.py index 1eaf9aa9f..7abaa1743 100644 --- a/discord/http.py +++ b/discord/http.py @@ -53,6 +53,8 @@ import weakref import aiohttp +from .types import application + from .enums import RelationshipAction, InviteType from .errors import HTTPException, Forbidden, NotFound, LoginFailure, DiscordServerError, CaptchaRequired from .file import File @@ -85,7 +87,6 @@ if TYPE_CHECKING: from .embeds import Embed from .types import ( - appinfo, audit_log, billing, channel, @@ -2362,15 +2363,15 @@ class HTTPClient: # Applications / Store - def get_my_applications(self, *, with_team_applications: bool = True) -> Response[List[appinfo.Application]]: + def get_my_applications(self, *, with_team_applications: bool = True) -> Response[List[application.Application]]: params = {'with_team_applications': str(with_team_applications).lower()} return self.request(Route('GET', '/applications'), params=params) - def get_my_application(self, app_id: Snowflake) -> Response[appinfo.Application]: + def get_my_application(self, app_id: Snowflake) -> Response[application.Application]: return self.request(Route('GET', '/applications/{app_id}', app_id=app_id), super_properties_to_track=True) - def edit_application(self, app_id: Snowflake, payload: dict) -> Response[appinfo.Application]: + def edit_application(self, app_id: Snowflake, payload: dict) -> Response[application.Application]: return self.request( Route('PATCH', '/applications/{app_id}', app_id=app_id), super_properties_to_track=True, json=payload ) @@ -2378,24 +2379,24 @@ class HTTPClient: def delete_application(self, app_id: Snowflake) -> Response[None]: return self.request(Route('POST', '/applications/{app_id}/delete', app_id=app_id), super_properties_to_track=True) - def transfer_application(self, app_id: Snowflake, team_id: Snowflake) -> Response[appinfo.Application]: + def transfer_application(self, app_id: Snowflake, team_id: Snowflake) -> Response[application.Application]: payload = {'team_id': team_id} return self.request( Route('POST', '/applications/{app_id}/transfer', app_id=app_id), json=payload, super_properties_to_track=True ) - def get_partial_application(self, app_id: Snowflake) -> Response[appinfo.PartialApplication]: + def get_partial_application(self, app_id: Snowflake) -> Response[application.PartialApplication]: return self.request(Route('GET', '/oauth2/applications/{app_id}/rpc', app_id=app_id)) - def get_public_application(self, app_id: Snowflake, with_guild: bool = False) -> Response[appinfo.PartialApplication]: + def get_public_application(self, app_id: Snowflake, with_guild: bool = False) -> Response[application.PartialApplication]: params = {'with_guild': str(with_guild).lower()} return self.request(Route('GET', '/applications/{app_id}/public', app_id=app_id), params=params) - def get_public_applications(self, app_ids: Sequence[Snowflake]) -> Response[List[appinfo.PartialApplication]]: + def get_public_applications(self, app_ids: Sequence[Snowflake]) -> Response[List[application.PartialApplication]]: return self.request(Route('GET', '/applications/public'), params={'application_ids': app_ids}) - def create_app(self, name: str, team_id: Optional[Snowflake] = None) -> Response[appinfo.Application]: + def create_app(self, name: str, team_id: Optional[Snowflake] = None) -> Response[application.Application]: payload = {'name': name, team_id: team_id} return self.request(Route('POST', '/applications'), json=payload) @@ -2524,12 +2525,12 @@ class HTTPClient: def create_sku(self, payload: dict) -> Response[store.SKU]: return self.request(Route('POST', '/store/skus'), json=payload, super_properties_to_track=True) - def get_app_discoverability(self, app_id: Snowflake) -> Response[appinfo.ApplicationDiscoverability]: + def get_app_discoverability(self, app_id: Snowflake) -> Response[application.ApplicationDiscoverability]: return self.request( Route('GET', '/applications/{app_id}/discoverability-state', app_id=app_id), super_properties_to_track=True ) - def get_embedded_activity_config(self, app_id: Snowflake) -> Response[appinfo.EmbeddedActivityConfig]: + def get_embedded_activity_config(self, app_id: Snowflake) -> Response[application.EmbeddedActivityConfig]: return self.request( Route('GET', '/applications/{app_id}/embedded-activity-config', app_id=app_id), super_properties_to_track=True ) @@ -2541,7 +2542,7 @@ class HTTPClient: supported_platforms: Optional[List[str]] = None, orientation_lock_state: Optional[int] = None, preview_video_asset_id: Optional[Snowflake] = MISSING, - ) -> Response[appinfo.EmbeddedActivityConfig]: + ) -> Response[application.EmbeddedActivityConfig]: payload = {} if supported_platforms is not None: payload['supported_platforms'] = supported_platforms @@ -2556,12 +2557,12 @@ class HTTPClient: super_properties_to_track=True, ) - def get_app_whitelisted(self, app_id: Snowflake) -> Response[List[appinfo.WhitelistedUser]]: + def get_app_whitelisted(self, app_id: Snowflake) -> Response[List[application.WhitelistedUser]]: return self.request( Route('GET', '/oauth2/applications/{app_id}/allowlist', app_id=app_id), super_properties_to_track=True ) - def add_app_whitelist(self, app_id: Snowflake, username: str, discriminator: str) -> Response[appinfo.WhitelistedUser]: + def add_app_whitelist(self, app_id: Snowflake, username: str, discriminator: str) -> Response[application.WhitelistedUser]: payload = {'username': username, 'discriminator': discriminator} return self.request( @@ -2576,15 +2577,15 @@ class HTTPClient: super_properties_to_track=True, ) - def get_app_assets(self, app_id: Snowflake) -> Response[List[appinfo.Asset]]: + def get_app_assets(self, app_id: Snowflake) -> Response[List[application.Asset]]: return self.request(Route('GET', '/oauth2/applications/{app_id}/assets', app_id=app_id)) - def get_store_assets(self, app_id: Snowflake) -> Response[List[appinfo.StoreAsset]]: + def get_store_assets(self, app_id: Snowflake) -> Response[List[application.StoreAsset]]: return self.request( Route('GET', '/store/applications/{app_id}/assets', app_id=app_id), super_properties_to_track=True ) - def create_asset(self, app_id: Snowflake, name: str, type: int, image: str) -> Response[appinfo.Asset]: + def create_asset(self, app_id: Snowflake, name: str, type: int, image: str) -> Response[application.Asset]: payload = {'name': name, 'type': type, 'image': image} return self.request( @@ -2593,7 +2594,7 @@ class HTTPClient: super_properties_to_track=True, ) - def create_store_asset(self, app_id: Snowflake, file: File) -> Response[appinfo.StoreAsset]: + def create_store_asset(self, app_id: Snowflake, file: File) -> Response[application.StoreAsset]: initial_bytes = file.fp.read(16) try: @@ -2652,7 +2653,7 @@ class HTTPClient: def delete_team(self, team_id: Snowflake) -> Response[None]: return self.request(Route('POST', '/teams/{team_id}/delete', team_id=team_id), super_properties_to_track=True) - def get_team_applications(self, team_id: Snowflake) -> Response[List[appinfo.Application]]: + def get_team_applications(self, team_id: Snowflake) -> Response[List[application.Application]]: return self.request(Route('GET', '/teams/{team_id}/applications', team_id=team_id), super_properties_to_track=True) def get_team_members(self, team_id: Snowflake) -> Response[List[team.TeamMember]]: @@ -2671,14 +2672,14 @@ class HTTPClient: super_properties_to_track=True, ) - def create_team_company(self, team_id: Snowflake, name: str) -> Response[appinfo.Company]: + def create_team_company(self, team_id: Snowflake, name: str) -> Response[application.Company]: payload = {'name': name} return self.request( Route('POST', '/teams/{team_id}/companies', team_id=team_id), json=payload, super_properties_to_track=True ) - def search_companies(self, query: str) -> Response[List[appinfo.Company]]: + def search_companies(self, query: str) -> Response[List[application.Company]]: # This endpoint 204s without a query? params = {'query': query} data = self.request(Route('GET', '/companies'), params=params, super_properties_to_track=True) @@ -2719,7 +2720,7 @@ class HTTPClient: def reset_bot_token(self, app_id: Snowflake) -> Response[dict]: return self.request(Route('POST', '/applications/{app_id}/bot/reset', app_id=app_id), super_properties_to_track=True) - def get_detectable_applications(self) -> Response[List[appinfo.PartialApplication]]: + def get_detectable_applications(self) -> Response[List[application.PartialApplication]]: return self.request(Route('GET', '/applications/detectable')) def get_guild_applications( @@ -2729,7 +2730,7 @@ class HTTPClient: type: Optional[int] = None, include_team: bool = False, channel_id: Optional[Snowflake] = None, - ) -> Response[List[appinfo.PartialApplication]]: + ) -> Response[List[application.PartialApplication]]: params = {} if type is not None: params['type'] = type @@ -2740,36 +2741,36 @@ class HTTPClient: return self.request(Route('GET', '/guilds/{guild_id}/applications', guild_id=guild_id), params=params) - def get_app_ticket(self, app_id: Snowflake, test_mode: bool = False) -> Response[appinfo.Ticket]: + def get_app_ticket(self, app_id: Snowflake, test_mode: bool = False) -> Response[application.Ticket]: payload = {'test_mode': test_mode} return self.request(Route('POST', '/users/@me/applications/{app_id}/ticket', app_id=app_id), json=payload) - def get_app_entitlement_ticket(self, app_id: Snowflake, test_mode: bool = False) -> Response[appinfo.Ticket]: + def get_app_entitlement_ticket(self, app_id: Snowflake, test_mode: bool = False) -> Response[application.Ticket]: payload = {'test_mode': test_mode} return self.request( Route('POST', '/users/@me/applications/{app_id}/entitlement-ticket', app_id=app_id), json=payload ) - def get_app_activity_statistics(self, app_id: Snowflake) -> Response[List[appinfo.ActivityStatistics]]: + def get_app_activity_statistics(self, app_id: Snowflake) -> Response[List[application.ActivityStatistics]]: return self.request(Route('GET', '/activities/statistics/applications/{app_id}', app_id=app_id)) - def get_activity_statistics(self) -> Response[List[appinfo.ActivityStatistics]]: + def get_activity_statistics(self) -> Response[List[application.ActivityStatistics]]: return self.request(Route('GET', '/users/@me/activities/statistics/applications')) - def get_global_activity_statistics(self) -> Response[List[appinfo.GlobalActivityStatistics]]: + def get_global_activity_statistics(self) -> Response[List[application.GlobalActivityStatistics]]: return self.request(Route('GET', '/activities')) - def get_app_manifest_labels(self, app_id: Snowflake) -> Response[List[appinfo.ManifestLabel]]: + def get_app_manifest_labels(self, app_id: Snowflake) -> Response[List[application.ManifestLabel]]: return self.request( Route('GET', '/applications/{app_id}/manifest-labels', app_id=app_id), super_properties_to_track=True ) - def get_app_branches(self, app_id: Snowflake) -> Response[List[appinfo.Branch]]: + def get_app_branches(self, app_id: Snowflake) -> Response[List[application.Branch]]: return self.request(Route('GET', '/applications/{app_id}/branches', app_id=app_id)) - def create_app_branch(self, app_id: Snowflake, name: str) -> Response[appinfo.Branch]: + def create_app_branch(self, app_id: Snowflake, name: str) -> Response[application.Branch]: payload = {'name': name} return self.request(Route('POST', '/applications/{app_id}/branches', app_id=app_id), json=payload) @@ -2779,12 +2780,12 @@ class HTTPClient: Route('DELETE', '/applications/{app_id}/branches/{branch_id}', app_id=app_id, branch_id=branch_id) ) - def get_branch_builds(self, app_id: Snowflake, branch_id: Snowflake) -> Response[List[appinfo.Build]]: + def get_branch_builds(self, app_id: Snowflake, branch_id: Snowflake) -> Response[List[application.Build]]: return self.request( Route('GET', '/applications/{app_id}/branches/{branch_id}/builds', app_id=app_id, branch_id=branch_id) ) - def get_branch_build(self, app_id: Snowflake, branch_id: Snowflake, build_id: Snowflake) -> Response[appinfo.Build]: + def get_branch_build(self, app_id: Snowflake, branch_id: Snowflake, build_id: Snowflake) -> Response[application.Build]: return self.request( Route( 'GET', @@ -2795,26 +2796,26 @@ class HTTPClient: ) ) - def get_latest_branch_build(self, app_id: Snowflake, branch_id: Snowflake) -> Response[appinfo.Build]: + def get_latest_branch_build(self, app_id: Snowflake, branch_id: Snowflake) -> Response[application.Build]: return self.request( Route('GET', '/applications/{app_id}/branches/{branch_id}/builds/latest', app_id=app_id, branch_id=branch_id) ) def get_live_branch_build( self, app_id: Snowflake, branch_id: Snowflake, locale: str, platform: str - ) -> Response[appinfo.Build]: + ) -> Response[application.Build]: params = {'locale': locale, 'platform': platform} return self.request( Route('GET', '/applications/{app_id}/branches/{branch_id}/builds/live', app_id=app_id, branch_id=branch_id), params=params, ) - def get_build_ids(self, branch_ids: Sequence[Snowflake]) -> Response[List[appinfo.Branch]]: + def get_build_ids(self, branch_ids: Sequence[Snowflake]) -> Response[List[application.Branch]]: payload = {'branch_ids': branch_ids} return self.request(Route('POST', '/branches'), json=payload) - def create_branch_build(self, app_id: Snowflake, branch_id: Snowflake, payload: dict) -> Response[appinfo.CreatedBuild]: + def create_branch_build(self, app_id: Snowflake, branch_id: Snowflake, payload: dict) -> Response[application.CreatedBuild]: return self.request( Route('POST', '/applications/{app_id}/branches/{branch_id}/builds', app_id=app_id, branch_id=branch_id), json=payload, @@ -2832,7 +2833,7 @@ class HTTPClient: def get_branch_build_size( self, app_id: Snowflake, branch_id: Snowflake, build_id: Snowflake, manifest_ids: Sequence[Snowflake] - ) -> Response[appinfo.BranchSize]: + ) -> Response[application.BranchSize]: payload = {'manifest_ids': manifest_ids} return self.request( @@ -2848,7 +2849,7 @@ class HTTPClient: def get_branch_build_download_signatures( self, app_id: Snowflake, branch_id: Snowflake, build_id: Snowflake, manifest_label_ids: Sequence[Snowflake] - ) -> Response[Dict[str, appinfo.DownloadSignature]]: + ) -> Response[Dict[str, application.DownloadSignature]]: params = {'branch_id': branch_id, 'build_id': build_id} payload = {'manifest_label_ids': manifest_label_ids} @@ -2864,7 +2865,7 @@ class HTTPClient: def get_build_upload_urls( self, app_id: Snowflake, build_id: Snowflake, files: Sequence[File], hash: bool = True - ) -> Response[List[appinfo.CreatedBuildFile]]: + ) -> Response[List[application.CreatedBuildFile]]: payload = {'files': []} for file in files: # We create a new ID and set it as the filename @@ -3165,7 +3166,7 @@ class HTTPClient: def delete_sku_discount(self, sku_id: Snowflake, user_id: Snowflake) -> Response[None]: return self.request(Route('DELETE', '/store/skus/{sku_id}/discounts/{user_id}', sku_id=sku_id, user_id=user_id)) - def get_eula(self, eula_id: Snowflake) -> Response[appinfo.EULA]: + def get_eula(self, eula_id: Snowflake) -> Response[application.EULA]: return self.request(Route('GET', '/store/eulas/{eula_id}', eula_id=eula_id)) def get_price_tiers(self, type: Optional[int] = None, guild_id: Optional[Snowflake] = None) -> Response[List[int]]: @@ -3193,7 +3194,7 @@ class HTTPClient: icon: str, secure: bool, secret: bool, - ) -> Response[appinfo.Achievement]: + ) -> Response[application.Achievement]: payload = { 'name': { 'default': name, @@ -3212,15 +3213,15 @@ class HTTPClient: Route('POST', '/applications/{app_id}/achievements', app_id=app_id), json=payload, super_properties_to_track=True ) - def get_achievements(self, app_id: Snowflake) -> Response[List[appinfo.Achievement]]: + def get_achievements(self, app_id: Snowflake) -> Response[List[application.Achievement]]: return self.request( Route('GET', '/applications/{app_id}/achievements', app_id=app_id), super_properties_to_track=True ) - def get_my_achievements(self, app_id: Snowflake) -> Response[List[appinfo.Achievement]]: + def get_my_achievements(self, app_id: Snowflake) -> Response[List[application.Achievement]]: return self.request(Route('GET', '/users/@me/applications/{app_id}/achievements', app_id=app_id)) - def get_achievement(self, app_id: Snowflake, achievement_id: Snowflake) -> Response[appinfo.Achievement]: + def get_achievement(self, app_id: Snowflake, achievement_id: Snowflake) -> Response[application.Achievement]: return self.request( Route( 'GET', '/applications/{app_id}/achievements/{achievement_id}', app_id=app_id, achievement_id=achievement_id @@ -3228,7 +3229,7 @@ class HTTPClient: super_properties_to_track=True, ) - def edit_achievement(self, app_id: Snowflake, achievement_id: Snowflake, payload: dict) -> Response[appinfo.Achievement]: + def edit_achievement(self, app_id: Snowflake, achievement_id: Snowflake, payload: dict) -> Response[application.Achievement]: return self.request( Route( 'PATCH', '/applications/{app_id}/achievements/{achievement_id}', app_id=app_id, achievement_id=achievement_id @@ -3647,7 +3648,7 @@ class HTTPClient: def enroll_active_developer( self, application_id: Snowflake, channel_id: Snowflake - ) -> Response[appinfo.ActiveDeveloperResponse]: + ) -> Response[application.ActiveDeveloperResponse]: payload = {'application_id': application_id, 'channel_id': channel_id} return self.request(Route('POST', '/developers/active-program'), json=payload, super_properties_to_track=True) diff --git a/discord/integrations.py b/discord/integrations.py index eb75cb8f1..a36ba8383 100644 --- a/discord/integrations.py +++ b/discord/integrations.py @@ -40,7 +40,7 @@ __all__ = ( if TYPE_CHECKING: from datetime import datetime - from .appinfo import IntegrationApplication + from .application import IntegrationApplication from .guild import Guild from .role import Role from .state import ConnectionState diff --git a/discord/invite.py b/discord/invite.py index ee9c8ce72..b44531313 100644 --- a/discord/invite.py +++ b/discord/invite.py @@ -55,7 +55,7 @@ if TYPE_CHECKING: from .abc import GuildChannel, PrivateChannel, Snowflake from .channel import GroupChannel from .user import User - from .appinfo import PartialApplication + from .application import PartialApplication from .message import Message InviteGuildType = Union[Guild, 'PartialInviteGuild', Object] @@ -487,7 +487,7 @@ class Invite(Hashable): application = data.get('target_application') if application is not None: - from .appinfo import PartialApplication + from .application import PartialApplication application = PartialApplication(data=application, state=state) self.target_application: Optional[PartialApplication] = application diff --git a/discord/library.py b/discord/library.py index 36ea3feaa..52f61c04a 100644 --- a/discord/library.py +++ b/discord/library.py @@ -26,7 +26,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, List, Optional -from .appinfo import ApplicationActivityStatistics, ApplicationBranch, PartialApplication +from .application import ApplicationActivityStatistics, ApplicationBranch, PartialApplication from .entitlements import Entitlement from .enums import SKUType, try_enum from .flags import LibraryApplicationFlags @@ -38,7 +38,7 @@ if TYPE_CHECKING: from .asset import Asset from .state import ConnectionState - from .types.appinfo import Branch as BranchPayload + from .types.application import Branch as BranchPayload from .types.library import LibraryApplication as LibraryApplicationPayload from .types.store import PartialSKU as PartialSKUPayload diff --git a/discord/modal.py b/discord/modal.py index 7cc40b0ff..3124e5f8a 100644 --- a/discord/modal.py +++ b/discord/modal.py @@ -32,7 +32,7 @@ from .mixins import Hashable from .utils import _generate_nonce if TYPE_CHECKING: - from .appinfo import IntegrationApplication + from .application import IntegrationApplication from .components import ActionRow from .interactions import Interaction diff --git a/discord/profile.py b/discord/profile.py index e5b09a976..6fbfb16be 100644 --- a/discord/profile.py +++ b/discord/profile.py @@ -27,7 +27,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, List, Optional from . import utils -from .appinfo import ApplicationInstallParams +from .application import ApplicationInstallParams from .asset import Asset from .connections import PartialConnection from .enums import PremiumType, try_enum diff --git a/discord/state.py b/discord/state.py index 8856fd562..382cfb6df 100644 --- a/discord/state.py +++ b/discord/state.py @@ -86,7 +86,7 @@ from .interactions import Interaction from .permissions import Permissions, PermissionOverwrite from .modal import Modal from .member import VoiceState -from .appinfo import IntegrationApplication, PartialApplication, Achievement +from .application import IntegrationApplication, PartialApplication, Achievement from .connections import Connection from .payments import Payment from .entitlements import Entitlement, Gift @@ -108,7 +108,7 @@ if TYPE_CHECKING: from .types.snowflake import Snowflake from .types.activity import Activity as ActivityPayload - from .types.appinfo import Achievement as AchievementPayload, IntegrationApplication as IntegrationApplicationPayload + from .types.application import Achievement as AchievementPayload, IntegrationApplication as IntegrationApplicationPayload from .types.channel import DMChannel as DMChannelPayload from .types.user import User as UserPayload, PartialUser as PartialUserPayload from .types.emoji import Emoji as EmojiPayload, PartialEmoji as PartialEmojiPayload diff --git a/discord/store.py b/discord/store.py index 297ced6eb..b11d487be 100644 --- a/discord/store.py +++ b/discord/store.py @@ -64,12 +64,12 @@ if TYPE_CHECKING: from typing_extensions import Self from .abc import Snowflake - from .appinfo import Application, PartialApplication + from .application import Application, PartialApplication from .entitlements import Entitlement, Gift, GiftBatch from .guild import Guild from .library import LibraryApplication from .state import ConnectionState - from .types.appinfo import StoreAsset as StoreAssetPayload + from .types.application import StoreAsset as StoreAssetPayload from .types.entitlements import Gift as GiftPayload from .types.snowflake import Snowflake as SnowflakeType from .types.store import ( @@ -1171,7 +1171,7 @@ class SKU(Hashable): return f'' def _update(self, data: SKUPayload) -> None: - from .appinfo import PartialApplication + from .application import PartialApplication state = self._state diff --git a/discord/team.py b/discord/team.py index 3485af516..dd6a12012 100644 --- a/discord/team.py +++ b/discord/team.py @@ -39,7 +39,7 @@ if TYPE_CHECKING: from datetime import date from .abc import Snowflake, SnowflakeTime - from .appinfo import Application, Company + from .application import Application, Company from .state import ConnectionState from .types.team import Team as TeamPayload, TeamMember as TeamMemberPayload, TeamPayout as TeamPayoutPayload from .types.user import PartialUser as PartialUserPayload @@ -236,7 +236,7 @@ class Team(Hashable): HTTPException Retrieving the team applications failed. """ - from .appinfo import Application + from .application import Application state = self._state data = await state.http.get_team_applications(self.id) @@ -357,7 +357,7 @@ class Team(Hashable): :class:`.Company` The created company. """ - from .appinfo import Company + from .application import Company state = self._state data = await state.http.create_team_company(self.id, name) diff --git a/discord/types/appinfo.py b/discord/types/application.py similarity index 100% rename from discord/types/appinfo.py rename to discord/types/application.py diff --git a/discord/types/gateway.py b/discord/types/gateway.py index 885e08e11..77e880b7e 100644 --- a/discord/types/gateway.py +++ b/discord/types/gateway.py @@ -37,7 +37,7 @@ from .member import MemberWithUser from .snowflake import Snowflake from .message import Message from .sticker import GuildSticker -from .appinfo import BaseAchievement, PartialApplication +from .application import BaseAchievement, PartialApplication from .guild import Guild, UnavailableGuild, SupplementalGuild from .user import Connection, User, PartialUser, ProtoSettingsType, Relationship, RelationshipType from .threads import Thread, ThreadMember diff --git a/discord/types/integration.py b/discord/types/integration.py index bf1ccd4ae..39f68ab39 100644 --- a/discord/types/integration.py +++ b/discord/types/integration.py @@ -27,7 +27,7 @@ from __future__ import annotations from typing import List, Literal, Optional, TypedDict, Union from typing_extensions import NotRequired -from .appinfo import IntegrationApplication +from .application import IntegrationApplication from .guild import Guild from .snowflake import Snowflake from .user import User diff --git a/discord/types/invite.py b/discord/types/invite.py index 7b807daf7..9b8757a1c 100644 --- a/discord/types/invite.py +++ b/discord/types/invite.py @@ -32,7 +32,7 @@ from .snowflake import Snowflake from .guild import InviteGuild, _GuildPreviewUnique from .channel import PartialChannel from .user import PartialUser -from .appinfo import PartialApplication +from .application import PartialApplication InviteTargetType = Literal[1, 2] diff --git a/discord/types/library.py b/discord/types/library.py index f17d87b12..7881eb7bf 100644 --- a/discord/types/library.py +++ b/discord/types/library.py @@ -27,7 +27,7 @@ from __future__ import annotations from typing import List, TypedDict from typing_extensions import NotRequired -from .appinfo import Branch, PartialApplication +from .application import Branch, PartialApplication from .entitlements import Entitlement from .snowflake import Snowflake from .store import PartialSKU diff --git a/discord/types/store.py b/discord/types/store.py index 19be1ca67..233452e23 100644 --- a/discord/types/store.py +++ b/discord/types/store.py @@ -27,7 +27,7 @@ from __future__ import annotations from typing import Dict, List, Literal, Optional, TypedDict, Union from typing_extensions import NotRequired -from .appinfo import PartialApplication, StoreAsset +from .application import PartialApplication, StoreAsset from .entitlements import Entitlement from .guild import PartialGuild from .library import LibraryApplication