wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deliver SMS to @-ref'd users who want it, regardless of subscription.

Browse Source
This commit is contained in:
Joshua Judson Rosen 2014-01-12 15:45:41 -05:00 committed by Mikael Nordfeldth
parent 7440dc2145
commit 2ce1b77314
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mail.php
View File

@ -437,14 +437,26 @@ function mail_broadcast_notice_sms($notice)
$user = new User(); $user = new User();
$UT = common_config('db','type')=='pgsql'?'"user"':'user'; $UT = common_config('db','type')=='pgsql'?'"user"':'user';
$replies = $notice->getReplies();
$user->query('SELECT nickname, smsemail, incomingemail ' . $user->query('SELECT nickname, smsemail, incomingemail ' .
"FROM $UT JOIN subscription " . "FROM $UT LEFT OUTER JOIN subscription " .
"ON $UT.id = subscription.subscriber " . "ON $UT.id = subscription.subscriber " .
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' . 'AND subscription.subscribed = ' . $notice->profile_id . ' ' .
'AND subscription.subscribed != subscription.subscriber ' . 'AND subscription.subscribed != subscription.subscriber ' .
// Users (other than the sender) who `want SMS notices':
"WHERE $UT.id != " . $notice->profile_id . ' ' .
"AND $UT.smsemail IS NOT null " . "AND $UT.smsemail IS NOT null " .
"AND $UT.smsnotify = 1 " . "AND $UT.smsnotify = 1 " .
'AND subscription.sms = 1 '); // ... where either the user _is_ subscribed to the sender
// (any of the "subscription" fields IS NOT null)
// and wants to get SMS for all of this scribe's notices...
'AND (subscription.sms = 1 ' .
// ... or where the user was mentioned in
// or replied-to with the notice:
($replies ? sprintf("OR $UT.id in (%s)",
implode(',', $replies))
: '') .
')');
while ($user->fetch()) { while ($user->fetch()) {
common_log(LOG_INFO, common_log(LOG_INFO,