projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[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 d6a1c0a4d78e07a94446fed04744d6b8407944bb..e7c7a74964d06f832c30b9355aed88a12340edb3 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/notification_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/notification_view.ex
@@
-4,10
+4,11
@@
defmodule Pleroma.Web.TwitterAPI.NotificationView do
use Pleroma.Web, :view
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
defp get_user(ap_id, opts) do
cond do
defp get_user(ap_id, opts) do
cond do