Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"

This reverts commit 2981821db8.
This commit is contained in:
Mike Verdone 2019-07-24 17:09:59 +02:00
parent 877575d0da
commit 2c83eb0b15
4 changed files with 6 additions and 10 deletions

View file

@ -25,7 +25,7 @@ Has these additional fields under the `pleroma` object:
- `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any) - `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any)
- `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain`
- `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain`
- `expires_in`: the number of minutes until a post will expire (be deleted automatically), or empty if the post won't expire - `expires_on`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire
## Attachments ## Attachments

View file

@ -168,15 +168,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
client_posted_this_activity = opts[:for] && user.id == opts[:for].id client_posted_this_activity = opts[:for] && user.id == opts[:for].id
expires_in = expires_at =
with true <- client_posted_this_activity, with true <- client_posted_this_activity,
expiration when not is_nil(expiration) <- expiration when not is_nil(expiration) <-
ActivityExpiration.get_by_activity_id(activity.id) do ActivityExpiration.get_by_activity_id(activity.id) do
expires_in_seconds = expiration.scheduled_at
expiration.scheduled_at
|> NaiveDateTime.diff(NaiveDateTime.utc_now(), :second)
round(expires_in_seconds / 60)
end end
thread_muted? = thread_muted? =
@ -277,7 +273,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
in_reply_to_account_acct: reply_to_user && reply_to_user.nickname, in_reply_to_account_acct: reply_to_user && reply_to_user.nickname,
content: %{"text/plain" => content_plaintext}, content: %{"text/plain" => content_plaintext},
spoiler_text: %{"text/plain" => summary_plaintext}, spoiler_text: %{"text/plain" => summary_plaintext},
expires_in: expires_in expires_at: expires_at
} }
} }
end end

View file

@ -170,7 +170,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert activity = Activity.get_by_id(fourth_id) assert activity = Activity.get_by_id(fourth_id)
assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id)
assert expiration.scheduled_at == expires_at assert expiration.scheduled_at == expires_at
assert fourth_response["pleroma"]["expires_in"] > 0 assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at)
end end
test "replying to a status", %{conn: conn} do test "replying to a status", %{conn: conn} do

View file

@ -134,7 +134,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
in_reply_to_account_acct: nil, in_reply_to_account_acct: nil,
content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])},
spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])},
expires_in: nil expires_at: nil
} }
} }