Twitter-compatible API - properly encode and decode UTF-8 HTML entities

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

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 570c1700aed6a6de2b555ce9369c202d063ce4cb..4bfaf79580f0c49b316b98efe9f79b71cd7b63c2 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -43,27 +43,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;
                }