From 364d88fa7016d961d0c00b6c22245451ccc8b5e1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 Mar 2017 05:33:43 +0000 Subject: [PATCH 1/2] Only import new OStatus posts if they are from our followers --- include/ostatus.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 931ea870f..449539e71 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -799,6 +799,9 @@ class ostatus { /// @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; $conversation_url = self::fetch_conversation($self, $conversation_url); @@ -807,7 +810,7 @@ class ostatus { // Don't do a completion on liked content if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) { - $item_stored = item_store($item, true); + $item_stored = item_store($item, $all_threads); return($item_stored); } @@ -888,7 +891,7 @@ class ostatus { if (!sizeof($items)) { if (count($item) > 0) { - $item_stored = item_store($item, true); + $item_stored = item_store($item, $all_threads); if ($item_stored) { 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) { logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG); self::store_conversation($item_stored, $conversation_url); From fa7721c735f4d6cbd075a378ede1fdca66a10a54 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 Mar 2017 06:11:45 +0000 Subject: [PATCH 2/2] Prevent Hypolite from doing comments about standards ;-) --- include/ostatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ostatus.php b/include/ostatus.php index 449539e71..e6087de08 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -811,7 +811,7 @@ class ostatus { if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) { $item_stored = item_store($item, $all_threads); - return($item_stored); + return $item_stored; } // Get the parent