Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
ad0ab3a5
Commit
ad0ab3a5
authored
Jan 30, 2018
by
lain
Browse files
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
parents
ede4883a
45010946
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/ostatus/feed_representer.ex
View file @
ad0ab3a5
defmodule
Pleroma
.
Web
.
OStatus
.
FeedRepresenter
do
alias
Pleroma
.
Web
.
OStatus
alias
Pleroma
.
Web
.
OStatus
.
{
UserRepresenter
,
ActivityRepresenter
}
alias
Pleroma
.
User
alias
Pleroma
.
Web
.
MediaProxy
def
to_simple_form
(
user
,
activities
,
_users
)
do
most_recent_update
=
(
List
.
first
(
activities
)
||
user
)
.
updated_at
...
...
@@ -25,6 +27,7 @@ def to_simple_form(user, activities, _users) do
{
:id
,
h
.
(
OStatus
.
feed_path
(
user
))},
{
:title
,
[
'
#{
user
.
nickname
}
\'
s timeline'
]},
{
:updated
,
h
.
(
most_recent_update
)},
{
:logo
,
[
to_charlist
(
User
.
avatar_url
(
user
)
|>
MediaProxy
.
url
())]},
{
:link
,
[
rel:
'hub'
,
href:
h
.
(
OStatus
.
pubsub_path
(
user
))],
[]},
{
:link
,
[
rel:
'salmon'
,
href:
h
.
(
OStatus
.
salmon_path
(
user
))],
[]},
{
:link
,
[
rel:
'self'
,
href:
h
.
(
OStatus
.
feed_path
(
user
)),
type:
'application/atom+xml'
],
[]},
...
...
test/notification_test.exs
View file @
ad0ab3a5
...
...
@@ -14,9 +14,9 @@ test "notifies someone when they are directly addressed" do
{
:ok
,
[
notification
,
other_notification
]}
=
Notification
.
create_notifications
(
activity
)
assert
notification
.
user_id
==
other_user
.
id
notified_ids
=
Enum
.
sort
([
notification
.
user_id
,
other_notification
.
user_id
])
assert
notified_ids
==
[
other_user
.
id
,
third_user
.
id
]
assert
notification
.
activity_id
==
activity
.
id
assert
other_notification
.
user_id
==
third_user
.
id
assert
other_notification
.
activity_id
==
activity
.
id
end
end
...
...
test/web/ostatus/feed_representer_test.exs
View file @
ad0ab3a5
...
...
@@ -26,6 +26,7 @@ test "returns a feed of the last 20 items of the user" do
<id>#{OStatus.feed_path(user)}</id>
<title>#{user.nickname}'s timeline</title>
<updated>#{most_recent_update}</updated>
<logo>#{User.avatar_url(user)}</logo>
<link rel="hub" href="#{OStatus.pubsub_path(user)}" />
<link rel="salmon" href="#{OStatus.salmon_path(user)}" />
<link rel="self" href="#{OStatus.feed_path(user)}" type="application/atom+xml" />
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment