summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2008-08-16 04:34:22 -0400
committerCiaranG <ciaran@ciarang.com>2008-08-16 04:34:22 -0400
commitbfb22a99329c61f4b117ca6151fb461fec3ac192 (patch)
treeecf5f2b9fab85e096aee9f14971a0d0610c4915b /actions
parenta0b6ebdd2d8e40ff8694a89bbec1c86c05b2235c (diff)
XMPP daemon updates including help, sub and subsub commands, plus subscribe/unsubcribe logic broken out into standalone module for sharing
darcs-hash:20080816083422-f6e2c-fb8b4e0581719bd8c3f433e661ec9742e1b84cbc.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/subscribe.php37
-rw-r--r--actions/unsubscribe.php24
2 files changed, 55 insertions, 6 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8d04934b7..b93c06f12 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -47,14 +47,45 @@ class SubscribeAction extends Action {
$other_nickname = $this->arg('subscribeto');
- $result=subs_subscribe_user($user, $other_nickname);
- if($result != true) {
- common_user_error($result);
+ $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.'));
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 4bfaf7958..570c1700a 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -43,9 +43,27 @@ class UnsubscribeAction extends Action {
}
$other_nickname = $this->arg('unsubscribeto');
- $result=subs_unsubscribe_user($user,$other_nickname);
- if($result!=true) {
- common_user_error($result);
+ $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.'));
return;
}