From f1b9e3595df3fed48527feabc116c5122a2019ca Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 26 Aug 2020 15:43:34 -0500 Subject: Update AdminFE build in preparation for 2.1.0 release --- priv/static/adminfe/chunk-0171.82f5a48b.css | Bin 0 -> 4270 bytes priv/static/adminfe/chunk-0171.8dc0d9da.css | Bin 3545 -> 0 bytes priv/static/adminfe/chunk-565e.33809ac8.css | Bin 26965 -> 0 bytes priv/static/adminfe/chunk-565e.aed36fe0.css | Bin 0 -> 26991 bytes priv/static/adminfe/chunk-6e8c.5832dc0a.css | Bin 0 -> 5199 bytes priv/static/adminfe/chunk-6e8c.f7407fd4.css | Bin 4474 -> 0 bytes priv/static/adminfe/chunk-7503.37b33ad8.css | Bin 0 -> 4015 bytes priv/static/adminfe/chunk-7503.c75b68df.css | Bin 3290 -> 0 bytes priv/static/adminfe/index.html | 2 +- priv/static/adminfe/static/js/app.86bfcdf3.js | Bin 203611 -> 0 bytes priv/static/adminfe/static/js/app.86bfcdf3.js.map | Bin 449775 -> 0 bytes priv/static/adminfe/static/js/app.ad6a566b.js | Bin 0 -> 204431 bytes priv/static/adminfe/static/js/app.ad6a566b.js.map | Bin 0 -> 451525 bytes priv/static/adminfe/static/js/chunk-0171.006185b1.js | Bin 0 -> 25208 bytes .../adminfe/static/js/chunk-0171.006185b1.js.map | Bin 0 -> 97447 bytes priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js | Bin 24601 -> 0 bytes .../adminfe/static/js/chunk-0171.9ad03c0e.js.map | Bin 94865 -> 0 bytes priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js | Bin 126482 -> 0 bytes .../adminfe/static/js/chunk-565e.32b3b7b0.js.map | Bin 426950 -> 0 bytes priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js | Bin 0 -> 127324 bytes .../adminfe/static/js/chunk-565e.61a8d6f8.js.map | Bin 0 -> 429257 bytes priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js | Bin 26275 -> 0 bytes .../adminfe/static/js/chunk-6e8c.46fda72d.js.map | Bin 86864 -> 0 bytes priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js | Bin 0 -> 27154 bytes .../adminfe/static/js/chunk-6e8c.ca3f6a22.js.map | Bin 0 -> 90354 bytes priv/static/adminfe/static/js/chunk-7503.4ad05fac.js | Bin 0 -> 19166 bytes .../adminfe/static/js/chunk-7503.4ad05fac.js.map | Bin 0 -> 64883 bytes priv/static/adminfe/static/js/chunk-7503.ee7af549.js | Bin 18559 -> 0 bytes .../adminfe/static/js/chunk-7503.ee7af549.js.map | Bin 62271 -> 0 bytes priv/static/adminfe/static/js/runtime.aaeb14f8.js | Bin 0 -> 4260 bytes priv/static/adminfe/static/js/runtime.aaeb14f8.js.map | Bin 0 -> 17283 bytes priv/static/adminfe/static/js/runtime.ba9393f3.js | Bin 4260 -> 0 bytes priv/static/adminfe/static/js/runtime.ba9393f3.js.map | Bin 17283 -> 0 bytes 33 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 priv/static/adminfe/chunk-0171.82f5a48b.css delete mode 100644 priv/static/adminfe/chunk-0171.8dc0d9da.css delete mode 100644 priv/static/adminfe/chunk-565e.33809ac8.css create mode 100644 priv/static/adminfe/chunk-565e.aed36fe0.css create mode 100644 priv/static/adminfe/chunk-6e8c.5832dc0a.css delete mode 100644 priv/static/adminfe/chunk-6e8c.f7407fd4.css create mode 100644 priv/static/adminfe/chunk-7503.37b33ad8.css delete mode 100644 priv/static/adminfe/chunk-7503.c75b68df.css delete mode 100644 priv/static/adminfe/static/js/app.86bfcdf3.js delete mode 100644 priv/static/adminfe/static/js/app.86bfcdf3.js.map create mode 100644 priv/static/adminfe/static/js/app.ad6a566b.js create mode 100644 priv/static/adminfe/static/js/app.ad6a566b.js.map create mode 100644 priv/static/adminfe/static/js/chunk-0171.006185b1.js create mode 100644 priv/static/adminfe/static/js/chunk-0171.006185b1.js.map delete mode 100644 priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js delete mode 100644 priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map delete mode 100644 priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js delete mode 100644 priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map create mode 100644 priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js create mode 100644 priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js.map delete mode 100644 priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js delete mode 100644 priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map create mode 100644 priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js create mode 100644 priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js.map create mode 100644 priv/static/adminfe/static/js/chunk-7503.4ad05fac.js create mode 100644 priv/static/adminfe/static/js/chunk-7503.4ad05fac.js.map delete mode 100644 priv/static/adminfe/static/js/chunk-7503.ee7af549.js delete mode 100644 priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map create mode 100644 priv/static/adminfe/static/js/runtime.aaeb14f8.js create mode 100644 priv/static/adminfe/static/js/runtime.aaeb14f8.js.map delete mode 100644 priv/static/adminfe/static/js/runtime.ba9393f3.js delete mode 100644 priv/static/adminfe/static/js/runtime.ba9393f3.js.map diff --git a/priv/static/adminfe/chunk-0171.82f5a48b.css b/priv/static/adminfe/chunk-0171.82f5a48b.css new file mode 100644 index 000000000..45340d06b Binary files /dev/null and b/priv/static/adminfe/chunk-0171.82f5a48b.css differ diff --git a/priv/static/adminfe/chunk-0171.8dc0d9da.css b/priv/static/adminfe/chunk-0171.8dc0d9da.css deleted file mode 100644 index 824bddc85..000000000 Binary files a/priv/static/adminfe/chunk-0171.8dc0d9da.css and /dev/null differ diff --git a/priv/static/adminfe/chunk-565e.33809ac8.css b/priv/static/adminfe/chunk-565e.33809ac8.css deleted file mode 100644 index 063b0b35d..000000000 Binary files a/priv/static/adminfe/chunk-565e.33809ac8.css and /dev/null differ diff --git a/priv/static/adminfe/chunk-565e.aed36fe0.css b/priv/static/adminfe/chunk-565e.aed36fe0.css new file mode 100644 index 000000000..c126f246e Binary files /dev/null and b/priv/static/adminfe/chunk-565e.aed36fe0.css differ diff --git a/priv/static/adminfe/chunk-6e8c.5832dc0a.css b/priv/static/adminfe/chunk-6e8c.5832dc0a.css new file mode 100644 index 000000000..76f698880 Binary files /dev/null and b/priv/static/adminfe/chunk-6e8c.5832dc0a.css differ diff --git a/priv/static/adminfe/chunk-6e8c.f7407fd4.css b/priv/static/adminfe/chunk-6e8c.f7407fd4.css deleted file mode 100644 index 6936755b9..000000000 Binary files a/priv/static/adminfe/chunk-6e8c.f7407fd4.css and /dev/null differ diff --git a/priv/static/adminfe/chunk-7503.37b33ad8.css b/priv/static/adminfe/chunk-7503.37b33ad8.css new file mode 100644 index 000000000..cc1e824b8 Binary files /dev/null and b/priv/static/adminfe/chunk-7503.37b33ad8.css differ diff --git a/priv/static/adminfe/chunk-7503.c75b68df.css b/priv/static/adminfe/chunk-7503.c75b68df.css deleted file mode 100644 index 93d3eac84..000000000 Binary files a/priv/static/adminfe/chunk-7503.c75b68df.css and /dev/null differ diff --git a/priv/static/adminfe/index.html b/priv/static/adminfe/index.html index 5214cc94f..5e1ace11d 100644 --- a/priv/static/adminfe/index.html +++ b/priv/static/adminfe/index.html @@ -1 +1 @@ -Admin FE
\ No newline at end of file +Admin FE
\ No newline at end of file diff --git a/priv/static/adminfe/static/js/app.86bfcdf3.js b/priv/static/adminfe/static/js/app.86bfcdf3.js deleted file mode 100644 index 083555948..000000000 Binary files a/priv/static/adminfe/static/js/app.86bfcdf3.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/app.86bfcdf3.js.map b/priv/static/adminfe/static/js/app.86bfcdf3.js.map deleted file mode 100644 index 1e35d9d3d..000000000 Binary files a/priv/static/adminfe/static/js/app.86bfcdf3.js.map and /dev/null differ diff --git a/priv/static/adminfe/static/js/app.ad6a566b.js b/priv/static/adminfe/static/js/app.ad6a566b.js new file mode 100644 index 000000000..339ba292b Binary files /dev/null and b/priv/static/adminfe/static/js/app.ad6a566b.js differ diff --git a/priv/static/adminfe/static/js/app.ad6a566b.js.map b/priv/static/adminfe/static/js/app.ad6a566b.js.map new file mode 100644 index 000000000..678fc37c2 Binary files /dev/null and b/priv/static/adminfe/static/js/app.ad6a566b.js.map differ diff --git a/priv/static/adminfe/static/js/chunk-0171.006185b1.js b/priv/static/adminfe/static/js/chunk-0171.006185b1.js new file mode 100644 index 000000000..5eb66a811 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-0171.006185b1.js differ diff --git a/priv/static/adminfe/static/js/chunk-0171.006185b1.js.map b/priv/static/adminfe/static/js/chunk-0171.006185b1.js.map new file mode 100644 index 000000000..1b3aa9574 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-0171.006185b1.js.map differ diff --git a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js deleted file mode 100644 index 070fe2201..000000000 Binary files a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map deleted file mode 100644 index 4696152ee..000000000 Binary files a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js deleted file mode 100644 index b72017611..000000000 Binary files a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map deleted file mode 100644 index a2bc8a3cd..000000000 Binary files a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js b/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js new file mode 100644 index 000000000..92bda657e Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js differ diff --git a/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js.map b/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js.map new file mode 100644 index 000000000..606d52b31 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-565e.61a8d6f8.js.map differ diff --git a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js deleted file mode 100644 index f6175a4b5..000000000 Binary files a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map deleted file mode 100644 index 159876ea9..000000000 Binary files a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js b/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js new file mode 100644 index 000000000..fea70e93c Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js differ diff --git a/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js.map b/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js.map new file mode 100644 index 000000000..d25390a78 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-6e8c.ca3f6a22.js.map differ diff --git a/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js b/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js new file mode 100644 index 000000000..d82aface2 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js differ diff --git a/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js.map b/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js.map new file mode 100644 index 000000000..28070c0b4 Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-7503.4ad05fac.js.map differ diff --git a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js deleted file mode 100644 index 6126d904d..000000000 Binary files a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map deleted file mode 100644 index cf893c61f..000000000 Binary files a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map and /dev/null differ diff --git a/priv/static/adminfe/static/js/runtime.aaeb14f8.js b/priv/static/adminfe/static/js/runtime.aaeb14f8.js new file mode 100644 index 000000000..b300473ed Binary files /dev/null and b/priv/static/adminfe/static/js/runtime.aaeb14f8.js differ diff --git a/priv/static/adminfe/static/js/runtime.aaeb14f8.js.map b/priv/static/adminfe/static/js/runtime.aaeb14f8.js.map new file mode 100644 index 000000000..e783189c8 Binary files /dev/null and b/priv/static/adminfe/static/js/runtime.aaeb14f8.js.map differ diff --git a/priv/static/adminfe/static/js/runtime.ba9393f3.js b/priv/static/adminfe/static/js/runtime.ba9393f3.js deleted file mode 100644 index c66462ab6..000000000 Binary files a/priv/static/adminfe/static/js/runtime.ba9393f3.js and /dev/null differ diff --git a/priv/static/adminfe/static/js/runtime.ba9393f3.js.map b/priv/static/adminfe/static/js/runtime.ba9393f3.js.map deleted file mode 100644 index c167edf90..000000000 Binary files a/priv/static/adminfe/static/js/runtime.ba9393f3.js.map and /dev/null differ -- cgit v1.2.3 From 78939c1d161f09ac38348fc02e8f4a83d8d82d2d Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 27 Aug 2020 12:13:18 +0200 Subject: ChatController: Don't die if the recipient is gone. --- .../web/pleroma_api/controllers/chat_controller.ex | 4 +++- test/web/pleroma_api/controllers/chat_controller_test.exs | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex index e8a1746d4..1f2e953f7 100644 --- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex @@ -149,7 +149,9 @@ def index(%{assigns: %{user: %{id: user_id} = user}} = conn, _params) do from(c in Chat, where: c.user_id == ^user_id, where: c.recipient not in ^blocked_ap_ids, - order_by: [desc: c.updated_at] + order_by: [desc: c.updated_at], + inner_join: u in User, + on: u.ap_id == c.recipient ) |> Repo.all() diff --git a/test/web/pleroma_api/controllers/chat_controller_test.exs b/test/web/pleroma_api/controllers/chat_controller_test.exs index d71e80d03..7be5fe09c 100644 --- a/test/web/pleroma_api/controllers/chat_controller_test.exs +++ b/test/web/pleroma_api/controllers/chat_controller_test.exs @@ -267,6 +267,21 @@ test "it returns a chat", %{conn: conn, user: user} do describe "GET /api/v1/pleroma/chats" do setup do: oauth_access(["read:chats"]) + test "it does not return chats with deleted users", %{conn: conn, user: user} do + recipient = insert(:user) + {:ok, _} = Chat.get_or_create(user.id, recipient.ap_id) + + Pleroma.Repo.delete(recipient) + User.invalidate_cache(recipient) + + result = + conn + |> get("/api/v1/pleroma/chats") + |> json_response_and_validate_schema(200) + + assert length(result) == 0 + end + test "it does not return chats with users you blocked", %{conn: conn, user: user} do recipient = insert(:user) -- cgit v1.2.3