@@ -217,12 +217,15 @@ def dispatch_repeater_reply(bot_id: int, group_id: int, answers) -> None:
217217 )
218218
219219
220- async def send_repeater_answers (bot_id : int , group_id : int , answers ) -> None :
220+ async def send_repeater_answers (bot_id : int , group_id : int , answers , * , fanout : bool = False ) -> None :
221221
222222 from src .plugins .repeater import post_proc
223223
224224 from .model import Chat
225225
226+ log_tag = "fanout" if fanout else "reply"
227+ send_context = "repeater_fanout" if fanout else "repeater_reply"
228+
226229 config = BotConfig (bot_id , group_id )
227230
228231 await config .refresh_cooldown ("repeat" )
@@ -233,14 +236,14 @@ async def send_repeater_answers(bot_id: int, group_id: int, answers) -> None:
233236 bot = get_bot (str (bot_id ))
234237
235238 except ValueError :
236- logger .warning ("repeater_fanout : bot [{}] not connected on this worker" , bot_id )
239+ logger .warning ("repeater{} : bot [{}] not connected on this worker" , "_fanout" if fanout else " " , bot_id )
237240
238241 return
239242
240243 async for item in answers :
241244 msg = await post_proc (item , bot_id , group_id )
242245
243- logger .info (f"bot [{ bot_id } ] ready to send [{ str (msg )[:30 ]} ] to group [{ group_id } ] (fanout )" )
246+ logger .info (f"bot [{ bot_id } ] ready to send [{ str (msg )[:30 ]} ] to group [{ group_id } ] ({ log_tag } )" )
244247
245248 await asyncio .sleep (delay )
246249
@@ -250,7 +253,7 @@ async def send_repeater_answers(bot_id: int, group_id: int, answers) -> None:
250253 await bot .send_group_msg (group_id = group_id , message = msg )
251254
252255 except BOT_SEND_UNAVAILABLE_ERRORS as e :
253- log_bot_send_unavailable (e , context = "repeater_fanout" , bot = bot_id , group = group_id )
256+ log_bot_send_unavailable (e , context = send_context , bot = bot_id , group = group_id )
254257
255258 return
256259
@@ -263,7 +266,7 @@ async def send_repeater_answers(bot_id: int, group_id: int, answers) -> None:
263266 shutup = await is_shutup (bot_id , group_id )
264267
265268 if not shutup :
266- logger .info (f"bot [{ bot_id } ] ready to ban [{ str (item )} ] in group [{ group_id } ] (fanout )" )
269+ logger .info (f"bot [{ bot_id } ] ready to ban [{ str (item )} ] in group [{ group_id } ] ({ log_tag } )" )
267270
268271 await Chat .ban (group_id , bot_id , str (item ), "ActionFailed" )
269272
@@ -307,7 +310,7 @@ async def run_repeater_reply_for_bot(bot_id: int, payload: dict[str, Any]) -> No
307310 if answers is None :
308311 return
309312
310- await send_repeater_answers (bot_id , group_id , answers )
313+ await send_repeater_answers (bot_id , group_id , answers , fanout = True )
311314
312315
313316async def dispatch_repeater_fanout (
0 commit comments