Skip to content

Commit 656bc51

Browse files
committed
Merge branch 'feat/guild-join-requests' of https://github.com/Pycord-Development/pycord into feat/guild-join-requests
2 parents d26dd70 + ec90827 commit 656bc51

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

discord/guild_join_request.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@
4343
from .guild import Guild
4444
from .state import ConnectionState
4545
from .types.guild_join_request import FormResponse as FormResponsePayload
46-
from .types.guild_join_request import (
47-
JoinRequest as JoinRequestPayload,
48-
)
46+
from .types.guild_join_request import JoinRequest as JoinRequestPayload
4947
from .user import User
5048

5149

@@ -276,6 +274,7 @@ class FormResponse:
276274
277275
.. versionadded:: 2.9
278276
If the join request has already been approved or rejected, this will raise :exc:`ValueError`.
277+
279278
Attributes
280279
----------
281280
field_type: :class:`JoinRequestFormFieldType`

discord/iterators.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
from .types.audit_log import AuditLog as AuditLogPayload
7070
from .types.guild import Guild as GuildPayload
7171
from .types.guild_join_request import JoinRequest as JoinRequestPayload
72-
from .types.guild_join_request import (
73-
ListJoinRequests as ListJoinRequestsPayload,
74-
)
72+
from .types.guild_join_request import ListJoinRequests as ListJoinRequestsPayload
7573
from .types.message import Message as MessagePayload
7674
from .types.message import MessagePin as MessagePinPayload
7775
from .types.monetization import Entitlement as EntitlementPayload

discord/state.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -932,11 +932,13 @@ def parse_message_poll_vote_add(self, data) -> None:
932932
if answer.id in counts:
933933
counts[answer.id].count += 1
934934
else:
935-
counts[answer.id] = PollAnswerCount({
936-
"id": answer.id,
937-
"count": 1,
938-
"me_voted": False,
939-
})
935+
counts[answer.id] = PollAnswerCount(
936+
{
937+
"id": answer.id,
938+
"count": 1,
939+
"me_voted": False,
940+
}
941+
)
940942
if poll is not None and user is not None:
941943
answer = poll.get_answer(raw.answer_id)
942944
if answer is not None:

0 commit comments

Comments
 (0)