projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
notification_view.ex
diff --git
a/lib/pleroma/web/twitter_api/views/notification_view.ex
b/lib/pleroma/web/twitter_api/views/notification_view.ex
index d889038a2c0b2570e095b12da092f2ad61a0de8f..085cd5aa3a64f8f8d9f73466a56a79e5eb9a7468 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/notification_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/notification_view.ex
@@
-1,13
+1,16
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.NotificationView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.NotificationView do
use Pleroma.Web, :view
- alias Pleroma.{Notification, User}
+ alias Pleroma.Notification
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Web.TwitterAPI.ActivityView
alias Pleroma.Web.TwitterAPI.ActivityView
+ alias Pleroma.Web.TwitterAPI.UserView
+
+ require Pleroma.Constants
defp get_user(ap_id, opts) do
cond do
defp get_user(ap_id, opts) do
cond do
@@
-17,7
+20,7
@@
defmodule Pleroma.Web.TwitterAPI.NotificationView do
String.ends_with?(ap_id, "/followers") ->
nil
String.ends_with?(ap_id, "/followers") ->
nil
- ap_id ==
"https://www.w3.org/ns/activitystreams#Public"
->
+ ap_id ==
Pleroma.Constants.as_public()
->
nil
true ->
nil
true ->