From abdb5119920ece2bdb7e30008a67050230ccf7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sun, 7 Sep 2025 22:41:25 +0200 Subject: [PATCH 1/4] Fix typo in test name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- changelog.d/typo.skip | 1 + test/pleroma/web/rich_media/parsers/twitter_card_test.exs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/typo.skip diff --git a/changelog.d/typo.skip b/changelog.d/typo.skip new file mode 100644 index 000000000..721ba96c5 --- /dev/null +++ b/changelog.d/typo.skip @@ -0,0 +1 @@ +Fix typo in test name diff --git a/test/pleroma/web/rich_media/parsers/twitter_card_test.exs b/test/pleroma/web/rich_media/parsers/twitter_card_test.exs index 15b272ff2..9069a2aed 100644 --- a/test/pleroma/web/rich_media/parsers/twitter_card_test.exs +++ b/test/pleroma/web/rich_media/parsers/twitter_card_test.exs @@ -92,7 +92,7 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do } end - test "takes first founded title in html head if there is html markup error" do + test "takes first found title in html head if there is html markup error" do html = File.read!("test/fixtures/nypd-facial-recognition-children-teenagers4.html") |> Floki.parse_document!() From a06d09ab15249d2d8b696c7873c7cf43f3356e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sat, 27 Sep 2025 10:50:51 +0200 Subject: [PATCH 2/4] Update voters count in remote polls when refreshing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- changelog.d/update-poll-voters-count.fix | 1 + lib/pleroma/object/updater.ex | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 changelog.d/update-poll-voters-count.fix diff --git a/changelog.d/update-poll-voters-count.fix b/changelog.d/update-poll-voters-count.fix new file mode 100644 index 000000000..557c2b0df --- /dev/null +++ b/changelog.d/update-poll-voters-count.fix @@ -0,0 +1 @@ +Update voters count in remote polls when refreshing diff --git a/lib/pleroma/object/updater.ex b/lib/pleroma/object/updater.ex index b80bc7faf..d7f27184b 100644 --- a/lib/pleroma/object/updater.ex +++ b/lib/pleroma/object/updater.ex @@ -5,6 +5,7 @@ defmodule Pleroma.Object.Updater do require Pleroma.Constants + alias Pleroma.Maps alias Pleroma.Object alias Pleroma.Repo @@ -115,6 +116,7 @@ defmodule Pleroma.Object.Updater do # Choices are the same, but counts are different to_be_updated |> Map.put(key, updated_object[key]) + |> Maps.put_if_present("votersCount", updated_object["votersCount"]) else # Choices (or vote type) have changed, do not allow this _ -> to_be_updated From e666ddc9baf5db54a67094bf7208d5ff934c6f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sat, 27 Sep 2025 12:38:18 +0200 Subject: [PATCH 3/4] Add `update` to @notification_types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- changelog.d/notification-type-update.fix | 1 + lib/pleroma/notification.ex | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/notification-type-update.fix diff --git a/changelog.d/notification-type-update.fix b/changelog.d/notification-type-update.fix new file mode 100644 index 000000000..ee864000c --- /dev/null +++ b/changelog.d/notification-type-update.fix @@ -0,0 +1 @@ +Add `update` to @notification_types diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 75f4ba503..80844ed71 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -74,6 +74,7 @@ defmodule Pleroma.Notification do reblog poll status + update } def changeset(%Notification{} = notification, attrs) do From 94188a293c1e51af86aba3b3e52c34a063d0cae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sun, 4 Aug 2024 00:23:00 +0200 Subject: [PATCH 4/4] Update *Differences in Mastodon API responses from vanilla Mastodon* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- changelog.d/docs.skip | 1 + docs/development/API/differences_in_mastoapi_responses.md | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog.d/docs.skip diff --git a/changelog.d/docs.skip b/changelog.d/docs.skip new file mode 100644 index 000000000..fd1aae513 --- /dev/null +++ b/changelog.d/docs.skip @@ -0,0 +1 @@ +Update *Differences in Mastodon API responses from vanilla Mastodon* \ No newline at end of file diff --git a/docs/development/API/differences_in_mastoapi_responses.md b/docs/development/API/differences_in_mastoapi_responses.md index e3b6a3c77..5cda57ab0 100644 --- a/docs/development/API/differences_in_mastoapi_responses.md +++ b/docs/development/API/differences_in_mastoapi_responses.md @@ -40,9 +40,12 @@ Has these additional fields under the `pleroma` object: - `parent_visible`: If the parent of this post is visible to the user or not. - `pinned_at`: a datetime (iso8601) when status was pinned, `null` otherwise. - `quotes_count`: the count of status quotes. -- `non_anonymous`: true if the source post specifies the poll results are not anonymous. Currently only implemented by Smithereen. - `bookmark_folder`: the ID of the folder bookmark is stored within (if any). +Has these additional fields under the `poll.pleroma` object: + +- `non_anonymous`: true if the source post specifies the poll results are not anonymous. Currently only implemented by Smithereen. + The `GET /api/v1/statuses/:id/source` endpoint additionally has the following attributes: - `content_type`: The content type of the status source. @@ -96,6 +99,9 @@ Endpoints which accept `with_relationships` parameter: - `/api/v1/accounts/:id/followers` - `/api/v1/accounts/:id/following` - `/api/v1/mutes` +- `/api/v1/blocks` +- `/api/v1/search` +- `/api/v2/search` Has these additional fields under the `pleroma` object: