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

Compare commits

base: hnarjis:2dc078db3589df20e26b1f66ccdc06f241a440e9
Branches Tags
hnarjis:master
hnarjis:user-instantiation-fix
hnarjis:python38
hnarjis:testing
fair:master
fair:kt-version
fair:python38
fair:testing
..
compare: hnarjis:86c038fd2ffee5e0aebf65136f085cce7e38b54e
Branches Tags
hnarjis:user-instantiation-fix
hnarjis:python38
hnarjis:testing
hnarjis:master
fair:master
fair:kt-version
fair:python38
fair:testing

No commits in common. "2dc078db3589df20e26b1f66ccdc06f241a440e9" and "86c038fd2ffee5e0aebf65136f085cce7e38b54e" have entirely different histories.
2dc078db35 ... 86c038fd2f

4 changed files with 3 additions and 35 deletions
Show Stats Expand all files Collapse all files

4
matrix_appservice_kakaotalk/user.py
View File

@ -424,10 +424,10 @@ class User(DBUser, BaseUser):
state_event=BridgeStateEvent.UNKNOWN_ERROR, state_event=BridgeStateEvent.UNKNOWN_ERROR,
error_code="kt-reconnection-error", error_code="kt-reconnection-error",
) )
except Exception as e: except Exception:
self.log.exception("Error connecting to KakaoTalk") self.log.exception("Error connecting to KakaoTalk")
await self.send_bridge_notice( await self.send_bridge_notice(
f"Failed to connect to KakaoTalk: {e.message}", "Failed to connect to KakaoTalk: unknown error (see logs for more details)",
edit=event_id, edit=event_id,
state_event=BridgeStateEvent.UNKNOWN_ERROR, state_event=BridgeStateEvent.UNKNOWN_ERROR,
error_code="kt-reconnection-error", error_code="kt-reconnection-error",

1
node/package.json
View File

@ -19,7 +19,6 @@
}, },
"dependencies": { "dependencies": {
"arg": "^4.1.3", "arg": "^4.1.3",
"hash-wasm": "^4.8.0",
"node-kakao": "4.5.0", "node-kakao": "4.5.0",
"systemd-daemon": "^1.1.2" "systemd-daemon": "^1.1.2"
}, },

3
node/src/client.js
View File

@ -40,7 +40,6 @@ const { OpenChannelUserPerm } = openlink
import chat from "node-kakao/chat" import chat from "node-kakao/chat"
const { KnownChatType } = chat const { KnownChatType } = chat
import * as modutil from "./modutil.js"
import { emitLines, promisify } from "./util.js" import { emitLines, promisify } from "./util.js"
/** /**
@ -582,7 +581,7 @@ export default class PeerClient {
* @param {string} uuid * @param {string} uuid
*/ */
async #createAuthClient(uuid) { async #createAuthClient(uuid) {
return await AuthApiClient.create(this.deviceName, uuid, {}, modutil.ModXVCProvider) return await AuthApiClient.create(this.deviceName, uuid)
} }
// TODO Wrapper for per-user commands // TODO Wrapper for per-user commands

30
node/src/modutil.js
View File

@ -1,30 +0,0 @@
// matrix-appservice-kakaotalk - A Matrix-KakaoTalk puppeting bridge.
// Copyright (C) 2022 Tulir Asokan, Andrew Ferrazzutti
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// 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 { sha512 } from "hash-wasm"
import kakao from "node-kakao"
const { DefaultConfiguration } = kakao
DefaultConfiguration.version = "3.4.2"
DefaultConfiguration.appVersion = "3.4.2.3187"
export const ModXVCProvider = {
toFullXVCKey(deviceUUID, userAgent, email) {
const source = `WINTER|${userAgent}|ARTHUR|${email}|${deviceUUID}`
return sha512(source)
}
}