From 6006969414ea139315414e5c40f41498175b122a Mon Sep 17 00:00:00 2001 From: Richard Chien Date: Mon, 2 Jul 2018 23:29:37 +0800 Subject: [PATCH] Use ".handle_quick_operation" API instead of check by self --- none/notice_request.py | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/none/notice_request.py b/none/notice_request.py index 45eabab6..f0e1da1e 100644 --- a/none/notice_request.py +++ b/none/notice_request.py @@ -45,30 +45,24 @@ class RequestSession(BaseSession): super().__init__(bot, ctx) async def approve(self, remark: str = ''): - # TODO: should use ".handle_quick_operation" action in the future try: - if self.ctx['request_type'] == 'friend': - await self.bot.set_friend_add_request(**self.ctx, - approve=True, - remark=remark) - elif self.ctx['request_type'] == 'group': - await self.bot.set_group_add_request(**self.ctx, - type=self.ctx['sub_type'], - approve=True) + await self.bot.call_action( + action='.handle_quick_operation_async', + self_id=self.ctx.get('self_id'), + context=self.ctx, + operation={'approve': True, 'remark': remark} + ) except CQHttpError: pass async def reject(self, reason: str = ''): - # TODO: should use ".handle_quick_operation" action in the future try: - if self.ctx['request_type'] == 'friend': - await self.bot.set_friend_add_request(**self.ctx, - approve=False) - elif self.ctx['request_type'] == 'group': - await self.bot.set_group_add_request(**self.ctx, - type=self.ctx['sub_type'], - approve=False, - reason=reason) + await self.bot.call_action( + action='.handle_quick_operation_async', + self_id=self.ctx.get('self_id'), + context=self.ctx, + operation={'approve': False, 'reason': reason} + ) except CQHttpError: pass