Resolve conflicts

2 files changed, 20 insertions, 3 deletions

diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py
index edec0a1e..423e806e 100644
--- a/pydis_site/apps/api/viewsets/bot/infraction.py
+++ b/pydis_site/apps/api/viewsets/bot/infraction.py
@@ -5,6 +5,7 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.mixins import (
     CreateModelMixin,
+    DestroyModelMixin,
     ListModelMixin,
     RetrieveModelMixin
 )
@@ -18,7 +19,13 @@ from pydis_site.apps.api.serializers import (
 )
 
 
-class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, GenericViewSet):
+class InfractionViewSet(
+    CreateModelMixin,
+    RetrieveModelMixin,
+    ListModelMixin,
+    GenericViewSet,
+    DestroyModelMixin
+):
     """
     View providing CRUD operations on infractions for Discord users.
 
@@ -108,6 +115,13 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     - 400: if a field in the request body is invalid or disallowed
     - 404: if an infraction with the given `id` could not be found
 
+    ### DELETE /bot/infractions/<id:int>
+    Delete the infraction with the given `id`.
+
+    #### Status codes
+    - 204: returned on success
+    - 404: if a infraction with the given `id` does not exist
+
     ### Expanded routes
     All routes support expansion of `user` and `actor` in responses. To use an expanded route,
     append `/expanded` to the end of the route e.g. `GET /bot/infractions/expanded`.
diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index 5205dc97..829e2694 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -109,8 +109,10 @@ class UserViewSet(ModelViewSet):
 
     #### Response format
     >>> {
-    ...    "verified_at": "2020-10-06T21:54:23.540766",
-    ...    "total_messages": 2
+    ...    "joined_at": "2020-10-06T21:54:23.540766",
+    ...    "total_messages": 2,
+    ...    "voice_banned": False,
+    ...    "activity_blocks": 1
     ...}
 
     #### Status codes
@@ -255,6 +257,7 @@ class UserViewSet(ModelViewSet):
                 data = metricity.user(user.id)
                 data["total_messages"] = metricity.total_messages(user.id)
                 data["voice_banned"] = voice_banned
+                data["activity_blocks"] = metricity.total_message_blocks(user.id)
                 return Response(data, status=status.HTTP_200_OK)
             except NotFound:
                 return Response(dict(detail="User not found in metricity"),