blaxpot
/
matrix-puppeteer-line
forked from fair/matrix-puppeteer-line
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't error-out on re-encountered message ID 

Instead, post notice that bridging the message may have failed.
This commit is contained in:
Andrew Ferrazzutti 2021-03-31 01:57:18 -04:00
parent 9d6c7efa70
commit d09a6c443a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix_puppeteer_line/portal.py
View File

@ -14,6 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from typing import Dict, Optional, List, Set, Any, AsyncGenerator, NamedTuple, TYPE_CHECKING, cast from typing import Dict, Optional, List, Set, Any, AsyncGenerator, NamedTuple, TYPE_CHECKING, cast
from asyncpg.exceptions import UniqueViolationError
import mimetypes import mimetypes
import asyncio import asyncio
@ -144,13 +145,16 @@ class Portal(DBPortal, BasePortal):
temp_file.write(data) temp_file.write(data)
message_id = await sender.client.send_file(self.chat_id, file_path) message_id = await sender.client.send_file(self.chat_id, file_path)
remove(file_path) remove(file_path)
# TODO Handle message-send timeouts better msg = None
if message_id != -1: if message_id != -1:
msg = DBMessage(mxid=event_id, mx_room=self.mxid, mid=message_id, chat_id=self.chat_id) try:
await msg.insert() msg = DBMessage(mxid=event_id, mx_room=self.mxid, mid=message_id, chat_id=self.chat_id)
await self._send_delivery_receipt(event_id) await msg.insert()
self.log.debug(f"Handled Matrix message {event_id} -> {message_id}") await self._send_delivery_receipt(event_id)
else: self.log.debug(f"Handled Matrix message {event_id} -> {message_id}")
except UniqueViolationError as e:
self.log.warning(f"Failed to handle Matrix message {event_id} -> {message_id}: {e}")
if not msg:
await self.main_intent.send_notice( await self.main_intent.send_notice(
self.mxid, self.mxid,
"Posting this message to LINE may have failed.", "Posting this message to LINE may have failed.",