Skip to content

Commit db345b0

Browse files
committed
Fix allowed_mentions being used everywhere
1 parent d24204a commit db345b0

File tree

6 files changed

+21
-6
lines changed

6 files changed

+21
-6
lines changed

discord_http/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "2.1.2"
1+
__version__ = "2.1.3"
22

33
# flake8: noqa: F401
44
from .asset import *

discord_http/channel.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,10 @@ async def send(
463463
type=type,
464464
poll=poll,
465465
flags=flags,
466-
allowed_mentions=allowed_mentions,
466+
allowed_mentions=(
467+
allowed_mentions or
468+
self._state.bot._default_allowed_mentions
469+
),
467470
)
468471

469472
r = await self._state.query(

discord_http/member.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ async def send(
147147
tts=tts,
148148
type=type,
149149
flags=flags,
150-
allowed_mentions=allowed_mentions,
150+
allowed_mentions=(
151+
allowed_mentions or
152+
self._state.bot._default_allowed_mentions
153+
),
151154
delete_after=delete_after
152155
)
153156

discord_http/message.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,10 @@ async def reply(
10041004
files=files,
10051005
view=view,
10061006
tts=tts,
1007-
allowed_mentions=allowed_mentions,
1007+
allowed_mentions=(
1008+
allowed_mentions or
1009+
self._state.bot._default_allowed_mentions
1010+
),
10081011
message_reference=MessageReference(
10091012
state=self._state,
10101013
data={

discord_http/user.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ async def send(
109109
tts=tts,
110110
type=type,
111111
flags=flags,
112-
allowed_mentions=allowed_mentions,
112+
allowed_mentions=(
113+
allowed_mentions or
114+
self._state.bot._default_allowed_mentions
115+
),
113116
)
114117

115118
r = await self._state.query(

discord_http/webhook.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,10 @@ async def send(
184184
type=type,
185185
flags=flags,
186186
poll=poll,
187-
allowed_mentions=allowed_mentions
187+
allowed_mentions=(
188+
allowed_mentions or
189+
self._state.bot._default_allowed_mentions
190+
)
188191
)
189192

190193
multidata = MultipartData()

0 commit comments

Comments
 (0)