nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3272 from annando/issue-2364

Browse source 
Only import new OStatus posts if they are from our followers
This commit is contained in:
Tobias Diekershoff 2017-03-27 09:24:41 +02:00 committed by GitHub
parent 9dd6998126 fa7721c735
commit 0cf000469e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/ostatus.php
View file

@ -799,6 +799,9 @@ class ostatus {
/// @todo This function is totally ugly and has to be rewritten totally /// @todo This function is totally ugly and has to be rewritten totally
// Import all threads or only threads that were started by our followers?
$all_threads = !get_config('system','ostatus_full_threads');
$item_stored = -1; $item_stored = -1;
$conversation_url = self::fetch_conversation($self, $conversation_url); $conversation_url = self::fetch_conversation($self, $conversation_url);
@ -807,8 +810,8 @@ class ostatus {
// Don't do a completion on liked content // Don't do a completion on liked content
if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR
($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) { ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) {
$item_stored = item_store($item, true); $item_stored = item_store($item, $all_threads);
return($item_stored); return $item_stored;
} }
// Get the parent // Get the parent
@ -888,7 +891,7 @@ class ostatus {
if (!sizeof($items)) { if (!sizeof($items)) {
if (count($item) > 0) { if (count($item) > 0) {
$item_stored = item_store($item, true); $item_stored = item_store($item, $all_threads);
if ($item_stored) { if ($item_stored) {
logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG); logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
@ -1186,7 +1189,7 @@ class ostatus {
} }
} }
$item_stored = item_store($item, true); $item_stored = item_store($item, $all_threads);
if ($item_stored) { if ($item_stored) {
logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG); logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
self::store_conversation($item_stored, $conversation_url); self::store_conversation($item_stored, $conversation_url);