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:66262caa632dc10eb19dd17d8c86f326de5203bf
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing
..
compare: fair:b59b8a68c3cf2f7beae0bd96fcc7e043d6bbc1be
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing

No commits in common. "66262caa632dc10eb19dd17d8c86f326de5203bf" and "b59b8a68c3cf2f7beae0bd96fcc7e043d6bbc1be" have entirely different histories.
66262caa63 ... b59b8a68c3

9 changed files with 54 additions and 110 deletions
Show Stats Expand all files Collapse all files

20
matrix_appservice_kakaotalk/kt/client/client.py
View File

@ -49,7 +49,7 @@ from ..types.request import (
CommandResultDoneValue
)
from .types import PortalChannelInfo, UserInfoUnion, ChannelProps
from .types import PortalChannelInfo, UserInfoUnion
from .errors import InvalidAccessToken
from .error_helper import raise_unsuccessful_response
@ -109,7 +109,7 @@ class Client:
Obtain a session token by logging in with user-provided credentials.
Must have first called register_device with these credentials.
"""
# NOTE Actually returns an auth LoginData, but this only needs an OAuthCredential
# NOTE Actually returns a LoginData object, but this only needs an OAuthCredential
return await cls._api_request_result(OAuthCredential, "login", is_secret=True, **req)
# endregion
@ -207,34 +207,34 @@ class Client:
)
return profile_req_struct.profile
async def get_portal_channel_info(self, channel_props: ChannelProps) -> PortalChannelInfo:
async def get_portal_channel_info(self, channel_id: Long) -> PortalChannelInfo:
return await self._api_user_request_result(
PortalChannelInfo,
"get_portal_channel_info",
channel_props=channel_props.serialize(),
channel_id=channel_id.serialize()
)
async def get_participants(self, channel_props: ChannelProps) -> list[UserInfoUnion]:
async def get_participants(self, channel_id: Long) -> list[UserInfoUnion]:
return await self._api_user_request_result(
ResultListType(UserInfoUnion),
"get_participants",
channel_props=channel_props.serialize()
channel_id=channel_id.serialize()
)
async def get_chats(self, channel_props: ChannelProps, sync_from: Long | None, limit: int | None) -> list[Chatlog]:
async def get_chats(self, channel_id: Long, sync_from: Long | None, limit: int | None) -> list[Chatlog]:
return await self._api_user_request_result(
ResultListType(Chatlog),
"get_chats",
channel_props=channel_props.serialize(),
channel_id=channel_id.serialize(),
sync_from=sync_from.serialize() if sync_from else None,
limit=limit
)
async def send_message(self, channel_props: ChannelProps, text: str) -> Chatlog:
async def send_message(self, channel_id: Long, text: str) -> Chatlog:
return await self._api_user_request_result(
Chatlog,
"send_message",
channel_props=channel_props.serialize(),
channel_id=channel_id.serialize(),
text=text
)

8
matrix_appservice_kakaotalk/kt/client/types.py
View File

@ -21,9 +21,7 @@ from attr import dataclass
from mautrix.types import SerializableAttrs, JSON, deserializer
from ..types.bson import Long
from ..types.channel.channel_info import NormalChannelInfo
from ..types.channel.channel_type import ChannelType
from ..types.openlink.open_channel_info import OpenChannelInfo
from ..types.user.channel_user_info import NormalChannelUserInfo, OpenChannelUserInfo
@ -58,9 +56,3 @@ class PortalChannelInfo(SerializableAttrs):
participants: list[UserInfoUnion]
# TODO Image
channel_info: Optional[ChannelInfoUnion] = None # Should be set manually by caller
@dataclass
class ChannelProps(SerializableAttrs):
id: Long
type: ChannelType

5
matrix_appservice_kakaotalk/kt/types/api/auth_api_client.py
View File

@ -22,7 +22,8 @@ from ..oauth import OAuthCredential
@dataclass
class LoginData(OAuthCredential):
class AuthLoginData(OAuthCredential):
"""aka LoginData"""
countryIso: str
countryCode: str
accountId: int
@ -93,7 +94,7 @@ class KnownAuthStatusCode(IntEnum):
__all__ = [
"LoginData",
"AuthLoginData",
"LoginForm",
"TokenLoginForm",
"KnownAuthStatusCode",

5
matrix_appservice_kakaotalk/kt/types/channel/channel_info.py
View File

@ -67,7 +67,8 @@ class ChannelData(SerializableAttrs, Generic[T]):
@dataclass
class LoginData(SerializableAttrs, Generic[T]):
class ChannelLoginData(SerializableAttrs, Generic[T]):
"""aka non-auth LoginData"""
lastUpdate: int
channel: T
@ -87,6 +88,6 @@ __all__ = [
"ChannelInfo",
"NormalChannelInfo",
"ChannelData",
"LoginData",
"ChannelLoginData",
"NormalChannelData",
]

14
matrix_appservice_kakaotalk/kt/types/client/client_session.py
View File

@ -20,28 +20,28 @@ from attr import dataclass
from mautrix.types import SerializableAttrs, JSON, deserializer
from ..bson import Long
from ..channel.channel_info import LoginData, NormalChannelData
from ..channel.channel_info import ChannelLoginData, NormalChannelData
from ..openlink.open_channel_info import OpenChannelData
LoginDataItem = NewType("LoginDataItem", LoginData[Union[NormalChannelData, OpenChannelData]])
ChannelLoginDataItem = NewType("ChannelLoginDataItem", ChannelLoginData[Union[NormalChannelData, OpenChannelData]])
@deserializer(LoginDataItem)
def deserialize_channel_login_data_item(data: JSON) -> LoginDataItem:
@deserializer(ChannelLoginDataItem)
def deserialize_channel_login_data_item(data: JSON) -> ChannelLoginDataItem:
channel_data = data["channel"]
if "linkId" in channel_data:
data["channel"] = OpenChannelData.deserialize(channel_data)
else:
data["channel"] = NormalChannelData.deserialize(channel_data)
return LoginData.deserialize(data)
return ChannelLoginData.deserialize(data)
setattr(LoginDataItem, "deserialize", deserialize_channel_login_data_item)
setattr(ChannelLoginDataItem, "deserialize", deserialize_channel_login_data_item)
@dataclass
class LoginResult(SerializableAttrs):
"""Return value of TalkClient.login"""
channelList: list[LoginDataItem]
channelList: list[ChannelLoginDataItem]
userId: Long
lastChannelId: Long
lastTokenId: Long

18
matrix_appservice_kakaotalk/portal.py
View File

@ -52,7 +52,7 @@ from .kt.types.channel.channel_info import ChannelInfo
from .kt.types.channel.channel_type import KnownChannelType, ChannelType
from .kt.types.chat.chat import Chatlog
from .kt.client.types import UserInfoUnion, PortalChannelInfo, ChannelProps
from .kt.client.types import UserInfoUnion, PortalChannelInfo
from .kt.client.errors import CommandException
if TYPE_CHECKING:
@ -194,13 +194,6 @@ class Portal(DBPortal, BasePortal):
raise ValueError(f"Non-direct chat portal should have no sender, but has sender {self._kt_sender}")
return self._kt_sender
@property
def channel_props(self) -> ChannelProps:
return ChannelProps(
id=self.ktid,
type=self.kt_type
)
@property
def main_intent(self) -> IntentAPI:
if not self._main_intent:
@ -252,7 +245,7 @@ class Portal(DBPortal, BasePortal):
) -> PortalChannelInfo:
if not info:
self.log.debug("Called update_info with no info, fetching channel info...")
info = await source.client.get_portal_channel_info(self.channel_props)
info = await source.client.get_portal_channel_info(self.ktid)
changed = False
if not self.is_direct:
changed = any(
@ -407,7 +400,7 @@ class Portal(DBPortal, BasePortal):
async def _update_participants(self, source: u.User, participants: list[UserInfoUnion] | None = None) -> bool:
if participants is None:
self.log.debug("Called _update_participants with no participants, fetching them now...")
participants = await source.client.get_participants(self.channel_props)
participants = await source.client.get_participants(self.ktid)
changed = False
if not self._main_intent:
assert self.is_direct, "_main_intent for non-direct chat portal should have been set already"
@ -743,7 +736,7 @@ class Portal(DBPortal, BasePortal):
converted = await matrix_to_kakaotalk(message, self.mxid, self.log)
try:
chatlog = await sender.client.send_message(
self.channel_props,
self.ktid,
text=converted.text,
# TODO
#mentions=converted.mentions,
@ -966,7 +959,7 @@ class Portal(DBPortal, BasePortal):
self.log.debug(f"Backfilling history through {source.mxid}")
self.log.debug(f"Fetching {f'up to {limit}' if limit else 'all'} messages through {source.ktid}")
messages = await source.client.get_chats(
self.channel_props,
channel_info.channelId,
after_log_id,
limit
)
@ -996,6 +989,7 @@ class Portal(DBPortal, BasePortal):
# TODO Save kt_sender in DB instead? Depends on if DM channels are shared...
user = await u.User.get_by_ktid(self.kt_receiver)
assert user, f"Found no user for this portal's receiver of {self.kt_receiver}"
# TODO Should this backfill? Useful for forgotten channels
await self._update_participants(user)
else:
self.log.debug("Not setting _main_intent of new direct chat until after checking participant list")

2
matrix_appservice_kakaotalk/rpc/rpc.py
View File

@ -83,7 +83,7 @@ class RPCClient:
await self.request("register", peer_id=self.config["appservice.address"])
async def disconnect(self) -> None:
if self._writer is not None:
assert self._writer is not None
self._writer.write_eof()
await self._writer.drain()
self._writer = None

16
matrix_appservice_kakaotalk/user.py
View File

@ -42,7 +42,7 @@ from .kt.types.bson import Long
from .kt.types.channel.channel_info import ChannelInfo, NormalChannelInfo, NormalChannelData
from .kt.types.channel.channel_type import ChannelType
from .kt.types.chat.chat import Chatlog
from .kt.types.client.client_session import LoginDataItem, LoginResult
from .kt.types.client.client_session import ChannelLoginDataItem, LoginResult
from .kt.types.oauth import OAuthCredential
from .kt.types.openlink.open_channel_info import OpenChannelData, OpenChannelInfo
@ -449,19 +449,19 @@ class User(DBUser, BaseUser):
sync_count = num_channels if sync_count < 0 else min(sync_count, num_channels)
await self.push_bridge_state(BridgeStateEvent.BACKFILLING)
self.log.debug(f"Syncing {sync_count} of {num_channels} channels...")
for login_data in login_result.channelList[:sync_count]:
for channel_item in login_result.channelList[:sync_count]:
try:
await self._sync_channel(login_data)
await self._sync_channel(channel_item)
except AuthenticationRequired:
raise
except Exception:
self.log.exception(f"Failed to sync channel {login_data.channel.channelId}")
self.log.exception(f"Failed to sync channel {channel_item.channel.channelId}")
await self.update_direct_chats()
async def _sync_channel(self, login_data: LoginDataItem) -> None:
channel_data = login_data.channel
self.log.debug(f"Syncing channel {channel_data.channelId} (last updated at {login_data.lastUpdate})")
async def _sync_channel(self, channel_item: ChannelLoginDataItem) -> None:
channel_data = channel_item.channel
self.log.debug(f"Syncing channel {channel_data.channelId} (last updated at {channel_item.lastUpdate})")
channel_info = channel_data.info
if isinstance(channel_data, NormalChannelData):
channel_data: NormalChannelData
@ -499,7 +499,7 @@ class User(DBUser, BaseUser):
kt_receiver=self.ktid,
kt_type=channel_info.type
)
portal_info = await self.client.get_portal_channel_info(portal.channel_props)
portal_info = await self.client.get_portal_channel_info(channel_info.channelId)
portal_info.channel_info = channel_info
if not portal.mxid:
await portal.create_matrix_room(self, portal_info)

68
node/src/client.js
View File

@ -14,7 +14,6 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
import { Long } from "bson"
import {
AuthApiClient,
OAuthApiClient,
@ -23,12 +22,10 @@ import {
KnownAuthStatusCode,
util,
} from "node-kakao"
/** @typedef {import("node-kakao").OAuthCredential} OAuthCredential */
/** @typedef {import("node-kakao/dist/talk").TalkChannelList} TalkChannelList */
/** @typedef {import("node-kakao").ChannelType} ChannelType */
import chat from "node-kakao/chat"
const { KnownChatType } = chat
/** @typedef {import("node-kakao").OAuthCredential} OAuthCredential */
/** @typedef {import("./clientmanager.js").default} ClientManager} */
import { emitLines, promisify } from "./util.js"
@ -70,30 +67,6 @@ class UserClient {
return userClient
}
/**
* @param {Object} channel_props
* @param {Long} channel_props.id
* @param {ChannelType} channel_props.type
*/
async getChannel(channel_props) {
let channel = this.#talkClient.channelList.get(channel_props.id)
if (channel) {
return channel
} else {
const channelList = getChannelListForType(
this.#talkClient.channelList,
channel_props.type
)
const res = await channelList.addChannel({
channelId: channel_props.id,
})
if (!res.success) {
throw new Error(`Unable to add ${channel_props.type} channel ${channel_props.id}`)
}
return res.result
}
}
close() {
this.#talkClient.close()
}
@ -109,21 +82,20 @@ class UserClient {
export default class PeerClient {
/**
* @param {import("./clientmanager.js").default} manager
* @param {ClientManager} manager
* @param {import("net").Socket} socket
* @param {number} connID
* @param {Map<string, UserClient>} userClients
*/
constructor(manager, socket, connID) {
this.manager = manager
this.socket = socket
this.connID = connID
this.stopped = false
this.notificationID = 0
this.maxCommandID = 0
this.peerID = null
/** @type {Map<string, UserClient>} */
this.userClients = new Map()
}
@ -363,11 +335,11 @@ export default class PeerClient {
/**
* @param {Object} req
* @param {string} req.mxid
* @param {Object} req.channel_props
* @param {Long} req.channel_id
*/
getPortalChannelInfo = async (req) => {
const userClient = this.#getUser(req.mxid)
const talkChannel = await userClient.getChannel(req.channel_props)
const talkChannel = userClient.talkClient.channelList.get(req.channel_id)
const res = await talkChannel.updateAll()
if (!res.success) return res
@ -382,24 +354,24 @@ export default class PeerClient {
/**
* @param {Object} req
* @param {string} req.mxid
* @param {Object} req.channel_props
* @param {Long} req.channel_id
*/
getParticipants = async (req) => {
const userClient = this.#getUser(req.mxid)
const talkChannel = await userClient.getChannel(req.channel_props)
const talkChannel = userClient.getChannel(req.channel_id)
return await talkChannel.getAllLatestUserInfo()
}
/**
* @param {Object} req
* @param {string} req.mxid
* @param {Object} req.channel_props
* @param {Long} req.channel_id
* @param {Long?} req.sync_from
* @param {Number?} req.limit
*/
getChats = async (req) => {
const userClient = this.#getUser(req.mxid)
const talkChannel = await userClient.getChannel(req.channel_props)
const talkChannel = userClient.talkClient.channelList.get(req.channel_id)
const res = await talkChannel.getChatListFrom(req.sync_from)
if (res.success && 0 < req.limit && req.limit < res.result.length) {
@ -411,12 +383,12 @@ export default class PeerClient {
/**
* @param {Object} req
* @param {string} req.mxid
* @param {Object} req.channel_props
* @param {Long} req.channel_id
* @param {string} req.text
*/
sendMessage = async (req) => {
const userClient = this.#getUser(req.mxid)
const talkChannel = await userClient.getChannel(req.channel_props)
const talkChannel = userClient.talkClient.channelList.get(req.channel_id)
return await talkChannel.sendChat({
type: KnownChatType.TEXT,
@ -472,7 +444,6 @@ export default class PeerClient {
this.log("Ignoring old request", req.id)
return
}
this.log("Received request", req.id, "with command", req.command)
this.maxCommandID = req.id
let handler
if (!this.peerID) {
@ -543,18 +514,3 @@ export default class PeerClient {
return value
}
}
/**
* @param {TalkChannelList} channelList
* @param {ChannelType} channelType
*/
function getChannelListForType(channelList, channelType) {
switch (channelType) {
case "OM":
case "OD":
return channelList.open
default:
return channelList.normal
}
}