Fixes to leaves and DM creation

Fixes -203 error for MemoChats, and automatically retries channel
creation when it fails the first time
This commit is contained in:
Andrew Ferrazzutti 2022-05-10 21:33:11 -04:00
parent 45fdd5ca29
commit 53d3170c04
4 changed files with 44 additions and 21 deletions

View File

@ -311,4 +311,7 @@ async def leave(evt: CommandEvent) -> None:
await evt.reply("This command may only be used in a KakaoTalk channel portal room") await evt.reply("This command may only be used in a KakaoTalk channel portal room")
return return
await evt.mark_read() await evt.mark_read()
await evt.portal.leave_kakaotalk_channel() try:
await evt.sender.leave_channel(evt.portal)
except CommandException as e:
await evt.reply(f"Error from KakaoTalk: {e}")

View File

@ -1386,10 +1386,6 @@ class Portal(DBPortal, BasePortal):
else: else:
self.log.debug(f"{user.mxid} left portal to {self.ktid}") self.log.debug(f"{user.mxid} left portal to {self.ktid}")
async def leave_kakaotalk_channel(self, user: u.User) -> None:
await user.client.leave_channel(self.channel_props)
await user.on_channel_left(self.ktid, self.kt_type)
# endregion # endregion
# region KakaoTalk event handling # region KakaoTalk event handling
@ -1762,19 +1758,20 @@ class Portal(DBPortal, BasePortal):
self, source: u.User, sender: p.Puppet | None, removed: p.Puppet self, source: u.User, sender: p.Puppet | None, removed: p.Puppet
) -> None: ) -> None:
sender_intent = sender.intent_for(self) if sender else self.main_intent sender_intent = sender.intent_for(self) if sender else self.main_intent
removed_user = await u.User.get_by_ktid(removed.ktid)
if sender == removed: if sender == removed:
removed_intent = removed.intent_for(self) if not removed.is_real_user and removed_user:
if removed_intent != self.main_intent: try:
await removed_intent.leave_room(self.mxid) await sender_intent.kick_user(self.mxid, removed_user.mxid, "Left channel from KakaoTalk")
if not removed.is_real_user: except MForbidden:
user = await u.User.get_by_ktid(removed.ktid) pass
if user: await removed.intent_for(self).leave_room(self.mxid)
await self.main_intent.kick_user(self.mxid, user.mxid, "Left channel from KakaoTalk")
else: else:
for removed_mxid in (r.mxid for r in ( for removed_mxid in (r.mxid for r in (
removed, removed,
await u.User.get_by_ktid(removed.ktid) if not removed.is_real_user else None removed_user if not removed.is_real_user else None
) if r): ) if r):
# NOTE KakaoTalk kick = Matrix ban
try: try:
await sender_intent.ban_user( await sender_intent.ban_user(
self.mxid, removed_mxid, None if sender else "Kicked by channel admin" self.mxid, removed_mxid, None if sender else "Kicked by channel admin"
@ -1785,7 +1782,11 @@ class Portal(DBPortal, BasePortal):
await self.main_intent.ban_user( await self.main_intent.ban_user(
self.mxid, removed_mxid, reason=f"Kicked by {sender.name}" self.mxid, removed_mxid, reason=f"Kicked by {sender.name}"
) )
# TODO Clean and delete if removed is real user and portal is direct / not open if self.is_direct and removed.ktid == self.kt_receiver:
self.log.info(
f"{removed.ktid} was the recipient puppet of this portal. Cleaning up and deleting..."
)
await self.cleanup_and_delete()
# TODO Find when or if there is a listener for this # TODO Find when or if there is a listener for this
# TODO Confirm whether this can refer to any user that was kicked, or only to the current user # TODO Confirm whether this can refer to any user that was kicked, or only to the current user

View File

@ -685,7 +685,7 @@ class User(DBUser, BaseUser):
kt_type = KnownChannelType.MemoChat kt_type = KnownChannelType.MemoChat
memo_ids = await self.client.get_memo_ids() memo_ids = await self.client.get_memo_ids()
if not memo_ids: if not memo_ids:
ktid = Long(0) ktid = None
else: else:
ktid = memo_ids[0] ktid = memo_ids[0]
if len(memo_ids) > 1: if len(memo_ids) > 1:
@ -702,6 +702,13 @@ class User(DBUser, BaseUser):
ktid, kt_receiver=self.ktid, create=create, kt_type=kt_type ktid, kt_receiver=self.ktid, create=create, kt_type=kt_type
) if ktid else None ) if ktid else None
# region Matrix->KakaoTalk commands
async def leave_channel(self, portal: po.Portal) -> None:
await self.client.leave_channel(portal.channel_props)
await self.on_channel_left(portal.ktid, portal.kt_type)
# endregion
# region KakaoTalk event handling # region KakaoTalk event handling
async def on_connect(self, force_sync: bool) -> bool: async def on_connect(self, force_sync: bool) -> bool:

View File

@ -1138,16 +1138,28 @@ export default class PeerClient {
const userClient = this.#getUser(req.mxid) const userClient = this.#getUser(req.mxid)
const channelList = userClient.talkClient.channelList.normal const channelList = userClient.talkClient.channelList.normal
const res = const createChannel =
req.user_id != userClient.userId !req.user_id.equals(userClient.userId)
? await channelList.createChannel({ ? channelList.createChannel.bind(channelList, {
userList: [{ userId: req.user_id }], userList: [{ userId: req.user_id }],
}) })
: await channelList.createMemoChannel() : channelList.createMemoChannel.bind(channelList)
if (!res.success) return res const retry_delay = 2000
let retries_left = 1
let res
do {
res = await createChannel()
if (res.success) {
return makeCommandResult(res.result.channelId) return makeCommandResult(res.result.channelId)
} }
this.error(`Failed to create direct chat, try again in ${retry_delay} ms (${retries_left - 1} tries remaining)`)
await new Promise(resolve => setTimeout(resolve, retry_delay))
} while (retries_left--)
this.error(`Failed to create direct chat, not retrying`)
return res
}
/** /**
* @param {Object} req * @param {Object} req