MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some test code added

Browse source
This commit is contained in:
Michael Vogel 2015-06-24 14:21:42 +02:00
parent 2112b9cacc
commit 87ade53162
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/notifier.php
View file

@ -304,10 +304,11 @@ function notifier_run(&$argv, &$argc){
$thr_parent = q("SELECT `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", $thr_parent = q("SELECT `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
dbesc($target_item["thr-parent"]), intval($target_item["uid"])); dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
// If the thread parent is OStatus then do some magic to distribute the messages. // If the thread parent is OStatus then do some magic to distribute the messages.
// We have not only to look at the parent, since it could be a Friendica thread. // We have not only to look at the parent, since it could be a Friendica thread.
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
$push_notify = true; $push_notify = true;
@ -338,22 +339,7 @@ function notifier_run(&$argv, &$argc){
} }
} }
} }
/*
// Check if the recipient isn't in your contact list, try to slap it
// Not sure if it is working or not.
$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", $parent['contact-id']);
if (count($r)) {
$thrparent = q("SELECT `author-link` FROM `item` WHERE `uri` = '%s'", dbesc($target_item["thr-parent"]));
if (count($thrparent) AND (normalise_link($r[0]["url"]) != normalise_link($thrparent[0]["author-link"]))) {
$probed_contact = probe_url($thrparent[0]["author-link"]);
if ($probed_contact["notify"] != "") {
logger('scrape data for slapper: '.print_r($probed_contact, true));
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
}
}
}
*/
if (count($url_recipients)) if (count($url_recipients))
logger("url_recipients ".print_r($url_recipients,true)); logger("url_recipients ".print_r($url_recipients,true));
} }
@ -419,6 +405,21 @@ function notifier_run(&$argv, &$argc){
$conversant_str = dbesc(implode(', ',$conversants)); $conversant_str = dbesc(implode(', ',$conversants));
} }
// Test!
// Send a salmon notification to every person we mentioned in the post
$arr = explode(',',$target_item['tag']);
foreach($arr as $x) {
//logger('Checking tag '.$x, LOGGER_DEBUG);
$matches = null;
if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
$probed_contact = probe_url($matches[1]);
if ($probed_contact["notify"] != "") {
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
}
}
}
$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
if(count($r)) if(count($r))

3
include/ostatus.php
View file

@ -516,6 +516,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
// If the thread shouldn't be completed then store the item and go away // If the thread shouldn't be completed then store the item and go away
if ((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) { if ((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) {
$arr["app"] .= " (OStatus-NoCompletion)";
$item_stored = item_store($item, true); $item_stored = item_store($item, true);
return($item_stored); return($item_stored);
} }
@ -584,6 +585,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
if (!sizeof($items)) { if (!sizeof($items)) {
if (count($item) > 0) { if (count($item) > 0) {
$arr["app"] .= " (OStatus-NoConvFetched)";
$item_stored = item_store($item, true); $item_stored = item_store($item, true);
if ($item_stored) { if ($item_stored) {
@ -862,6 +864,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
} }
if (($item_stored < 0) AND (count($item) > 0)) { if (($item_stored < 0) AND (count($item) > 0)) {
$arr["app"] .= " (OStatus-NoConvFound)";
$item_stored = item_store($item, true); $item_stored = item_store($item, true);
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);