Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
21ac4b51
Commit
21ac4b51
authored
Dec 07, 2020
by
Mario
Browse files
remove announce activity from response activites array
(cherry picked from commit
52c78c75
)
parent
9c7ec55b
Pipeline
#370037
passed with stage
in 11 minutes and 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Zotlabs/Lib/ActivityStreams.php
View file @
21ac4b51
...
...
@@ -49,7 +49,7 @@ class ActivityStreams {
if
(
$this
->
data
)
{
// verify and unpack JSalmon signature if present
if
(
is_array
(
$this
->
data
)
&&
array_key_exists
(
'signed'
,
$this
->
data
))
{
$ret
=
JSalmon
::
verify
(
$this
->
data
);
$tmp
=
JSalmon
::
unpack
(
$this
->
data
[
'data'
]);
...
...
@@ -103,7 +103,7 @@ class ActivityStreams {
}
// fetch recursive or embedded activities
if
(
$this
->
obj
&&
is_array
(
$this
->
obj
)
&&
array_key_exists
(
'object'
,
$this
->
obj
))
{
$this
->
obj
[
'object'
]
=
$this
->
get_compound_property
(
$this
->
obj
[
'object'
]);
}
...
...
@@ -115,10 +115,10 @@ class ActivityStreams {
$this
->
parent_id
=
$this
->
get_property_obj
(
'inReplyTo'
);
if
((
!
$this
->
parent_id
)
&&
is_array
(
$this
->
obj
))
{
if
((
!
$this
->
parent_id
)
&&
is_array
(
$this
->
obj
))
{
$this
->
parent_id
=
$this
->
obj
[
'inReplyTo'
];
}
if
((
!
$this
->
parent_id
)
&&
is_array
(
$this
->
obj
))
{
if
((
!
$this
->
parent_id
)
&&
is_array
(
$this
->
obj
))
{
$this
->
parent_id
=
$this
->
obj
[
'id'
];
}
}
...
...
@@ -286,7 +286,7 @@ class ActivityStreams {
if
(
!
$s
)
{
return
false
;
}
return
(
in_array
(
$s
,
[
'Like'
,
'Dislike'
,
'Flag'
,
'Block'
,
'Announce'
,
'Accept'
,
'Reject'
,
'TentativeAccept'
,
'TentativeReject'
,
'emojiReaction'
,
'EmojiReaction'
,
'EmojiReact'
]));
return
(
in_array
(
$s
,
[
'Like'
,
'Dislike'
,
'Flag'
,
'Block'
,
'Accept'
,
'Reject'
,
'TentativeAccept'
,
'TentativeReject'
,
'emojiReaction'
,
'EmojiReaction'
,
'EmojiReact'
]));
}
/**
...
...
@@ -302,7 +302,7 @@ class ActivityStreams {
$x
=
$this
->
get_property_obj
(
$property
,
$base
,
$namespace
);
if
(
$this
->
is_url
(
$x
))
{
// SECURITY: If we have already stored the actor profile, re-generate it
// SECURITY: If we have already stored the actor profile, re-generate it
// from cached data - don't refetch it from the network
$r
=
q
(
"select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1"
,
...
...
@@ -344,7 +344,7 @@ class ActivityStreams {
}
// verify and unpack JSalmon signature if present
if
(
is_array
(
$x
)
&&
array_key_exists
(
'signed'
,
$x
))
{
$ret
=
JSalmon
::
verify
(
$x
);
$tmp
=
JSalmon
::
unpack
(
$x
[
'data'
]);
...
...
include/items.php
View file @
21ac4b51
...
...
@@ -1551,7 +1551,7 @@ function get_mail_elements($x) {
$arr
[
'expires'
]
=
datetime_convert
(
'UTC'
,
'UTC'
,
$x
[
'expires'
]);
$arr
[
'mail_flags'
]
=
0
;
if
(
array_key_exists
(
'sig'
,
$x
))
$arr
[
'sig'
]
=
$x
[
'sig'
];
...
...
@@ -3022,7 +3022,7 @@ function tgroup_check($uid, $item) {
}
// post to group via DM
if
(
$is_group
)
{
if
(
intval
(
$item
[
'item_private'
])
===
2
&&
$item
[
'mid'
]
===
$item
[
'parent_mid'
])
{
return
true
;
...
...
@@ -3199,7 +3199,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
if
(
$group
&&
(
!
$parent
))
{
$arr
=
[];
if
(
$edit
)
{
// process edit or delete action
$r
=
q
(
"select * from item where source_xchan = '%s' and body like '%s' and uid = %d limit 1"
,
...
...
@@ -3231,12 +3231,12 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
$arr
[
'mid'
]
=
z_root
()
.
'/activity/'
.
$arr
[
'uuid'
];
$arr
[
'parent_mid'
]
=
$arr
[
'mid'
];
}
$arr
[
'aid'
]
=
$channel
[
'channel_account_id'
];
$arr
[
'uid'
]
=
$channel
[
'channel_id'
];
// WARNING: the presence of both source_xchan and non-zero item_uplink here will cause a delivery loop
$arr
[
'item_uplink'
]
=
0
;
$arr
[
'source_xchan'
]
=
$item
[
'owner_xchan'
];
...
...
@@ -3246,14 +3246,14 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
$arr
[
'item_origin'
]
=
1
;
$arr
[
'item_wall'
]
=
1
;
$arr
[
'item_thread_top'
]
=
1
;
if
(
strpos
(
$item
[
'body'
],
"[/share]"
)
!==
false
)
{
$pos
=
strpos
(
$item
[
'body'
],
"[share"
);
$bb
=
substr
(
$item
[
'body'
],
$pos
);
}
else
{
$bb
=
"[share author='"
.
urlencode
(
$item
[
'author'
][
'xchan_name'
])
.
"' profile='"
.
$item
[
'author'
][
'xchan_url'
]
.
"' portable_id='"
.
$item
[
'author'
][
'xchan_hash'
]
.
"' portable_id='"
.
$item
[
'author'
][
'xchan_hash'
]
.
"' avatar='"
.
$item
[
'author'
][
'xchan_photo_s'
]
.
"' link='"
.
$item
[
'plink'
]
.
"' auth='"
.
((
in_array
(
$item
[
'author'
][
'xchan_network'
],
[
'zot6'
,
'zot'
]))
?
'true'
:
'false'
)
.
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment