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
009fcd2a
Commit
009fcd2a
authored
Apr 30, 2017
by
lain
Browse files
Stop adding statusnetConversationIds.
parent
379caca0
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
009fcd2a
...
...
@@ -33,8 +33,6 @@ def create(to, actor, context, object, additional \\ %{}, published \\ nil) do
|>
Map
.
merge
(
additional
)
with
{
:ok
,
activity
}
<-
insert
(
activity
)
do
{
:ok
,
activity
}
=
add_conversation_id
(
activity
)
if
actor
.
local
do
Pleroma
.
Web
.
Federator
.
enqueue
(
:publish
,
activity
)
end
...
...
@@ -43,24 +41,6 @@ def create(to, actor, context, object, additional \\ %{}, published \\ nil) do
end
end
defp
add_conversation_id
(
activity
)
do
if
is_integer
(
activity
.
data
[
"statusnetConversationId"
])
do
{
:ok
,
activity
}
else
data
=
activity
.
data
|>
put_in
([
"object"
,
"statusnetConversationId"
],
activity
.
id
)
|>
put_in
([
"statusnetConversationId"
],
activity
.
id
)
object
=
Object
.
get_by_ap_id
(
activity
.
data
[
"object"
][
"id"
])
changeset
=
Ecto
.
Changeset
.
change
(
object
,
data:
data
[
"object"
])
Repo
.
update
(
changeset
)
changeset
=
Ecto
.
Changeset
.
change
(
activity
,
data:
data
)
Repo
.
update
(
changeset
)
end
end
def
like
(%
User
{
ap_id:
ap_id
}
=
user
,
%
Object
{
data:
%{
"id"
=>
id
}}
=
object
)
do
cond
do
# There's already a like here, so return the original activity.
...
...
test/web/twitter_api/twitter_api_test.exs
View file @
009fcd2a
...
...
@@ -41,11 +41,9 @@ test "create a status" do
assert
Enum
.
member?
(
get_in
(
activity
.
data
,
[
"to"
]),
"https://www.w3.org/ns/activitystreams#Public"
)
assert
Enum
.
member?
(
get_in
(
activity
.
data
,
[
"to"
]),
"shp"
)
# Add a context
+ 'statusnet_conversation_id'
# Add a context
assert
is_binary
(
get_in
(
activity
.
data
,
[
"context"
]))
assert
is_binary
(
get_in
(
activity
.
data
,
[
"object"
,
"context"
]))
assert
get_in
(
activity
.
data
,
[
"object"
,
"statusnetConversationId"
])
==
activity
.
id
assert
get_in
(
activity
.
data
,
[
"statusnetConversationId"
])
==
activity
.
id
assert
is_list
(
activity
.
data
[
"object"
][
"attachment"
])
...
...
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