From 1664bebfb797989c2efd32956f2bed0cd6c1a784 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 4 Sep 2020 16:05:22 +0300
Subject: [PATCH] Update fbchat
---
mautrix_facebook/user.py | 3 ++-
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mautrix_facebook/user.py b/mautrix_facebook/user.py
index 2730308..0eaeca5 100644
--- a/mautrix_facebook/user.py
+++ b/mautrix_facebook/user.py
@@ -364,7 +364,8 @@ class User(BaseUser):
if contact and ic:
contact.edit(in_community=True)
elif not contact:
- DBContact(user=self.fbid, contact=puppet.fbid, in_community=ic).insert()
+ # This uses upsert instead of insert as a hacky fix for potential conflicts
+ DBContact(user=self.fbid, contact=puppet.fbid, in_community=ic).upsert()
async def sync_contacts(self):
try:
diff --git a/requirements.txt b/requirements.txt
index 57cf8ae..a5a25f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ ruamel.yaml>=0.15.94,<0.17
commonmark>=0.8,<0.10
python-magic>=0.4,<0.5
mautrix==0.7.0rc4
-fbchat-asyncio>=0.6.13,<0.7
+fbchat-asyncio>=0.6.15,<0.7
--
GitLab