@@ -178,7 +178,7 @@ make_specific_collector!(
178178 // - filter expression (this expressoin must return true to let the event through)
179179 author_id: UserId => interaction. user. id == * author_id,
180180 channel_id: ChannelId => interaction. channel_id == * channel_id,
181- guild_id: GuildId => interaction. guild_id. map_or ( true , |x| x == * guild_id) ,
181+ guild_id: GuildId => interaction. guild_id. is_none_or ( |x| x == * guild_id) ,
182182 message_id: MessageId => interaction. message. id == * message_id,
183183 custom_ids: FixedArray <FixedString > => custom_ids. contains( & interaction. data. custom_id) ,
184184) ;
@@ -190,17 +190,17 @@ make_specific_collector!(
190190 } ) => interaction,
191191 author_id: UserId => interaction. user. id == * author_id,
192192 channel_id: ChannelId => interaction. channel_id == * channel_id,
193- guild_id: GuildId => interaction. guild_id. map_or ( true , |g| g == * guild_id) ,
194- message_id: MessageId => interaction. message. as_ref( ) . map_or ( true , |m| m. id == * message_id) ,
193+ guild_id: GuildId => interaction. guild_id. is_none_or ( |g| g == * guild_id) ,
194+ message_id: MessageId => interaction. message. as_ref( ) . is_none_or ( |m| m. id == * message_id) ,
195195 custom_ids: Vec <FixedString > => custom_ids. contains( & interaction. data. custom_id) ,
196196) ;
197197make_specific_collector ! (
198198 ReactionCollector , Reaction ,
199199 CollectReactions , collect_reactions,
200200 Event :: ReactionAdd ( ReactionAddEvent { reaction } ) => reaction,
201- author_id: UserId => reaction. user_id. map_or ( true , |a| a == * author_id) ,
201+ author_id: UserId => reaction. user_id. is_none_or ( |a| a == * author_id) ,
202202 channel_id: ChannelId => reaction. channel_id == * channel_id,
203- guild_id: GuildId => reaction. guild_id. map_or ( true , |g| g == * guild_id) ,
203+ guild_id: GuildId => reaction. guild_id. is_none_or ( |g| g == * guild_id) ,
204204 message_id: MessageId => reaction. message_id == * message_id,
205205) ;
206206make_specific_collector ! (
@@ -209,5 +209,5 @@ make_specific_collector!(
209209 Event :: MessageCreate ( MessageCreateEvent { message } ) => message,
210210 author_id: UserId => message. author. id == * author_id,
211211 channel_id: ChannelId => message. channel_id == * channel_id,
212- guild_id: GuildId => message. guild_id. map_or ( true , |g| g == * guild_id) ,
212+ guild_id: GuildId => message. guild_id. is_none_or ( |g| g == * guild_id) ,
213213) ;
0 commit comments