summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-02-18 16:35:03 -0600
committerMark Felder <feld@feld.me>2021-02-18 16:35:03 -0600
commitd5ef02c7a7905dc2053298045873b365d2411cde (patch)
treebdfa1206dab9eb0c349c8d78510e9232a658f130 /lib
parentfb2a8e7ccd6cfbfb9bc226998a083405fcebcbe0 (diff)
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/api_spec/schemas/status.ex5
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/status_controller.ex2
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex4
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/pleroma/web/api_spec/schemas/status.ex b/lib/pleroma/web/api_spec/schemas/status.ex
index 61ebd8089..42fa98718 100644
--- a/lib/pleroma/web/api_spec/schemas/status.ex
+++ b/lib/pleroma/web/api_spec/schemas/status.ex
@@ -23,9 +23,10 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
application: %Schema{
description: "The application used to post this status",
type: :object,
+ nullable: true,
properties: %{
name: %Schema{type: :string},
- website: %Schema{type: :string, nullable: true, format: :uri}
+ website: %Schema{type: :string, format: :uri}
}
},
bookmarked: %Schema{type: :boolean, description: "Have you bookmarked this status?"},
@@ -291,7 +292,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
"url" => "http://localhost:4001/users/nick6",
"username" => "nick6"
},
- "application" => %{"name" => "Web", "website" => nil},
+ "application" => nil,
"bookmarked" => false,
"card" => nil,
"content" => "foobar",
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index db3f248e5..2e63c8869 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -425,5 +425,5 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
Map.put(params, :application, %{name: client_name, website: website})
end
- defp put_application(params, _), do: Map.put(params, :application, %{name: "Web", website: nil})
+ defp put_application(params, _), do: Map.put(params, :application, nil)
end
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 38960c256..a45650988 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -180,7 +180,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
media_attachments: reblogged[:media_attachments] || [],
mentions: mentions,
tags: reblogged[:tags] || [],
- application: activity_object.data["application"] || %{name: "Web", website: nil},
+ application: activity_object.data["application"] || nil,
language: nil,
emojis: [],
pleroma: %{
@@ -345,7 +345,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
poll: render(PollView, "show.json", object: object, for: opts[:for]),
mentions: mentions,
tags: build_tags(tags),
- application: object.data["application"] || %{name: "Web", website: nil},
+ application: object.data["application"] || nil,
language: nil,
emojis: build_emojis(object.data["emoji"]),
pleroma: %{