From: rinpatch <rinpatch@sdf.org>
Date: Sun, 26 Jul 2020 16:38:57 +0000 (+0000)
Subject: Merge branch 'patch-3' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a7616dec8c43309975cbdfcdd6a1808b56aa66e6;hp=ce9647aed786368536057492604e8ec99cd7aee2;p=akkoma

Merge branch 'patch-3' into 'develop'

OpenAPI: Replace actor_id by account_id to follow ChatMessage schema

See merge request pleroma/pleroma!2797
---

diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index cf299bfc2..b1a0d26ab 100644
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -300,11 +300,11 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
           "content" => "Check this out :firefox:",
           "id" => "13",
           "chat_id" => "1",
-          "actor_id" => "someflakeid",
+          "account_id" => "someflakeid",
           "unread" => false
         },
         %{
-          "actor_id" => "someflakeid",
+          "account_id" => "someflakeid",
           "content" => "Whats' up?",
           "id" => "12",
           "chat_id" => "1",