eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
This commit is contained in:
Craig Andrews
2010-02-24 20:52:45 -05:00
parent 20d6a7caed 8914b69d50
commit c187bf5597
189 changed files with 17090 additions and 13972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/command.php
View File

@@ -548,12 +548,19 @@ class SubCommand extends Command
return;
}
$result = subs_subscribe_user($this->user, $this->other);
$otherUser = User::staticGet('nickname', $this->other);
if ($result == 'true') {
if (empty($otherUser)) {
$channel->error($this->user, _('No such user'));
return;
}
try {
Subscription::start($this->user->getProfile(),
$otherUser->getProfile());
$channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
} else {
$channel->error($this->user, $result);
} catch (Exception $e) {
$channel->error($this->user, $e->getMessage());
}
}
}
@@ -576,12 +583,18 @@ class UnsubCommand extends Command
return;
}
$result=subs_unsubscribe_user($this->user, $this->other);
$otherUser = User::staticGet('nickname', $this->other);
if ($result) {
if (empty($otherUser)) {
$channel->error($this->user, _('No such user'));
}
try {
Subscription::cancel($this->user->getProfile(),
$otherUser->getProfile());
$channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));
} else {
$channel->error($this->user, $result);
} catch (Exception $e) {
$channel->error($this->user, $e->getMessage());
}
}
}
@@ -655,6 +668,34 @@ class LoginCommand extends Command
}
}
class LoseCommand extends Command
{
var $other = null;
function __construct($user, $other)
{
parent::__construct($user);
$this->other = $other;
}
function execute($channel)
{
if(!$this->other) {
$channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
return;
}
$result=subs_unsubscribe_from($this->user, $this->other);
if ($result) {
$channel->output($this->user, sprintf(_('Unsubscribed %s'), $this->other));
} else {
$channel->error($this->user, $result);
}
}
}
class SubscriptionsCommand extends Command
{
function execute($channel)
@@ -737,6 +778,7 @@ class HelpCommand extends Command
"d <nickname> <text> - direct message to user\n".
"get <nickname> - get last notice from user\n".
"whois <nickname> - get profile info on user\n".
"lose <nickname> - force user to stop following you\n".
"fav <nickname> - add user's last notice as a 'fave'\n".
"fav #<notice_id> - add notice with the given id as a 'fave'\n".
"repeat #<notice_id> - repeat a notice with a given id\n".