GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

don't bother with subscription hoohaw; just ask the user to do it

Browse Source 
darcs-hash:20080626203103-34904-19ef53bc734622a310a705608f3e227e2f387904.gz
This commit is contained in:
Evan Prodromou 2008-06-26 16:31:03 -04:00
parent 31b5ae1523
commit 48cac45fd9
4 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
actions/imsettings.php
View File

@ -73,7 +73,9 @@ class ImsettingsAction extends SettingsAction {
} else { } else {
common_input('jabber', _t('IM Address'), common_input('jabber', _t('IM Address'),
($this->arg('jabber')) ? $this->arg('jabber') : NULL, ($this->arg('jabber')) ? $this->arg('jabber') : NULL,
_t('Jabber or GTalk address, like "UserName@example.org"')); _t('Jabber or GTalk address, like "UserName@example.org". ' .
'Make sure to subscribe to ' . jabber_daemon_address() .
' before adding your IM address here.'));
common_submit('add', 'Add'); common_submit('add', 'Add');
} }
} }
@ -192,21 +194,19 @@ class ImsettingsAction extends SettingsAction {
return; return;
} }
# XXX: optionally queue for offline sending # XXX: queue for offline sending
if (!jabber_is_subscribed($jabber)) {
jabber_special_presence('subscribe', $jabber);
} else {
jabber_confirm_address($confirm->code, jabber_confirm_address($confirm->code,
$user->nickname, $user->nickname,
$jabber); $jabber);
}
$this->show_form(_t('A confirmation code was ' . # XXX: I18N
' sent to the IM address you added. ' .
$msg = 'A confirmation code was sent to the IM address you added. ' .
' You must approve ' . jabber_daemon_address() . ' You must approve ' . jabber_daemon_address() .
' for sending messages to you.'), ' for sending messages to you.';
TRUE);
$this->show_form($msg, TRUE);
} }
function cancel_confirmation() { function cancel_confirmation() {

5
lib/jabber.php
View File

@ -142,8 +142,3 @@ function jabber_broadcast_notice($notice) {
function jabber_format_notice(&$profile, &$notice) { function jabber_format_notice(&$profile, &$notice) {
return $profile->nickname . ': ' . $notice->content; return $profile->nickname . ': ' . $notice->content;
} }
# Dike this out for now
function jabber_is_subscribed($address) {
return false;
}

23
xmppdaemon.php
View File

@ -194,30 +194,7 @@ class XMPPDaemon {
'Accepted subscription from ' . $from); 'Accepted subscription from ' . $from);
break; break;
case 'subscribed': case 'subscribed':
$confirm = $this->get_confirmation($from);
if ($confirm) {
$user = User::staticGet($confirm->user_id);
if ($user) {
jabber_confirm_address($confirm->code,
$user->nickname,
$confirm->address);
} else {
$this->log(LOG_WARNING,
'got unexpected subscribed message from ' . $from);
}
}
case 'unsubscribed': case 'unsubscribed':
$user = $this->get_user($from);
if ($user) {
$this->set_notify($user, false);
}
$confirm = $this->get_confirmation($from);
if ($confirm) {
$user = User::staticGet($confirm->user_id);
if ($user) {
}
}
case 'unsubscribe': case 'unsubscribe':
$this->log(LOG_INFO, $this->log(LOG_INFO,
'Ignoring "' . $pl['type'] . '" from ' . $from); 'Ignoring "' . $pl['type'] . '" from ' . $from);