Bastelstube
/
Tims-Chat
mirror of https://github.com/wbbaddons/Tims-Chat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Depend on Push instead of nodePush

This commit is contained in:
Tim Düsterhus 2014-09-19 23:34:17 +02:00
parent 88d5e9a11f
commit d4e6d3faef
9 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/build.php
View File

@ -27,7 +27,6 @@ EOT;
if (file_exists('file.tar')) unlink('file.tar');
if (file_exists('template.tar')) unlink('template.tar');
if (file_exists('acptemplate.tar')) unlink('acptemplate.tar');
foreach (glob('file/acp/be.bastelstu.chat.nodePush/lib/*.js') as $nodeFile) unlink($nodeFile);
foreach (glob('file/js/*.js') as $jsFile) unlink($jsFile);
foreach (glob('file/acp/js/*.js') as $jsFile) unlink($jsFile);
if (file_exists('be.bastelstu.chat.tar')) unlink('be.bastelstu.chat.tar');
@ -133,6 +132,5 @@ EOT;
if (file_exists('file.tar')) unlink('file.tar');
if (file_exists('template.tar')) unlink('template.tar');
if (file_exists('acptemplate.tar')) unlink('acptemplate.tar');
foreach (glob('file/acp/be.bastelstu.chat.nodePush/lib/*.js') as $nodeFile) unlink($nodeFile);
foreach (glob('file/js/*.js') as $jsFile) unlink($jsFile);
foreach (glob('file/acp/js/*.js') as $jsFile) unlink($jsFile);

18
file/js/be.bastelstu.Chat.litcoffee
View File

@ -446,25 +446,25 @@ Initialize the `PeriodicalExecuter`s
pe.refreshRoomList = new WCF.PeriodicalExecuter refreshRoomList, 60e3
pe.getMessages = new WCF.PeriodicalExecuter getMessages, v.config.reloadTime * 1e3
Initialize the [**nodePush**](https://github.com/wbbaddons/nodePush) integration of **Tims Chat**. Once
the browser is connected to **nodePush** periodic message loading will be disabled and **Tims Chat** will
Initialize the [**Push**](https://github.com/wbbaddons/Push) integration of **Tims Chat**. Once
the browser is connected to **Push** periodic message loading will be disabled and **Tims Chat** will
load messages if the appropriate event arrives.
do ->
be.bastelstu.wcf.nodePush.onConnect ->
be.bastelstu.wcf.push.onConnect ->
console.log 'Disabling periodic loading'
do pe.getMessages.stop
be.bastelstu.wcf.nodePush.onDisconnect ->
be.bastelstu.wcf.push.onDisconnect ->
console.log 'Enabling periodic loading'
do getMessages
do pe.getMessages.resume
be.bastelstu.wcf.nodePush.onMessage 'be.bastelstu.chat.newMessage', getMessages
be.bastelstu.wcf.nodePush.onMessage 'be.bastelstu.wcf.nodePush.tick60', getMessages
be.bastelstu.wcf.nodePush.onMessage 'be.bastelstu.chat.roomChange', refreshRoomList
be.bastelstu.wcf.nodePush.onMessage 'be.bastelstu.chat.join', refreshRoomList
be.bastelstu.wcf.nodePush.onMessage 'be.bastelstu.chat.leave', refreshRoomList
be.bastelstu.wcf.push.onMessage 'be.bastelstu.chat.newMessage', getMessages
be.bastelstu.wcf.push.onMessage 'be.bastelstu.wcf.push.tick60', getMessages
be.bastelstu.wcf.push.onMessage 'be.bastelstu.chat.roomChange', refreshRoomList
be.bastelstu.wcf.push.onMessage 'be.bastelstu.chat.join', refreshRoomList
be.bastelstu.wcf.push.onMessage 'be.bastelstu.chat.leave', refreshRoomList
Switch to fullscreen mode on mobile devices

2
file/lib/data/message/MessageEditor.class.php
View File

@ -34,7 +34,7 @@ class MessageEditor extends \wcf\data\DatabaseObjectEditor {
* Notify the Push-Server.
*/
public static function create(array $parameters = array()) {
\wcf\system\nodePush\NodePushHandler::getInstance()->sendMessage('be.bastelstu.chat.newMessage');
\wcf\system\push\PushHandler::getInstance()->sendMessage('be.bastelstu.chat.newMessage');
return parent::create($parameters);
}

2
file/lib/data/room/Room.class.php
View File

@ -217,7 +217,7 @@ class Room extends \chat\data\CHATDatabaseObject implements \wcf\system\request\
* @return \wcf\data\user\UserList
*/
public static function getDeadUsers() {
if (\wcf\system\nodePush\NodePushHandler::getInstance()->isEnabled()) {
if (\wcf\system\push\PushHandler::getInstance()->isEnabled()) {
$time = TIME_NOW - 180;
}
else {

4
file/lib/data/room/RoomAction.class.php
View File

@ -251,7 +251,7 @@ class RoomAction extends \wcf\data\AbstractDatabaseObjectAction implements \wcf\
\wcf\system\user\activity\point\UserActivityPointHandler::getInstance()->fireEvent('be.bastelstu.chat.activityPointEvent.join', $result, WCF::getUser()->userID);
// send push message about join
\wcf\system\nodePush\NodePushHandler::getInstance()->sendMessage('be.bastelstu.chat.join');
\wcf\system\push\PushHandler::getInstance()->sendMessage('be.bastelstu.chat.join');
$messages = array();
foreach ($newestMessages as $message) $messages[] = $message->jsonify(true);
@ -318,7 +318,7 @@ class RoomAction extends \wcf\data\AbstractDatabaseObjectAction implements \wcf\
'chatRoomID' => null
));
\wcf\system\nodePush\NodePushHandler::getInstance()->sendMessage('be.bastelstu.chat.leave');
\wcf\system\push\PushHandler::getInstance()->sendMessage('be.bastelstu.chat.leave');
}
/**

2
file/lib/data/room/RoomEditor.class.php
View File

@ -61,6 +61,6 @@ class RoomEditor extends \wcf\data\DatabaseObjectEditor implements \wcf\data\IEd
public static function resetCache() {
\chat\system\cache\builder\RoomCacheBuilder::getInstance()->reset();
\chat\system\cache\builder\PermissionCacheBuilder::getInstance()->reset();
\wcf\system\nodePush\NodePushHandler::getInstance()->sendDeferredMessage('be.bastelstu.chat.roomChange');
\wcf\system\push\PushHandler::getInstance()->sendDeferredMessage('be.bastelstu.chat.roomChange');
}
}

2
package.xml
View File

@ -19,7 +19,7 @@
<requiredpackages>
<requiredpackage minversion="2.0.7">com.woltlab.wcf</requiredpackage>
<requiredpackage file="requirements/be.bastelstu.max.wcf.jCounter.tar" minversion="1.0.0 Beta 4">be.bastelstu.max.wcf.jCounter</requiredpackage>
<requiredpackage file="requirements/be.bastelstu.wcf.nodePush.tar" minversion="1.0.0 Beta 1">be.bastelstu.wcf.nodePush</requiredpackage>
<requiredpackage file="requirements/be.bastelstu.wcf.push.tar" minversion="1.0.0">be.bastelstu.wcf.push</requiredpackage>
</requiredpackages>
<instructions type="install">

4
template/chat.tpl
View File

@ -238,8 +238,8 @@
}
});
be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.push.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.push.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
})(jQuery, this);
//]]>
</script>

4
template/dashboardBoxOnlineList.tpl
View File

@ -31,8 +31,8 @@
}
});
be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.push.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
be.bastelstu.wcf.push.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
})(jQuery, this);
//]]>
</script>