@@ -206,7 +206,10 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
206206 "messages" : [
207207 {
208208 "author_id" : m .author .id ,
209- "content" : m .content ,
209+ "content" : (
210+ (m .content or "" )
211+ + (("\n " + extract_forwarded_content (m )) if extract_forwarded_content (m ) else "" )
212+ ).strip (),
210213 "attachments" : [a .url for a in m .attachments ],
211214 "embeds" : [e .to_dict () for e in m .embeds ],
212215 "created_at" : m .created_at .isoformat (),
@@ -225,16 +228,12 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
225228 "author_name" : (
226229 getattr (m .embeds [0 ].author , "name" , "" ).split (" (" )[0 ]
227230 if m .embeds and m .embeds [0 ].author and m .author == self .bot .user
228- else getattr (m .author , "name" , None )
229- if m .author != self .bot .user
230- else None
231+ else getattr (m .author , "name" , None ) if m .author != self .bot .user else None
231232 ),
232233 "author_avatar" : (
233234 getattr (m .embeds [0 ].author , "icon_url" , None )
234235 if m .embeds and m .embeds [0 ].author and m .author == self .bot .user
235- else m .author .display_avatar .url
236- if m .author != self .bot .user
237- else None
236+ else m .author .display_avatar .url if m .author != self .bot .user else None
238237 ),
239238 }
240239 async for m in channel .history (limit = None , oldest_first = True )
0 commit comments