mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Relocated the check.

Browse source
This commit is contained in:
Michael Vogel 2016-03-06 15:11:04 +01:00
parent 4bd1061a09
commit 7f48df63a3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/ostatus.php
View file

@ -810,12 +810,6 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
// 3. This first post is a post inside another thread // 3. This first post is a post inside another thread
if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) { if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) {
// Do we only want to import threads that were started by our contacts?
if (get_config('system','ostatus_full_threads')) {
logger("Don't import uri ".$first_id." because we don't follow this person.", LOGGER_DEBUG);
continue;
}
$new_parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN $new_parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN
(SELECT `parent` FROM `item` (SELECT `parent` FROM `item`
WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s')) LIMIT 1", WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s')) LIMIT 1",
@ -925,6 +919,12 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
} else { } else {
logger("No contact found for url ".$actor, LOGGER_DEBUG); logger("No contact found for url ".$actor, LOGGER_DEBUG);
// Do we only want to import threads that were started by our contacts?
if (get_config('system','ostatus_full_threads')) {
logger("Don't import uri ".$first_id." because we don't follow this person.", LOGGER_DEBUG);
continue;
}
// Adding a global contact // Adding a global contact
/// @TODO Use this data for the post /// @TODO Use this data for the post
$global_contact_id = get_contact($actor, 0); $global_contact_id = get_contact($actor, 0);