summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/subscribe.php37
-rw-r--r--actions/unsubscribe.php24
-rw-r--r--lib/common.php1
-rw-r--r--lib/subs.php96
-rwxr-xr-xscripts/xmppdaemon.php36
5 files changed, 138 insertions, 56 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php
index e292fdd6b..71452e46c 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -38,45 +38,14 @@ class SubscribeAction extends Action {
$other_nickname = $this->arg('subscribeto');
- $other = User::staticGet('nickname', $other_nickname);
-
- if (!$other) {
- common_user_error(_('No such user.'));
- return;
- }
-
- if ($user->isSubscribed($other)) {
- common_user_error(_('Already subscribed!.'));
- return;
- }
-
- if (!$user->subscribeTo($other)) {
- $this->server_error(_('Could not subscribe.'));
+ $result=subs_subscribe_user($user, $other_nickname);
+ if($result != true) {
+ common_user_error($result);
return;
}
-
- $this->notify($other, $user);
-
- if ($other->autosubscribe && !$other->isSubscribed($user)) {
- if (!$other->subscribeTo($user)) {
- $this->server_error(_('Could not subscribe other to you.'));
- return;
- }
- $this->notify($user, $other);
- }
common_redirect(common_local_url('subscriptions', array('nickname' =>
$user->nickname)));
}
- function notify($listenee, $listener) {
- # XXX: add other notifications (Jabber, SMS) here
- # XXX: queue this and handle it offline
- # XXX: Whatever happens, do it in Twitter-like API, too
- $this->notify_email($listenee, $listener);
- }
-
- function notify_email($listenee, $listener) {
- mail_subscribe_notify($listenee, $listener);
- }
} \ No newline at end of file
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 3863a3a5e..5814c37bd 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -34,27 +34,9 @@ class UnsubscribeAction extends Action {
}
$other_nickname = $this->arg('unsubscribeto');
- $other = User::staticGet('nickname', $other_nickname);
- if (!$other) {
- common_user_error(_('No such user.'));
- return;
- }
-
- if (!$user->isSubscribed($other)) {
- common_server_error(_('Not subscribed!.'));
- }
-
- $sub = DB_DataObject::factory('subscription');
-
- $sub->subscriber = $user->id;
- $sub->subscribed = $other->id;
-
- $sub->find(true);
-
- // note we checked for existence above
-
- if (!$sub->delete()) {
- common_server_error(_('Couldn\'t delete subscription.'));
+ $result=subs_unsubscribe_user($user,$other_nickname);
+ if($result!=true) {
+ common_user_error($result);
return;
}
diff --git a/lib/common.php b/lib/common.php
index 94f720137..13c7d0d45 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -121,6 +121,7 @@ require_once(INSTALLDIR.'/lib/util.php');
require_once(INSTALLDIR.'/lib/action.php');
require_once(INSTALLDIR.'/lib/theme.php');
require_once(INSTALLDIR.'/lib/mail.php');
+require_once(INSTALLDIR.'/lib/subs.php');
function __autoload($class) {
if ($class == 'OAuthRequest') {
diff --git a/lib/subs.php b/lib/subs.php
new file mode 100644
index 000000000..383bfa007
--- /dev/null
+++ b/lib/subs.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once('XMPPHP/XMPP.php');
+
+/* Subscribe $user to nickname $other_nickname
+ Returns true or an error message.
+*/
+function subs_subscribe_user($user,$other_nickname) {
+
+ $other = User::staticGet('nickname', $other_nickname);
+
+ if (!$other) {
+ return _('No such user.');
+ }
+
+ if ($user->isSubscribed($other)) {
+ return _('Already subscribed!.');
+ }
+
+ if (!$user->subscribeTo($other)) {
+ return _('Could not subscribe.');
+ return;
+ }
+
+ subs_notify($other, $user);
+
+ if ($other->autosubscribe && !$other->isSubscribed($user)) {
+ if (!$other->subscribeTo($user)) {
+ return _('Could not subscribe other to you.');
+ }
+ subs_notify($user, $other);
+ }
+
+ return true;
+
+}
+
+function subs_notify($listenee, $listener) {
+ # XXX: add other notifications (Jabber, SMS) here
+ # XXX: queue this and handle it offline
+ # XXX: Whatever happens, do it in Twitter-like API, too
+ subs_notify_email($listenee, $listener);
+}
+
+function subs_notify_email($listenee, $listener) {
+ mail_subscribe_notify($listenee, $listener);
+}
+
+
+/* Unsubscribe $user from nickname $other_nickname
+ Returns true or an error message.
+*/
+function subs_unsubscribe_user($user, $other_nickname) {
+
+ $other = User::staticGet('nickname', $other_nickname);
+ if (!$other)
+ return _('No such user.');
+
+ if (!$user->isSubscribed($other))
+ return _('Not subscribed!.');
+
+ $sub = DB_DataObject::factory('subscription');
+
+ $sub->subscriber = $user->id;
+ $sub->subscribed = $other->id;
+
+ $sub->find(true);
+
+ // note we checked for existence above
+
+ if (!$sub->delete())
+ return _('Couldn\'t delete subscription.');
+
+ return true;
+
+}
+
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 864782098..1db6687d0 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -208,15 +208,49 @@ class XMPPDaemon {
function handle_command($user, $body) {
# XXX: localise
- switch(trim($body)) {
+ $p=explode(' ',$body);
+ if(count($p)>2)
+ return false;
+ switch($p[0]) {
+ case 'help':
+ if(count($p)!=1)
+ return false;
+ $this->from_site($user->jabber, "Commands:\n on - turn on notifications\n off - turn off notifications\n help - show this help \n sub - subscribe to user\n unsub - unsubscribe from user");
+ return true;
case 'on':
+ if(count($p)!=1)
+ return false;
$this->set_notify($user, true);
$this->from_site($user->jabber, 'notifications on');
return true;
case 'off':
+ if(count($p)!=1)
+ return false;
$this->set_notify($user, false);
$this->from_site($user->jabber, 'notifications off');
return true;
+ case 'sub':
+ if(count($p)==1) {
+ $this->from_site($user->jabber, 'Specify the name of the user to subscribe to');
+ return true;
+ }
+ $result=subs_subscribe_user($user, $p[1]);
+ if($result=='true')
+ $this->from_site($user->jabber, 'Subscribed to ' . $p[1]);
+ else
+ $this->from_site($user->jabber, $result);
+ return true;
+ case 'unsub':
+ if(count($p)==1) {
+ $this->from_site($user->jabber, 'Specify the name of the user to unsubscribe from');
+ return true;
+ }
+ $result=subs_unsubscribe_user($user, $p[1]);
+ if($result=='true')
+ $this->from_site($user->jabber, 'Unsubscribed from ' . $p[1]);
+ else
+ $this->from_site($user->jabber, $result);
+ return true;
default:
return false;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-18 19:49:51 +0000