Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
normandy
pleroma
Commits
3cc2554f
Commit
3cc2554f
authored
6 years ago
by
kaniini
Browse files
Options
Downloads
Patches
Plain Diff
mastodon api: add conversation_id extension (ref #674)
parent
fea36967
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/pleroma/web/mastodon_api/views/status_view.ex
+10
-1
10 additions, 1 deletion
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/mastodon_api/status_view_test.exs
+5
-1
5 additions, 1 deletion
test/web/mastodon_api/status_view_test.exs
with
15 additions
and
2 deletions
lib/pleroma/web/mastodon_api/views/status_view.ex
+
10
−
1
View file @
3cc2554f
...
...
@@ -46,6 +46,14 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
end
end
defp
get_context_id
(%{
data:
%{
"context_id"
=>
context_id
}})
when
not
is_nil
(
context_id
),
do
:
context_id
defp
get_context_id
(%{
data:
%{
"context"
=>
context
}})
when
is_binary
(
context
),
do
:
Utils
.
context_to_conversation_id
(
context
)
defp
get_context_id
(
_
),
do
:
nil
def
render
(
"index.json"
,
opts
)
do
replied_to_activities
=
get_replied_to_activities
(
opts
.
activities
)
...
...
@@ -186,7 +194,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
language:
nil
,
emojis:
build_emojis
(
activity
.
data
[
"object"
][
"emoji"
]),
pleroma:
%{
local:
activity
.
local
local:
activity
.
local
,
conversation_id:
get_context_id
(
activity
)
}
}
end
...
...
This diff is collapsed.
Click to expand it.
test/web/mastodon_api/status_view_test.exs
+
5
−
1
View file @
3cc2554f
...
...
@@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
alias
Pleroma
.
User
alias
Pleroma
.
Web
.
ActivityPub
.
ActivityPub
alias
Pleroma
.
Web
.
CommonAPI
alias
Pleroma
.
Web
.
CommonAPI
.
Utils
alias
Pleroma
.
Web
.
MastodonAPI
.
AccountView
alias
Pleroma
.
Web
.
MastodonAPI
.
StatusView
alias
Pleroma
.
Web
.
OStatus
...
...
@@ -72,6 +73,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
note
=
insert
(
:note_activity
)
user
=
User
.
get_cached_by_ap_id
(
note
.
data
[
"actor"
])
convo_id
=
Utils
.
context_to_conversation_id
(
note
.
data
[
"object"
][
"context"
])
status
=
StatusView
.
render
(
"status.json"
,
%{
activity:
note
})
created_at
=
...
...
@@ -122,7 +125,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
}
],
pleroma:
%{
local:
true
local:
true
,
conversation_id:
convo_id
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment