Merge branch 'release-v1.22.0' into develop

changelog.d/8654.bugfix

@@ -0,0 +1 @@
+Fix `user_daily_visits` to not have duplicate rows for UA. Broke in v1.22.0rc1.

changelog.d/8656.bugfix

@@ -0,0 +1 @@
+Fix a bug introduced in v1.22.0rc1 where presence events were not properly passed to application services.

synapse/handlers/appservice.py

@@ -288,7 +288,7 @@ async def _handle_presence(
                 user=user, service=service, from_key=from_key,
             )
             time_now = self.clock.time_msec()
-            presence_events = [
+            events.extend(
                 {
                     "type": "m.presence",
                     "sender": event.user_id,
@@ -297,8 +297,9 @@ async def _handle_presence(
                     ),
                 }
                 for event in presence_events
-            ]
-            events = events + presence_events
+            )
+
+        return events
 
     async def query_user_exists(self, user_id):
         """Check if any application service knows this user_id exists.

synapse/storage/databases/main/metrics.py

@@ -282,9 +282,10 @@ def _generate_user_daily_visits(txn):
             now = self._clock.time_msec()
 
             # A note on user_agent. Technically a given device can have multiple
-            # user agents, so we need to decide which one to pick. We could have handled this
-            # in number of ways, but given that we don't _that_ much have gone for MAX()
-            # For more details of the other options considered see
+            # user agents, so we need to decide which one to pick. We could have
+            # handled this in number of ways, but given that we don't care
+            # _that_ much we have gone for MAX(). For more details of the other
+            # options considered see
             # https://github.com/matrix-org/synapse/pull/8503#discussion_r502306111
             sql = """
                 INSERT INTO user_daily_visits (user_id, device_id, timestamp, user_agent)
@@ -299,7 +300,7 @@ def _generate_user_daily_visits(txn):
                     WHERE last_seen > ? AND last_seen <= ?
                     AND udv.timestamp IS NULL AND users.is_guest=0
                     AND users.appservice_id IS NULL
-                    GROUP BY u.user_id, u.device_id, u.user_agent
+                    GROUP BY u.user_id, u.device_id
             """
 
             # This means that the day has rolled over but there could still