diff options
author | feld <feld@feld.me> | 2019-10-17 20:05:01 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2019-10-17 20:05:01 +0000 |
commit | 6c82b6e3bf42f9897522c0f7ebd101dd01311a46 (patch) | |
tree | fd418b37d3d0ef4980f4f9b6d354e3724b946d56 /test/web/mastodon_api/views | |
parent | 1bfdf57fc777abf210c823bed284f69c0e27ce6d (diff) | |
parent | 359dd1890e6afcf80584021eaa2421336614dd07 (diff) | |
download | pleroma-6c82b6e3bf42f9897522c0f7ebd101dd01311a46.tar.gz pleroma-6c82b6e3bf42f9897522c0f7ebd101dd01311a46.zip |
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message
See merge request pleroma/pleroma!1853
Diffstat (limited to 'test/web/mastodon_api/views')
-rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index b7a4938a6..ad209b4a3 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -424,8 +424,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do other_user = insert(:user) {:ok, _activity} = - CommonAPI.post(user, %{ - "status" => "Hey @#{other_user.nickname}.", + CommonAPI.post(other_user, %{ + "status" => "Hey @#{user.nickname}.", "visibility" => "direct" }) |