Add a period to the changelog

changelog.d/8404.misc

@@ -0,0 +1 @@
+Do not include appservice users when calculating the total MAU for a server.

synapse/storage/databases/main/monthly_active_users.py

@@ -45,7 +45,9 @@ class MonthlyActiveUsersWorkerStore(SQLBaseStore):
             sql = """
                 SELECT COALESCE(count(*), 0)
                 FROM monthly_active_users
-                INNER JOIN users ON monthly_active_users.user_id=users.name AND appservice_id IS NULL;
+                    LEFT JOIN users
+                    ON monthly_active_users.user_id=users.name
+                WHERE (users.appservice_id IS NULL OR users.appservice_id = '');
             """
             txn.execute(sql)
             (count,) = txn.fetchone()

tests/storage/test_monthly_active_users.py

@@ -138,11 +138,15 @@ class MonthlyActiveUsersTestCase(unittest.HomeserverTestCase):
         self.assertEqual(count, 1)
 
     def test_appservice_user_not_counted_in_mau(self):
-        self.get_success(self.store.register_user(user_id="@appservice_user:server", appservice_id="wibble"))
+        self.get_success(
+            self.store.register_user(
+                user_id="@appservice_user:server", appservice_id="wibble"
+            )
+        )
         count = self.get_success(self.store.get_monthly_active_count())
         self.assertEqual(count, 0)
 
-        d = self.store.upsert_monthly_active_user("@user:server")
+        d = self.store.upsert_monthly_active_user("@appservice_user:server")
         self.get_success(d)
 
         count = self.get_success(self.store.get_monthly_active_count())
@@ -394,7 +398,7 @@ class MonthlyActiveUsersTestCase(unittest.HomeserverTestCase):
         self.get_success(self.store.upsert_monthly_active_user(appservice2_user1))
 
         count = self.get_success(self.store.get_monthly_active_count())
-        self.assertEqual(count, 4)
+        self.assertEqual(count, 1)
 
         d = self.store.get_monthly_active_count_by_service()
         result = self.get_success(d)