forked from GNUsocial/gnu-social
Build channel strings in Meteor plugin
This commit is contained in:
parent
8b1ac4ea20
commit
3da84feabd
@ -76,7 +76,7 @@ class MeteorPlugin extends RealtimePlugin
|
||||
function _updateInitialize($timeline, $user_id)
|
||||
{
|
||||
$script = parent::_updateInitialize($timeline, $user_id);
|
||||
return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$this->channelbase}{$timeline}\");";
|
||||
return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$timeline}\");";
|
||||
}
|
||||
|
||||
function _connect()
|
||||
@ -93,8 +93,7 @@ class MeteorPlugin extends RealtimePlugin
|
||||
{
|
||||
$message = json_encode($message);
|
||||
$message = addslashes($message);
|
||||
common_debug("Message = $message\n");
|
||||
$cmd = "ADDMESSAGE {$this->channelbase}{$channel} $message\n";
|
||||
$cmd = "ADDMESSAGE $channel $message\n";
|
||||
$cnt = fwrite($this->_socket, $cmd);
|
||||
$result = fgets($this->_socket);
|
||||
if (preg_match('/^ERR (.*)$/', $result, $matches)) {
|
||||
@ -108,4 +107,14 @@ class MeteorPlugin extends RealtimePlugin
|
||||
$cnt = fwrite($this->_socket, "QUIT\n");
|
||||
@fclose($this->_socket);
|
||||
}
|
||||
|
||||
// Meteord flips out with default '/' separator
|
||||
|
||||
function _pathToChannel($path)
|
||||
{
|
||||
if (!empty($this->channelbase)) {
|
||||
array_unshift($path, $this->channelbase);
|
||||
}
|
||||
return implode('-', $path);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user