Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/cassettes/test_push_update.yaml b/tests/cassettes/test_push_update.yaml
index 8929b88..ae63d12 100644
--- a/tests/cassettes/test_push_update.yaml
+++ b/tests/cassettes/test_push_update.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BM8%2FoiVbTQpdqT%2Fw80MIvDMoLI0pOiBBlVnOTZNIWpT8u%2BcAufNi5ZHpifoI7YzQJIbA82g4zc6zSgYEW1%2BZhv8%3D&subscription%5Bkeys%5D%5Bauth%5D=HPq7PnVB8YXjE2AdbIpVLQ%3D%3D&data%5Balerts%5D%5Bfollow%5D=0&data%5Balerts%5D%5Bfavourite%5D=0&data%5Balerts%5D%5Breblog%5D=0&data%5Balerts%5D%5Bmention%5D=0
+    body: subscription%5Bendpoint%5D=https%3A%2F%2Fexample.com&subscription%5Bkeys%5D%5Bp256dh%5D=BA%2BI7U8ZfOqZu2UpiX6H34%2F50Kx0r40Oo5ZrKR7Oho19ahcww%2FproVZHu9LQvauwNisPMKXHTZQHgglz51ysTss%3D&subscription%5Bkeys%5D%5Bauth%5D=noSOjb%2FMZ6ViOAAUUPrg4Q%3D%3D&data%5Balerts%5D%5Bfollow%5D=0&data%5Balerts%5D%5Bfavourite%5D=0&data%5Balerts%5D%5Breblog%5D=0&data%5Balerts%5D%5Bmention%5D=0
     headers:
       Accept:
       - '*/*'
@@ -20,14 +20,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-WbxenrOVrir/tBGwXifiaA=='';
+        style-src ''self'' http://localhost:3000 ''nonce-C2+xepY+TzuPoC5ZV4WgDg=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -37,7 +37,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"c7c21bc52b1e9c3ec8fabd6d70c84a85"
+      - W/"fb3f3c19ad4489eea9490dbb112eaec7"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -53,9 +53,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 960e47fd-23f9-4e7b-a79b-74139c0708eb
+      - d3224b57-725a-4a07-baee-451ed7d630e0
       X-Runtime:
-      - '0.014556'
+      - '0.013611'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -82,14 +82,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":true,"reblog":true,"follow":true,"favourite":true},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":true,"reblog":true,"follow":true,"favourite":true},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-qUAxPxHn6te77PLdA4KI0g=='';
+        style-src ''self'' http://localhost:3000 ''nonce-P7uFOgUppk/OQr9N1XBMKw=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -99,7 +99,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"10c614045aa34357d3beaf175fe69bcc"
+      - W/"4aba637b3f926712cb304e61f9329f85"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -115,9 +115,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - daaa3c29-82ab-4a0a-94a4-79f0693c3d82
+      - 68a04685-d1c1-4b04-9824-7d5431c80c61
       X-Runtime:
-      - '0.010848'
+      - '0.010486'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -140,14 +140,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":true,"reblog":true,"follow":true,"favourite":true},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":true,"reblog":true,"follow":true,"favourite":true},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-rxECX1Kr7fjbgyIxVfZVqw=='';
+        style-src ''self'' http://localhost:3000 ''nonce-KCSQW9Ius6TBaVJg7GTqfw=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -157,7 +157,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"10c614045aa34357d3beaf175fe69bcc"
+      - W/"4aba637b3f926712cb304e61f9329f85"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -173,9 +173,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 8c89f845-3655-417d-9c0a-58be4a7a1cb3
+      - 83bedc8c-c817-40a3-9b40-403cb47bb3e1
       X-Runtime:
-      - '0.007446'
+      - '0.007784'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -202,14 +202,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-wuH2f2SAR/XhlzL4Tc+jtg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-ewywANVddKaJFno9xyuzFg=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -219,7 +219,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"c7c21bc52b1e9c3ec8fabd6d70c84a85"
+      - W/"fb3f3c19ad4489eea9490dbb112eaec7"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -235,9 +235,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - f5c8acd5-e2cf-468f-9cc5-7ae564fb16d8
+      - 52d60226-2590-473e-9c78-e6d972af8659
       X-Runtime:
-      - '0.011918'
+      - '0.010261'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -260,14 +260,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-iKzPZ/DNgQoI+6RHrpu0lw=='';
+        style-src ''self'' http://localhost:3000 ''nonce-hpoueSla0DUlWZRBE+TRSg=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -277,7 +277,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"c7c21bc52b1e9c3ec8fabd6d70c84a85"
+      - W/"fb3f3c19ad4489eea9490dbb112eaec7"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -293,9 +293,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 755cd060-6658-4ab5-b7e5-a12d117b0492
+      - 65845282-e314-4f44-bcd6-c4e6a5279e89
       X-Runtime:
-      - '0.008324'
+      - '0.007544'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -318,14 +318,14 @@ interactions:
     uri: http://localhost:3000/api/v1/push/subscription
   response:
     body:
-      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BMW1iZ3p5HXHHMmkMJ6jdQM9egogj2xIhMMIWtY1w4Cv-ENlqvh8MEU9QeSrfVQGJVo499S7sssiJYQ6AFMEt7U="}'
+      string: '{"id":2,"endpoint":"https://example.com","alerts":{"mention":false,"reblog":false,"follow":false,"favourite":false},"server_key":"BIX7IY8wYrdPf5wfG59B5B4CBbpQWmOBr_SI9zEsCDfMGDx8KmPuu-3WP7b-amaekv2NZj3ZSNst9OaqoxXvC1s="}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-8+x5PjYCLsB9q7zL+pyd0w=='';
+        style-src ''self'' http://localhost:3000 ''nonce-7Zz9KdnwAy6UMAAFZGp4+w=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -335,7 +335,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"c7c21bc52b1e9c3ec8fabd6d70c84a85"
+      - W/"fb3f3c19ad4489eea9490dbb112eaec7"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -351,9 +351,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - c2576e21-2a66-455f-b281-c82f3ae81d6c
+      - 90465785-4154-4eef-82e9-364d1a367c1c
       X-Runtime:
-      - '0.006889'
+      - '0.006412'
       X-XSS-Protection:
       - 1; mode=block
     status: