harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add aid to notifiy table which we may need to supress duplicate notify emails across your channels

Browse Source 
also try to handle the wretched mess of broken and duplicated hublocs that fred.cepheus.uberspace.de typically reports
This commit is contained in:
friendica
2013-11-20 21:09:13 -08:00
parent eb3d8e2cd7
commit 4791b2fd9c
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/notifier.php
View File

@@ -408,9 +408,9 @@ function notifier_run($argv, $argc){
// for public posts always include our own hub
$sql_extra = (($private) ? "" : " or hubloc_url = '" . z_root() . "' ");
$sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' ");
$r = q("select distinct hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc
$r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey");
if(! $r) {
logger('notifier: no hubs');
@@ -419,10 +419,14 @@ function notifier_run($argv, $argc){
$hubs = $r;
$hublist = array();
$keys = array();
foreach($hubs as $hub) {
// don't try to deliver to deleted hublocs
if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) {
// don't try to deliver to deleted hublocs - and inexplicably SQL "distinct" and "group by"
// both return records with duplicate keys in rare circumstances
if((! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && (! in_array($hub['hubloc_sitekey'],$keys))) {
$hublist[] = $hub['hubloc_host'];
$keys[] = $hub['hubloc_sitekey'];
}
}