fair/matrix-appservice-kakaotalk
fair/matrix-appservice-kakaotalk
1
0
Fork 2
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: fair:79fe8748b1ceca8c128b83ae0f208db2d8e0b937
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing
..
compare: fair:36598c34f6ed451ebb84d7d578aba6f346f7b2c9
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing

No commits in common. "79fe8748b1ceca8c128b83ae0f208db2d8e0b937" and "36598c34f6ed451ebb84d7d578aba6f346f7b2c9" have entirely different histories.
79fe8748b1 ... 36598c34f6

4 changed files with 28 additions and 70 deletions
Show Stats Expand all files Collapse all files

13
matrix_appservice_kakaotalk/commands/kakaotalk.py
View File

@ -65,13 +65,9 @@ async def whoami(evt: CommandEvent) -> None:
await evt.reply(f"Error from KakaoTalk: {e}")
return
if own_info:
puppet = await pu.Puppet.get_by_ktid(evt.sender.ktid)
uuid = f"`{own_info.more.uuid}` ({'searchable' if own_info.more.uuidSearchable else 'hidden'})" if own_info.more.uuid else "_none_"
await evt.reply(
f"You're logged in as **{own_info.more.nickName}**"
f"\n* KakaoTalk ID: {uuid}"
f"\n* Internal ID: `{evt.sender.ktid}`"
f"\n* Matrix user: [{puppet.name}](https://matrix.to/#/{puppet.default_mxid})"
f"You're logged in as **{own_info.more.nickName}** (KakaoTalk ID: {uuid}, internal ID: `{evt.sender.ktid}`)"
)
else:
await evt.reply(
@ -157,13 +153,13 @@ async def _set_id_searchable(evt: CommandEvent, searchable: bool) -> None:
else:
await evt.reply(f"Successfully made KakaoTalk ID {'searchable' if searchable else 'hidden'}")
async def _get_search_result_puppet(source: u.User, friend_struct: FriendStruct) -> pu.Puppet:
puppet = await pu.Puppet.get_by_ktid(friend_struct.userId)
if not puppet.name_set:
await puppet.update_info_from_friend(source, friend_struct)
return puppet
@command_handler(
needs_auth=True,
management_only=False,
@ -315,7 +311,4 @@ async def leave(evt: CommandEvent) -> None:
await evt.reply("This command may only be used in a KakaoTalk channel portal room")
return
await evt.mark_read()
try:
await evt.sender.leave_channel(evt.portal)
except CommandException as e:
await evt.reply(f"Error from KakaoTalk: {e}")
await evt.portal.leave_kakaotalk_channel()

27
matrix_appservice_kakaotalk/portal.py
View File

@ -1386,6 +1386,10 @@ class Portal(DBPortal, BasePortal):
else:
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
# region KakaoTalk event handling
@ -1758,20 +1762,19 @@ class Portal(DBPortal, BasePortal):
self, source: u.User, sender: p.Puppet | None, removed: p.Puppet
) -> None:
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 not removed.is_real_user and removed_user:
try:
await sender_intent.kick_user(self.mxid, removed_user.mxid, "Left channel from KakaoTalk")
except MForbidden:
pass
await removed.intent_for(self).leave_room(self.mxid)
removed_intent = removed.intent_for(self)
if removed_intent != self.main_intent:
await removed_intent.leave_room(self.mxid)
if not removed.is_real_user:
user = await u.User.get_by_ktid(removed.ktid)
if user:
await self.main_intent.kick_user(self.mxid, user.mxid, "Left channel from KakaoTalk")
else:
for removed_mxid in (r.mxid for r in (
removed,
removed_user if not removed.is_real_user else None
await u.User.get_by_ktid(removed.ktid) if not removed.is_real_user else None
) if r):
# NOTE KakaoTalk kick = Matrix ban
try:
await sender_intent.ban_user(
self.mxid, removed_mxid, None if sender else "Kicked by channel admin"
@ -1782,11 +1785,7 @@ class Portal(DBPortal, BasePortal):
await self.main_intent.ban_user(
self.mxid, removed_mxid, reason=f"Kicked by {sender.name}"
)
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 Clean and delete if removed is real user and portal is direct / not open
# 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

9
matrix_appservice_kakaotalk/user.py
View File

@ -685,7 +685,7 @@ class User(DBUser, BaseUser):
kt_type = KnownChannelType.MemoChat
memo_ids = await self.client.get_memo_ids()
if not memo_ids:
ktid = None
ktid = Long(0)
else:
ktid = memo_ids[0]
if len(memo_ids) > 1:
@ -702,13 +702,6 @@ class User(DBUser, BaseUser):
ktid, kt_receiver=self.ktid, create=create, kt_type=kt_type
) 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
async def on_connect(self, force_sync: bool) -> bool:

49
node/src/client.js
View File

@ -155,19 +155,10 @@ class UserClient {
})
this.#talkClient.on("chat_read", (chat, channel, reader) => {
let senderId
if (reader) {
senderId = reader.userId
} else if (channel.info.type == "MemoChat") {
senderId = channel.clientUser.userId
} else {
this.error(`Chat ${chat.logId} read in channel ${channel.channelId} by unknown reader (channel type: ${channel.info.type || "none"})`)
return
}
this.log(`Chat ${chat.logId} read in channel ${channel.channelId} by ${senderId}`)
this.log(`Chat ${chat.logId} read in channel ${channel.channelId} by ${reader.userId}`)
this.write("chat_read", {
chatId: chat.logId,
senderId: senderId,
senderId: reader.userId,
channelId: channel.channelId,
channelType: channel.info.type,
})
@ -307,7 +298,7 @@ class UserClient {
}
})
this.#talkClient.on("disconnected", reason => {
this.#talkClient.on("disconnected", (reason) => {
this.log(`Disconnected (reason=${reason})`)
this.disconnect()
this.write("disconnected", {
@ -322,7 +313,7 @@ class UserClient {
})
})
this.#talkClient.on("error", err => {
this.#talkClient.on("error", (err) => {
this.log(`Client error: ${err}`)
this.write("error", {
error: err,
@ -1081,7 +1072,7 @@ export default class PeerClient {
if (!talkChannel.getUserInfo(user)) {
throw new ProtocolError("Cannot set permission level of a user that is not a channel participant")
}
if (req.user_id.equals(talkChannel.clientUser.userId)) {
if (req.user_id == talkChannel.clientUser.userId) {
throw new ProtocolError("Cannot change own permission level")
}
return await talkChannel.setUserPerm(user, req.perm)
@ -1144,30 +1135,12 @@ export default class PeerClient {
* @param {Long} req.user_id
*/
createDirectChat = async (req) => {
const userClient = this.#getUser(req.mxid)
const channelList = userClient.talkClient.channelList.normal
const createChannel =
!req.user_id.equals(userClient.userId)
? channelList.createChannel.bind(channelList, {
userList: [{ userId: req.user_id }],
})
: channelList.createMemoChannel.bind(channelList)
const retry_delay = 2000
let retries_left = 1
let res
do {
res = await createChannel()
if (res.success) {
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
const channelList = this.#getUser(req.mxid).talkClient.channelList.normal
const res = await channelList.createChannel({
userList: [{ userId: req.user_id }],
})
if (!res.success) return res
return makeCommandResult(res.result.channelId)
}
/**