*/
class IrcManager extends ImManager {
-
public $conn = null;
+
/**
* Initialize connection to server.
+ *
* @return boolean true on success
*/
public function start($master) {
}
}
+ /**
+ * Return any open sockets that the run loop should listen
+ * for input on.
+ *
+ * @return array Array of socket resources
+ */
public function getSockets() {
$this->connect();
if ($this->conn) {
- return array($this->conn->myConnection);
+ return $this->conn->getSockets();
} else {
return array();
}
/**
* Process IRC events that have come in over the wire.
+ *
* @param resource $socket
+ * @return void
*/
public function handleInput($socket) {
common_log(LOG_DEBUG, 'Servicing the IRC queue.');
$this->conn->receive();
}
- function connect() {
+ /**
+ * Initiate connection
+ *
+ * @return void
+ */
+ public function connect() {
if (!$this->conn) {
- $this->conn = new Phergie_Extended_Bot;
+ $this->conn = new Phergie_StatusnetBot;
- $password = isset($this->plugin->password) ? $this->plugin->password : '';
- $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
- $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
- $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
- $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
+ $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
+ $password = empty($this->plugin->password) ? '' : $this->plugin->password;
+ $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
+ $encoding = empty($this->plugin->encoding) ? 'UTF-8' : $this->plugin->encoding;
+ $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
+ $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
- $config = new Phergie_Extended_Config;
+ $config = new Phergie_Config;
$config->readArray(
array(
- // One array per connection, pretty self-explanatory
'connections' => array(
array(
'host' => $this->plugin->host,
- 'port' => $this->plugin->port,
+ 'port' => $port,
'username' => $this->plugin->username,
'realname' => $this->plugin->realname,
- 'nick' => $this->plugin->nickname,
+ 'nick' => $this->plugin->nick,
'password' => $password,
'transport' => $transport,
'encoding' => $encoding
)
),
- 'processor' => 'async',
- 'processor.options' => array('usec' => 200000),
+ 'driver' => 'statusnet',
+
+ 'processor' => 'statusnet',
'plugins' => array(
'Pong',
'ui.enabled' => true,
'nickserv.password' => $nickservpassword,
- 'autojoin.channels' => $channels
+ 'autojoin.channels' => $channels,
+ 'statusnet_callback.callback' => array($this, 'handle_irc_message')
)
);
return $this->conn;
}
- function handle_irc_message($data) {
+ /**
+ * Called via a callback when a message is received
+ *
+ * Passes it back to the queuing system
+ *
+ * @param array $data Data
+ * @return boolean
+ */
+ public function handle_irc_message($data) {
$this->plugin->enqueue_incoming_raw($data);
return true;
}
- function send_raw_message($data) {
+ /**
+ * Send a message using the daemon
+ *
+ * @param $data Message
+ * @return boolean true on success
+ */
+ public function send_raw_message($data) {
$this->connect();
if (!$this->conn) {
return false;
}
- $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+ $this->conn->send($data[0], $data[1]);
return true;
}
}