diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-24 19:52:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-24 19:52:24 +0000 |
| commit | c2dcd767cf4abaa88da946e12ca643840b65e184 (patch) | |
| tree | 93d394f2e1fc6d892c1eba85e9b39f9870d2b9b3 /lib/pleroma/web/twitter_api/representers | |
| parent | 6b9a6838331210dd514d5ecda52783c183bd1bbf (diff) | |
| parent | 1197ec10a83c2e61251abe383bea2bcc690d9c09 (diff) | |
| download | pleroma-c2dcd767cf4abaa88da946e12ca643840b65e184.tar.gz | |
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
Diffstat (limited to 'lib/pleroma/web/twitter_api/representers')
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index c2e1f07a5..57837205e 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -99,7 +99,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do ) do created_at = created_at |> Utils.date_to_asctime() - text = "#{user.nickname} undid the action at #{undid_activity}" + text = "#{user.nickname} undid the action at #{undid_activity["id"]}" %{ "id" => activity.id, |