aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2018-05-04 22:28:13 +0000
committerMark Felder <feld@feld.me>2018-05-04 22:28:13 +0000
commit31ea9cbcd8e359838faf6587db73005f090040e1 (patch)
tree4e8a36f73b428683aaac4b6b7b235d9601575beb
parent955bd643ff4a1a2e840b10b14d4ed0593aa9f025 (diff)
downloadpleroma-31ea9cbcd8e359838faf6587db73005f090040e1.tar.gz
Group def renders together to fix warning
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex52
1 files changed, 26 insertions, 26 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index cbc2dd770..5c6fd05f3 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -82,19 +82,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
}
end
- def get_reply_to(activity, %{replied_to_activities: replied_to_activities}) do
- _id = activity.data["object"]["inReplyTo"]
- replied_to_activities[activity.data["object"]["inReplyTo"]]
- end
-
- def get_reply_to(%{data: %{"object" => object}}, _) do
- if object["inReplyTo"] && object["inReplyTo"] != "" do
- Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
- else
- nil
- end
- end
-
def render("status.json", %{activity: %{data: %{"object" => object}} = activity} = opts) do
user = User.get_cached_by_ap_id(activity.data["actor"])
@@ -164,19 +151,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
}
end
- def get_visibility(object) do
- public = "https://www.w3.org/ns/activitystreams#Public"
- to = object["to"] || []
- cc = object["cc"] || []
-
- cond do
- public in to -> "public"
- public in cc -> "unlisted"
- Enum.any?(to, &String.contains?(&1, "/followers")) -> "private"
- true -> "direct"
- end
- end
-
def render("attachment.json", %{attachment: attachment}) do
[%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
@@ -199,4 +173,30 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
type: type
}
end
+
+ def get_reply_to(activity, %{replied_to_activities: replied_to_activities}) do
+ _id = activity.data["object"]["inReplyTo"]
+ replied_to_activities[activity.data["object"]["inReplyTo"]]
+ end
+
+ def get_reply_to(%{data: %{"object" => object}}, _) do
+ if object["inReplyTo"] && object["inReplyTo"] != "" do
+ Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
+ else
+ nil
+ end
+ end
+
+ def get_visibility(object) do
+ public = "https://www.w3.org/ns/activitystreams#Public"
+ to = object["to"] || []
+ cc = object["cc"] || []
+
+ cond do
+ public in to -> "public"
+ public in cc -> "unlisted"
+ Enum.any?(to, &String.contains?(&1, "/followers")) -> "private"
+ true -> "direct"
+ end
+ end
end