From 04b7285e232bddb38bc849b349145e71c0ea1424 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 30 Jan 2020 11:20:44 +0000
Subject: [PATCH] Add empty push rules into account data on account creation
 (#862)

---
 clientapi/auth/storage/accounts/postgres/storage.go | 11 +++++++++++
 clientapi/auth/storage/accounts/sqlite3/storage.go  | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/clientapi/auth/storage/accounts/postgres/storage.go b/clientapi/auth/storage/accounts/postgres/storage.go
index 1330c6976..cb74d1315 100644
--- a/clientapi/auth/storage/accounts/postgres/storage.go
+++ b/clientapi/auth/storage/accounts/postgres/storage.go
@@ -140,6 +140,17 @@ func (d *Database) CreateAccount(
 		}
 		return nil, err
 	}
+	if err := d.SaveAccountData(ctx, localpart, "", "m.push_rules", `{
+		"global": {
+			"content": [],
+			"override": [],
+			"room": [],
+			"sender": [],
+			"underride": []
+		}
+	}`); err != nil {
+		return nil, err
+	}
 	return d.accounts.insertAccount(ctx, localpart, hash, appserviceID)
 }
 
diff --git a/clientapi/auth/storage/accounts/sqlite3/storage.go b/clientapi/auth/storage/accounts/sqlite3/storage.go
index 656c7d39a..535cc181f 100644
--- a/clientapi/auth/storage/accounts/sqlite3/storage.go
+++ b/clientapi/auth/storage/accounts/sqlite3/storage.go
@@ -181,6 +181,18 @@ func (d *Database) UpdateMemberships(
 			}
 		}
 
+		if err := d.SaveAccountData(ctx, localpart, "", "m.push_rules", `{
+			"global": {
+				"content": [],
+				"override": [],
+				"room": [],
+				"sender": [],
+				"underride": []
+			}
+		}`); err != nil {
+			return nil, err
+		}
+
 		return nil
 	})
 }