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

Assorted minor fixes

This commit is contained in:
Andrew Ferrazzutti 2022-05-02 03:13:18 -04:00
parent e35082bbea
commit 6623dd46c0
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix_appservice_kakaotalk/commands/auth.py
View File

@ -66,7 +66,7 @@ async def login(evt: CommandEvent) -> None:
"action": "Login", "action": "Login",
"room_id": evt.room_id, "room_id": evt.room_id,
"next": enter_password, "next": enter_password,
"email": evt.args[0], "email": email,
} }
""" TODO Implement web login """ TODO Implement web login

4
matrix_appservice_kakaotalk/commands/conn.py
View File

@ -96,7 +96,7 @@ async def ping(evt: CommandEvent) -> None:
management_only=True, management_only=True,
help_section=SECTION_CONNECTION, help_section=SECTION_CONNECTION,
help_text="(Re)connect to KakaoTalk chats & sync any missed chat updates", help_text="(Re)connect to KakaoTalk chats & sync any missed chat updates",
help_args="[number_of_channels_to_sync]", help_args="[_number of channels to sync_]",
) )
async def sync(evt: CommandEvent) -> None: async def sync(evt: CommandEvent) -> None:
try: try:
@ -104,7 +104,7 @@ async def sync(evt: CommandEvent) -> None:
except IndexError: except IndexError:
sync_count = None sync_count = None
except ValueError: except ValueError:
await evt.reply("**Usage:** `sync [number_of_channels_to_sync]`") await evt.reply("The number of channels to sync must either be an integer, or be left unspecified.")
return return
await evt.mark_read() await evt.mark_read()

1
matrix_appservice_kakaotalk/db/__init__.py
View File

@ -32,7 +32,6 @@ __all__ = [
"init", "init",
"Message", "Message",
"Portal", "Portal",
"ThreadType",
"Puppet", "Puppet",
"User", "User",
] ]

4
matrix_appservice_kakaotalk/example-config.yaml
View File

@ -93,9 +93,7 @@ bridge:
# {userid} is replaced with the user ID of the KakaoTalk user. # {userid} is replaced with the user ID of the KakaoTalk user.
username_template: "kakaotalk_{userid}" username_template: "kakaotalk_{userid}"
# Displayname template for KakaoTalk users. # Displayname template for KakaoTalk users.
# {displayname} is replaced with the display name of the KakaoTalk user # {displayname} is replaced with the display name of the KakaoTalk user.
# as defined below in displayname_preference.
# Keys available for displayname_preference are also available here.
displayname_template: "{displayname} (KT)" displayname_template: "{displayname} (KT)"
# The prefix for commands. Only required in non-management rooms. # The prefix for commands. Only required in non-management rooms.

7
matrix_appservice_kakaotalk/user.py
View File

@ -135,7 +135,7 @@ class User(DBUser, BaseUser):
self._is_connected = None self._is_connected = None
self._connection_time = time.monotonic() self._connection_time = time.monotonic()
self._sync_lock = SimpleLock( self._sync_lock = SimpleLock(
"Waiting for thread sync to finish before handling %s", log=self.log "Waiting for channel sync to finish before handling %s", log=self.log
) )
self._is_rpc_reconnecting = False self._is_rpc_reconnecting = False
self._logged_in_info = None self._logged_in_info = None
@ -348,7 +348,7 @@ class User(DBUser, BaseUser):
state_event=BridgeStateEvent.TRANSIENT_DISCONNECT, state_event=BridgeStateEvent.TRANSIENT_DISCONNECT,
) )
await asyncio.sleep(60) await asyncio.sleep(60)
await self.reload_session(event_id, retries - 1, is_startup) await self.reload_session(event_id, retries - 1)
else: else:
await self.send_bridge_notice( await self.send_bridge_notice(
notice, notice,
@ -685,8 +685,9 @@ class User(DBUser, BaseUser):
if self.temp_disconnect_notices: if self.temp_disconnect_notices:
await self.send_bridge_notice( await self.send_bridge_notice(
"Disconnected from KakaoTalk: backend helper module exited. " "Disconnected from KakaoTalk: backend helper module exited. "
"Will reconnect once module resumes." "Will reconnect once the module resumes."
) )
await self.push_bridge_state(BridgeStateEvent.TRANSIENT_DISCONNECT)
self._is_rpc_reconnecting = True self._is_rpc_reconnecting = True
asyncio.create_task(self.reload_session()) asyncio.create_task(self.reload_session())