Twitter integration - support for new foreign_link table and prefs now save/update

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8bb723799c3f37a311f84639c19ae5cf7b3910d7..b93c06f120f0f50b084584acaa8d5688606275c0 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -41,20 +41,51 @@ class SubscribeAction extends Action {
                $token = $this->trimmed('token');
                
                if (!$token || $token != common_session_token()) {
-                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
                        return;
                }
 
                $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