Twitter-compatible API - moved show() to the right file

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

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bac7523932e4e92e3eda81832f915c8430b5ea6a..3863a3a5e382c90aff37631b2f726b41c4f2a0b2 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -18,35 +18,47 @@
  */
 
 class UnsubscribeAction extends Action {
+       
        function handle($args) {
                parent::handle($args);
                if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
+                       common_user_error(_('Not logged in.'));
                        return;
                }
+
+               $user = common_current_user();
+
+               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+                       common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+                       return;
+               }
+
                $other_nickname = $this->arg('unsubscribeto');
                $other = User::staticGet('nickname', $other_nickname);
                if (!$other) {
-                       common_user_error(_t('No such user.'));
+                       common_user_error(_('No such user.'));
                        return;
                }
 
-               $user = common_current_user();
-
                if (!$user->isSubscribed($other)) {
-                       common_server_error(_t('Not subscribed!.'));
+                       common_server_error(_('Not subscribed!.'));
                }
 
-               $sub = new Subscription();
+               $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(_t('Couldn\'t delete subscription.'));
+                       common_server_error(_('Couldn\'t delete subscription.'));
                        return;
                }
 
-               common_redirect(common_local_url('all', array('nickname' =>
-                                                                                                         $user->nickname)));
+               common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                                                                               $user->nickname)));
        }
 }