Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

2020-08-27 15:38:03 +02:00 · 2020-08-27 15:38:03 +02:00 · 82bf27172c
parent 5dba3a50fc 1c05819c9b
commit 82bf27172c
57 changed files with 19 additions and 2 deletions
--- 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()
--- a/priv/static/adminfe/index.html
+++ b/priv/static/adminfe/index.html
@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.a962469a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.1df22cde.js></script></body></html>
--- a/priv/static/adminfe/static/fonts/element-icons.535877f.woff
+++ b/priv/static/adminfe/static/fonts/element-icons.535877f.woff
--- a/priv/static/adminfe/static/fonts/element-icons.732389d.ttf
+++ b/priv/static/adminfe/static/fonts/element-icons.732389d.ttf
--- a/priv/static/adminfe/static/img/401.089007e.gif
+++ b/priv/static/adminfe/static/img/401.089007e.gif
--- a/priv/static/adminfe/static/img/404.a57b6f3.png
+++ b/priv/static/adminfe/static/img/404.a57b6f3.png
--- a/priv/static/adminfe/static/js/7zzA.e1ae1c94.js
+++ b/priv/static/adminfe/static/js/7zzA.e1ae1c94.js
--- a/priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map
+++ b/priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map
--- a/priv/static/adminfe/static/js/JEtC.f9ba4594.js
+++ b/priv/static/adminfe/static/js/JEtC.f9ba4594.js
--- a/priv/static/adminfe/static/js/JEtC.f9ba4594.js.map
+++ b/priv/static/adminfe/static/js/JEtC.f9ba4594.js.map
--- a/priv/static/adminfe/static/js/app.1df22cde.js
+++ b/priv/static/adminfe/static/js/app.1df22cde.js
--- a/priv/static/adminfe/static/js/app.1df22cde.js.map
+++ b/priv/static/adminfe/static/js/app.1df22cde.js.map
--- a/priv/static/adminfe/static/js/chunk-0171.9e927b8a.js
+++ b/priv/static/adminfe/static/js/chunk-0171.9e927b8a.js
--- a/priv/static/adminfe/static/js/chunk-0171.9e927b8a.js.map
+++ b/priv/static/adminfe/static/js/chunk-0171.9e927b8a.js.map
--- a/priv/static/adminfe/static/js/chunk-16d0.6ce78978.js
+++ b/priv/static/adminfe/static/js/chunk-16d0.6ce78978.js
--- a/priv/static/adminfe/static/js/chunk-16d0.6ce78978.js.map
+++ b/priv/static/adminfe/static/js/chunk-16d0.6ce78978.js.map
--- a/priv/static/adminfe/static/js/chunk-176e.5c19378d.js
+++ b/priv/static/adminfe/static/js/chunk-176e.5c19378d.js
--- a/priv/static/adminfe/static/js/chunk-176e.5c19378d.js.map
+++ b/priv/static/adminfe/static/js/chunk-176e.5c19378d.js.map
--- a/priv/static/adminfe/static/js/chunk-2d97.079e9e64.js
+++ b/priv/static/adminfe/static/js/chunk-2d97.079e9e64.js
--- a/priv/static/adminfe/static/js/chunk-2d97.079e9e64.js.map
+++ b/priv/static/adminfe/static/js/chunk-2d97.079e9e64.js.map
--- a/priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js
+++ b/priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js
--- a/priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js.map
+++ b/priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js.map
--- a/priv/static/adminfe/static/js/chunk-5118.7c48ad58.js
+++ b/priv/static/adminfe/static/js/chunk-5118.7c48ad58.js
--- a/priv/static/adminfe/static/js/chunk-5118.7c48ad58.js.map
+++ b/priv/static/adminfe/static/js/chunk-5118.7c48ad58.js.map
--- a/priv/static/adminfe/static/js/chunk-565e.e1555105.js
+++ b/priv/static/adminfe/static/js/chunk-565e.e1555105.js
--- a/priv/static/adminfe/static/js/chunk-565e.e1555105.js.map
+++ b/priv/static/adminfe/static/js/chunk-565e.e1555105.js.map
--- a/priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js
+++ b/priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js
--- a/priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js.map
+++ b/priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js.map
--- a/priv/static/adminfe/static/js/chunk-654e.38dd4b85.js
+++ b/priv/static/adminfe/static/js/chunk-654e.38dd4b85.js
--- a/priv/static/adminfe/static/js/chunk-654e.38dd4b85.js.map
+++ b/priv/static/adminfe/static/js/chunk-654e.38dd4b85.js.map
--- a/priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js
+++ b/priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js
--- a/priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js.map
+++ b/priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js.map
--- a/priv/static/adminfe/static/js/chunk-6e81.6043af74.js
+++ b/priv/static/adminfe/static/js/chunk-6e81.6043af74.js
--- a/priv/static/adminfe/static/js/chunk-6e81.6043af74.js.map
+++ b/priv/static/adminfe/static/js/chunk-6e81.6043af74.js.map
--- a/priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js
+++ b/priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js
--- a/priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js.map
+++ b/priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js.map
--- a/priv/static/adminfe/static/js/chunk-7503.278e0031.js
+++ b/priv/static/adminfe/static/js/chunk-7503.278e0031.js
--- a/priv/static/adminfe/static/js/chunk-7503.278e0031.js.map
+++ b/priv/static/adminfe/static/js/chunk-7503.278e0031.js.map
--- a/priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js
+++ b/priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js
--- a/priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js.map
+++ b/priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js.map
--- a/priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js
+++ b/priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js
--- a/priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js.map
+++ b/priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js.map
--- a/priv/static/adminfe/static/js/chunk-9a72.41e843cd.js
+++ b/priv/static/adminfe/static/js/chunk-9a72.41e843cd.js
--- a/priv/static/adminfe/static/js/chunk-9a72.41e843cd.js.map
+++ b/priv/static/adminfe/static/js/chunk-9a72.41e843cd.js.map
--- a/priv/static/adminfe/static/js/chunk-commons.51fe2926.js
+++ b/priv/static/adminfe/static/js/chunk-commons.51fe2926.js
--- a/priv/static/adminfe/static/js/chunk-commons.51fe2926.js.map
+++ b/priv/static/adminfe/static/js/chunk-commons.51fe2926.js.map
--- a/priv/static/adminfe/static/js/chunk-df62.6c5105a6.js
+++ b/priv/static/adminfe/static/js/chunk-df62.6c5105a6.js
--- a/priv/static/adminfe/static/js/chunk-df62.6c5105a6.js.map
+++ b/priv/static/adminfe/static/js/chunk-df62.6c5105a6.js.map
--- a/priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js
+++ b/priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js
--- a/priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js.map
+++ b/priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js.map
--- a/priv/static/adminfe/static/js/chunk-libs.f842b12e.js
+++ b/priv/static/adminfe/static/js/chunk-libs.f842b12e.js
--- a/priv/static/adminfe/static/js/chunk-libs.f842b12e.js.map
+++ b/priv/static/adminfe/static/js/chunk-libs.f842b12e.js.map
--- a/priv/static/adminfe/static/js/oAJy.840fb1c2.js
+++ b/priv/static/adminfe/static/js/oAJy.840fb1c2.js
--- a/priv/static/adminfe/static/js/oAJy.840fb1c2.js.map
+++ b/priv/static/adminfe/static/js/oAJy.840fb1c2.js.map
--- a/priv/static/adminfe/static/js/runtime.04c4fa2f.js
+++ b/priv/static/adminfe/static/js/runtime.04c4fa2f.js
--- a/priv/static/adminfe/static/js/runtime.04c4fa2f.js.map
+++ b/priv/static/adminfe/static/js/runtime.04c4fa2f.js.map
--- 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)
		`@ -1 +1 @@`
			<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.a962469a.js></script></body></html>				<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.1df22cde.js></script></body></html>