From e446121192d702942abe7ed890fb8ec5b3cf851c Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 30 Dec 2021 12:20:36 +0200
Subject: [PATCH] Fix order of operations when syncing contacts

---
 CHANGELOG.md             | 3 ++-
 mautrix_telegram/user.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd819fa7..158848bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
-# (unreleased)
+# v0.11.1 (2021-0?-??, unreleased)
 
 * Added support for message reactions
 * Added support for spoiler text.
+* Fixed syncing contacts throwing an error for new accounts.
 
 # v0.11.0 (2021-12-28)
 
diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py
index 4953b6ed..a9bb3edf 100644
--- a/mautrix_telegram/user.py
+++ b/mautrix_telegram/user.py
@@ -655,10 +655,10 @@ class User(DBUser, AbstractUser, BaseUser):
         if self.saved_contacts != response.saved_count:
             self.saved_contacts = response.saved_count
             await self.save()
-        await self.set_contacts(user.id for user in response.users)
         for user in response.users:
             puppet = await pu.Puppet.get_by_tgid(user.id)
             await puppet.update_info(self, user)
+        await self.set_contacts(user.id for user in response.users)
 
     # endregion
     # region Class instance lookup