Browse Source

Enforce Packet parameters in all the Widgets

pull/1474/head
Timothée Jaussoin 1 week ago
parent
commit
13956bfa94
  1. 1
      CHANGELOG.md
  2. 7
      app/Widgets/Account/Account.php
  3. 7
      app/Widgets/AccountNext/AccountNext.php
  4. 7
      app/Widgets/Avatar/Avatar.php
  5. 3
      app/Widgets/Blocked/Blocked.php
  6. 32
      app/Widgets/Chat/Chat.php
  7. 5
      app/Widgets/ChatActions/ChatActions.php
  8. 11
      app/Widgets/ChatOmemo/ChatOmemo.php
  9. 6
      app/Widgets/Chats/Chats.php
  10. 10
      app/Widgets/CommunitiesServer/CommunitiesServer.php
  11. 9
      app/Widgets/CommunitiesServers/CommunitiesServers.php
  12. 10
      app/Widgets/CommunityAffiliations/CommunityAffiliations.php
  13. 7
      app/Widgets/CommunityConfig/CommunityConfig.php
  14. 8
      app/Widgets/CommunityPosts/CommunityPosts.php
  15. 7
      app/Widgets/Config/Config.php
  16. 3
      app/Widgets/Confirm/Confirm.php
  17. 8
      app/Widgets/ContactActions/ContactActions.php
  18. 3
      app/Widgets/ContactBlogConfig/ContactBlogConfig.php
  19. 5
      app/Widgets/ContactHeader/ContactHeader.php
  20. 3
      app/Widgets/ContactSubscriptions/ContactSubscriptions.php
  21. 11
      app/Widgets/Login/Login.php
  22. 2
      app/Widgets/Menu/Menu.php
  23. 2
      app/Widgets/Notifications/Notifications.php
  24. 2
      app/Widgets/Post/Post.php
  25. 3
      app/Widgets/Presence/Presence.php
  26. 6
      app/Widgets/Publish/Publish.php
  27. 2
      app/Widgets/PublishStories/PublishStories.php
  28. 34
      app/Widgets/Rooms/Rooms.php
  29. 5
      app/Widgets/RoomsExplore/RoomsExplore.php
  30. 24
      app/Widgets/RoomsUtils/RoomsUtils.php
  31. 2
      app/Widgets/Stickers/Stickers.php
  32. 3
      app/Widgets/Upload/Upload.php
  33. 14
      app/Widgets/Visio/Visio.php

1
CHANGELOG.md

@ -35,6 +35,7 @@ v0.32 (master)
* Fix #1433 Use directly the Carbon object and not createFromFormat() in Contact::isOld()
* Allow chatroom admins to configure the user voice, related to #1478
* Material Design 3 CSS changes
* Enforce Packet parameters in all the Widgets
v0.31
---------------------------

7
app/Widgets/Account/Account.php

@ -11,6 +11,7 @@ use Moxl\Xec\Action\Register\Remove;
use Moxl\Xec\Action\Register\Get;
use Moxl\Xec\Action\Register\Set;
use Moxl\Xec\Action\AdHoc\Get as AdHocGet;
use Moxl\Xec\Payload\Packet;
class Account extends \Movim\Widget\Base
{
@ -34,7 +35,7 @@ class Account extends \Movim\Widget\Base
$this->rpc('Account.refreshFingerprints');
}
public function onAdHocList($packet)
public function onAdHocList(Packet $packet)
{
$list = $packet->content;
@ -69,7 +70,7 @@ class Account extends \Movim\Widget\Base
Toast::send($this->__('client.registered'));
}
public function onRegister($packet)
public function onRegister(Packet $packet)
{
$content = $packet->content;
@ -91,7 +92,7 @@ class Account extends \Movim\Widget\Base
}
}
public function onRegisterError($packet)
public function onRegisterError(Packet $packet)
{
Toast::send(
$packet->content ??

7
app/Widgets/AccountNext/AccountNext.php

@ -7,6 +7,7 @@ use Movim\Librairies\XMPPtoForm;
use Moxl\Xec\Action\Register\Set;
use Movim\Session;
use Moxl\Xec\Payload\Packet;
class AccountNext extends \Movim\Widget\Base
{
@ -23,7 +24,7 @@ class AccountNext extends \Movim\Widget\Base
$this->registerEvent('register_get_errorserviceunavailable', 'onServiceUnavailable', 'accountnext');
}
public function onForm($packet)
public function onForm(Packet $packet)
{
$form = $packet->content;
@ -49,7 +50,7 @@ class AccountNext extends \Movim\Widget\Base
$this->rpc('MovimTpl.fill', '#subscription_form', $html);
}
public function onRegistered($packet)
public function onRegistered(Packet $packet)
{
$view = $this->tpl();
$this->rpc('MovimTpl.fill', '#subscribe', $view->draw('_accountnext_registered'));
@ -60,7 +61,7 @@ class AccountNext extends \Movim\Widget\Base
Toast::send($this->__('error.service_unavailable'));
}
public function onRegisterError($packet)
public function onRegisterError(Packet $packet)
{
$error = $packet->content;
Toast::send($error);

7
app/Widgets/Avatar/Avatar.php

@ -7,6 +7,7 @@ use App\Widgets\Toast\Toast;
use Movim\Image;
use Moxl\Xec\Action\Avatar\Get;
use Moxl\Xec\Action\Avatar\Set;
use Moxl\Xec\Payload\Packet;
class Avatar extends \Movim\Widget\Base
{
@ -23,13 +24,13 @@ class Avatar extends \Movim\Widget\Base
$this->registerEvent('avatar_set_errornotallowed', 'onMyAvatarError');
}
public function onSetAvatar($packet)
public function onSetAvatar(Packet $packet)
{
$this->ajaxGetAvatar();
$this->rpc('MovimTpl.fill', '#avatar', $this->prepareForm());
}
public function onSetBanner($packet)
public function onSetBanner(Packet $packet)
{
global $loop;
@ -38,7 +39,7 @@ class Avatar extends \Movim\Widget\Base
});
}
public function onGetAvatar($packet)
public function onGetAvatar(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#avatar', $this->prepareForm());
$this->rpc('Dialog_ajaxClear');

3
app/Widgets/Blocked/Blocked.php

@ -4,6 +4,7 @@ namespace App\Widgets\Blocked;
use App\Widgets\Toast\Toast;
use Moxl\Xec\Action\Blocking\Unblock;
use Moxl\Xec\Payload\Packet;
class Blocked extends \Movim\Widget\Base
{
@ -24,7 +25,7 @@ class Blocked extends \Movim\Widget\Base
$this->rpc('MovimTpl.fill', '#blocked_widget_list', $list->draw('_blocked_list'));
}
public function onUnblock($packet)
public function onUnblock(Packet $packet)
{
Toast::send($this->__('blocked.account_unblocked'));
$this->rpc('MovimTpl.remove', '#blocked-' . cleanupId($packet->content));

32
app/Widgets/Chat/Chat.php

@ -86,7 +86,7 @@ class Chat extends \Movim\Widget\Base
$this->registerEvent('presence_muji_event', 'onCallInvite');
}
public function onPresence($packet)
public function onPresence(Packet $packet)
{
if ($packet->content && $jid = $packet->content->jid) {
$arr = explode('|', (new Notif)->getCurrent());
@ -111,32 +111,32 @@ class Chat extends \Movim\Widget\Base
$this->ajaxGetHeader($packet->from);
}
public function onJingleMessage($packet)
public function onJingleMessage(Packet $packet)
{
$this->onMessage($packet);
}
public function onMujiMessage($packet)
public function onMujiMessage(Packet $packet)
{
$this->onMessage($packet);
}
public function onMucEventMessage($packet)
public function onMucEventMessage(Packet $packet)
{
$this->onMessage($packet);
}
public function onMessageReceipt($packet)
public function onMessageReceipt(Packet $packet)
{
$this->onMessage($packet, history: false, receipt: true);
}
public function onRetracted($packet)
public function onRetracted(Packet $packet)
{
$this->onMessage($packet, history: false, receipt: true);
}
public function onPostResolved($packet)
public function onPostResolved(Packet $packet)
{
$this->onMessage($packet);
}
@ -163,7 +163,7 @@ class Chat extends \Movim\Widget\Base
}
}
public function onPublishError($packet)
public function onPublishError(Packet $packet)
{
Toast::send(
$packet->content ??
@ -171,7 +171,7 @@ class Chat extends \Movim\Widget\Base
);
}
public function onMessage($packet, $history = false, $receipt = false)
public function onMessage(Packet $packet, $history = false, $receipt = false)
{
$message = $packet->content;
$from = null;
@ -287,7 +287,7 @@ class Chat extends \Movim\Widget\Base
Wrapper::getInstance()->iterate('chat_counter', (new Packet)->pack($this->me->unreads()));
}
public function onSticker($packet)
public function onSticker(Packet $packet)
{
list($to, $cid) = array_values($packet->content);
$this->ajaxGet($to);
@ -310,12 +310,12 @@ class Chat extends \Movim\Widget\Base
$this->rpc('MovimTpl.fill', '#' . cleanupId($packet->from . '_state'), $message);
}
public function onConferenceSubject($packet)
public function onConferenceSubject(Packet $packet)
{
$this->ajaxGetRoom($packet->content->jidfrom, false, true);
}
public function onMAMRetrieved($packet)
public function onMAMRetrieved(Packet $packet)
{
$content = $packet->content;
@ -330,7 +330,7 @@ class Chat extends \Movim\Widget\Base
}
}
public function onMucConnected($packet)
public function onMucConnected(Packet $packet)
{
list($content, $notify) = $packet->content;
@ -339,12 +339,12 @@ class Chat extends \Movim\Widget\Base
}
}
public function onRoomConfigError($packet)
public function onRoomConfigError(Packet $packet)
{
Toast::send($packet->content);
}
public function onRoomConfig($packet)
public function onRoomConfig(Packet $packet)
{
list($config, $room) = array_values($packet->content);
@ -359,7 +359,7 @@ class Chat extends \Movim\Widget\Base
Dialog::fill($view->draw('_chat_config_room'), true);
}
public function onRoomConfigSaved($packet)
public function onRoomConfigSaved(Packet $packet)
{
$r = new DiscoRequest;
$r->setTo($packet->content)

5
app/Widgets/ChatActions/ChatActions.php

@ -15,6 +15,7 @@ use Moxl\Xec\Action\Message\Moderate;
use Moxl\Xec\Action\Message\Retract;
use Illuminate\Database\Capsule\Manager as DB;
use Moxl\Xec\Payload\Packet;
class ChatActions extends \Movim\Widget\Base
{
@ -27,13 +28,13 @@ class ChatActions extends \Movim\Widget\Base
$this->registerEvent('blocking_unblock_handle', 'onUnblock');
}
public function onBlock($packet)
public function onBlock(Packet $packet)
{
Toast::send($this->__('blocked.account_blocked'));
$this->rpc('Chat_ajaxGet', $packet->content);
}
public function onUnblock($packet)
public function onUnblock(Packet $packet)
{
Toast::send($this->__('blocked.account_unblocked'));
$this->rpc('Chat_ajaxGet', $packet->content);

11
app/Widgets/ChatOmemo/ChatOmemo.php

@ -8,6 +8,7 @@ use Moxl\Xec\Action\OMEMO\CleanDevicesList;
use Moxl\Xec\Action\OMEMO\GetBundle;
use Moxl\Xec\Action\OMEMO\GetDevicesList;
use Moxl\Xec\Action\OMEMO\SetDevicesList;
use Moxl\Xec\Payload\Packet;
class ChatOmemo extends \Movim\Widget\Base
{
@ -24,7 +25,7 @@ class ChatOmemo extends \Movim\Widget\Base
$this->addjs('chatomemo_db.js');
}
public function onDevicesList($packet)
public function onDevicesList(Packet $packet)
{
list($from, $devices) = array_values($packet->content);
@ -33,7 +34,7 @@ class ChatOmemo extends \Movim\Widget\Base
}
}
public function onDevices($packet)
public function onDevices(Packet $packet)
{
list($from, $devices) = array_values($packet->content);
@ -46,7 +47,7 @@ class ChatOmemo extends \Movim\Widget\Base
);
}
public function onBundle($packet)
public function onBundle(Packet $packet)
{
$bundle = $packet->content;
$prekey = $bundle->extractPreKey();
@ -56,12 +57,12 @@ class ChatOmemo extends \Movim\Widget\Base
}
}
public function onLastBundle($packet)
public function onLastBundle(Packet $packet)
{
$this->rpc('ChatOmemo.bundlesRefreshed', $packet->content);
}
public function onDeviceListError($packet)
public function onDeviceListError(Packet $packet)
{
if ($packet->content == $this->me->id) {
$this->rpc('ChatOmemo.initiateBundle', []);

6
app/Widgets/Chats/Chats.php

@ -40,18 +40,18 @@ class Chats extends Base
$this->registerEvent('callinviteleft', 'onCallInvite');
}
public function onStart($packet)
public function onStart(Packet $packet)
{
$tpl = $this->tpl();
$tpl->cacheClear('_chats_item');
}
public function onCallInvite($packet)
public function onCallInvite(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#chats_calls_list', $this->prepareCalls());
}
public function onMessage($packet)
public function onMessage(Packet $packet)
{
$message = $packet->content;

10
app/Widgets/CommunitiesServer/CommunitiesServer.php

@ -44,14 +44,14 @@ class CommunitiesServer extends \Movim\Widget\Base
$this->rpc('MovimTpl.fill', '#communities_server', $view->draw('_communitiesserver_remoteservernotfound'));
}
public function onDisco($packet)
public function onDisco(Packet $packet)
{
$origin = $packet->content;
$this->rpc('MovimTpl.fill', '#communities_server', $this->prepareCommunitiesServer($origin));
}
public function onDiscoRequest($packet)
public function onDiscoRequest(Packet $packet)
{
$info = $packet->content;
@ -60,7 +60,7 @@ class CommunitiesServer extends \Movim\Widget\Base
}
}
public function onDiscoError($packet)
public function onDiscoError(Packet $packet)
{
$origin = $packet->content;
@ -71,7 +71,7 @@ class CommunitiesServer extends \Movim\Widget\Base
Toast::send($this->__('communitiesserver.disco_error'));
}
public function onTestCreate($packet)
public function onTestCreate(Packet $packet)
{
$origin = $packet->content;
@ -81,7 +81,7 @@ class CommunitiesServer extends \Movim\Widget\Base
Dialog::fill($view->draw('_communitiesserver_add'));
}
public function onTestCreateError($packet)
public function onTestCreateError(Packet $packet)
{
Toast::send($this->__('communitiesserver.no_creation'));
}

9
app/Widgets/CommunitiesServers/CommunitiesServers.php

@ -8,6 +8,7 @@ use Movim\Widget\Base;
use Moxl\Xec\Action\Disco\Request;
use Moxl\Xec\Action\Disco\Items;
use Moxl\Xec\Payload\Packet;
class CommunitiesServers extends Base
{
@ -20,26 +21,26 @@ class CommunitiesServers extends Base
$this->addjs('communitiesservers.js');
}
public function onDisco($packet)
public function onDisco(Packet $packet)
{
Toast::send($this->__('communities.disco'));
$this->ajaxHttpGet();
$this->rpc('Dialog_ajaxClear');
}
public function onDiscoInfo($packet)
public function onDiscoInfo(Packet $packet)
{
if ($packet->content->isPubsubService()) {
$this->ajaxHttpGet();
}
}
public function onDiscoError($packet)
public function onDiscoError(Packet $packet)
{
Toast::send($this->__('communities.disco_error'));
}
public function onDiscoNotFound($packet)
public function onDiscoNotFound(Packet $packet)
{
Toast::send($this->__('page.not_found'));
}

10
app/Widgets/CommunityAffiliations/CommunityAffiliations.php

@ -29,7 +29,7 @@ class CommunityAffiliations extends Base
$this->addjs('communityaffiliations.js');
}
public function onAffiliations($packet)
public function onAffiliations(Packet $packet)
{
list($server, $node) = array_values($packet->content);
@ -86,12 +86,12 @@ class CommunityAffiliations extends Base
);
}
public function onAffiliationsSet($packet)
public function onAffiliationsSet(Packet $packet)
{
Toast::send($this->__('communityaffiliation.role_set'));
}
public function onSubscriptions($packet)
public function onSubscriptions(Packet $packet)
{
list($subscriptions, $server, $node) = array_values($packet->content);
@ -122,14 +122,14 @@ class CommunityAffiliations extends Base
}
}
public function onDelete($packet)
public function onDelete(Packet $packet)
{
Toast::send($this->__('communityaffiliation.deleted'));
$this->deleted($packet);
}
public function onDeleteError($packet)
public function onDeleteError(Packet $packet)
{
Toast::send($this->__('communityaffiliation.delete_error'));

7
app/Widgets/CommunityConfig/CommunityConfig.php

@ -12,6 +12,7 @@ use Movim\Widget\Base;
use Moxl\Xec\Action\Pubsub\GetConfig;
use Moxl\Xec\Action\Pubsub\SetConfig;
use Moxl\Xec\Action\Avatar\Set as AvatarSet;
use Moxl\Xec\Payload\Packet;
class CommunityConfig extends Base
{
@ -23,7 +24,7 @@ class CommunityConfig extends Base
$this->registerEvent('avatar_set_pubsub', 'onAvatarSet');
}
public function onConfig($packet)
public function onConfig(Packet $packet)
{
list($config, $accessModel, $origin, $node, $advanced) = array_values($packet->content);
@ -42,7 +43,7 @@ class CommunityConfig extends Base
$this->rpc('MovimUtils.applyAutoheight');
}
public function onAvatarSet($packet)
public function onAvatarSet(Packet $packet)
{
$this->rpc('Dialog_ajaxClear');
Toast::send($this->__('avatar.updated'));
@ -53,7 +54,7 @@ class CommunityConfig extends Base
Toast::send($this->__('communityaffiliation.config_saved'));
}
public function onConfigError($packet)
public function onConfigError(Packet $packet)
{
Toast::send(
$packet->content ??

8
app/Widgets/CommunityPosts/CommunityPosts.php

@ -26,7 +26,7 @@ class CommunityPosts extends Base
$this->addjs('communityposts.js');
}
public function onItemsId($packet)
public function onItemsId(Packet $packet)
{
list($origin, $node, $ids, $first, $last, $count, $paginated, $before, $after, $query)
= array_values($packet->content);
@ -51,12 +51,12 @@ class CommunityPosts extends Base
);
}
public function onConfigSaved($packet)
public function onConfigSaved(Packet $packet)
{
$this->rpc('CommunityPosts.getItems');
}
public function tonItemsErrorPresenceSubscriptionRequired($packet)
public function tonItemsErrorPresenceSubscriptionRequired(Packet $packet)
{
list($origin, $node) = array_values($packet->content);
@ -69,7 +69,7 @@ class CommunityPosts extends Base
);
}
public function onItemsError($packet)
public function onItemsError(Packet $packet)
{
list($origin, $node) = array_values($packet->content);

7
app/Widgets/Config/Config.php

@ -15,6 +15,7 @@ use Moxl\Xec\Action\MAM\GetConfig;
use Moxl\Xec\Action\MAM\SetConfig;
use Moxl\Xec\Action\Pubsub\GetConfig as PubsubGetConfig;
use Moxl\Xec\Action\Pubsub\SetConfig as PubsubSetConfig;
use Moxl\Xec\Payload\Packet;
use Respect\Validation\Validator;
class Config extends Base
@ -44,7 +45,7 @@ class Config extends Base
return $view->draw('_config_form');
}
public function onConfig($packet)
public function onConfig(Packet $packet)
{
$this->me->setConfig($packet->content);
$this->me->save();
@ -54,7 +55,7 @@ class Config extends Base
Toast::send($this->__('config.updated'));
}
public function onMAMConfig($packet)
public function onMAMConfig(Packet $packet)
{
$view = $this->tpl();
$view->assign('default', $packet->content);
@ -71,7 +72,7 @@ class Config extends Base
Toast::send($this->__('config.blog_saved'));
}
public function onBlogConfig($packet)
public function onBlogConfig(Packet $packet)
{
$view = $this->tpl();

3
app/Widgets/Confirm/Confirm.php

@ -7,6 +7,7 @@ use Movim\Widget\Base;
use Moxl\Xec\Action\Confirm\Accept;
use Moxl\Xec\Action\Confirm\Refuse;
use Moxl\Xec\Payload\Packet;
class Confirm extends Base
{
@ -16,7 +17,7 @@ class Confirm extends Base
$this->registerEvent('confirm', 'onConfirm');
}
public function onConfirm($packet)
public function onConfirm(Packet $packet)
{
$view = $this->tpl();

8
app/Widgets/ContactActions/ContactActions.php

@ -10,10 +10,10 @@ use App\Widgets\Drawer\Drawer;
use App\Widgets\Post\Post;
use App\Widgets\Toast\Toast;
use Movim\CurrentCall;
use Movim\EmbedLight;
use Movim\Widget\Base;
use Moxl\Xec\Action\Blocking\Block;
use Moxl\Xec\Action\Blocking\Unblock;
use Moxl\Xec\Payload\Packet;
class ContactActions extends Base
{
@ -28,17 +28,17 @@ class ContactActions extends Base
$this->registerEvent('roster_updateitem_handle', 'onUpdate');
}
public function onDelete($packet)
public function onDelete(Packet $packet)
{
Toast::send($this->__('roster.deleted'));
}
public function onAdd($packet)
public function onAdd(Packet $packet)
{
Toast::send($this->__('roster.added'));
}
public function onUpdate($packet = false)
public function onUpdate(Packet $packet)
{
Toast::send($this->__('roster.updated'));
}

3
app/Widgets/ContactBlogConfig/ContactBlogConfig.php

@ -6,6 +6,7 @@ use App\Post;
use Movim\Widget\Base;
use Moxl\Xec\Action\Pubsub\GetConfig;
use Moxl\Xec\Payload\Packet;
class ContactBlogConfig extends Base
{
@ -22,7 +23,7 @@ class ContactBlogConfig extends Base
}
}
public function onBlogConfig($packet)
public function onBlogConfig(Packet $packet)
{
if ($packet->content['access_model'] == 'presence') {
$view = $this->tpl();

5
app/Widgets/ContactHeader/ContactHeader.php

@ -7,6 +7,7 @@ use App\Widgets\Dialog\Dialog;
use Movim\Widget\Base;
use Moxl\Xec\Action\Roster\UpdateItem;
use Moxl\Xec\Payload\Packet;
class ContactHeader extends Base
{
@ -19,12 +20,12 @@ class ContactHeader extends Base
$this->registerEvent('vcard4_get_handle', 'onVcardReceived', 'contact');
}
public function onUpdate($packet)
public function onUpdate(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#' . cleanupId($packet->content) . '_contact_header', $this->prepareHeader($packet->content));
}
public function onVcardReceived($packet)
public function onVcardReceived(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#' . cleanupId($packet->content) . '_contact_header', $this->prepareHeader($packet->content));
}

3
app/Widgets/ContactSubscriptions/ContactSubscriptions.php

@ -5,6 +5,7 @@ namespace App\Widgets\ContactSubscriptions;
use Movim\Widget\Base;
use Moxl\Xec\Action\PubsubSubscription\Get as GetPubsubSubscriptions;
use Moxl\Xec\Payload\Packet;
class ContactSubscriptions extends Base
{
@ -14,7 +15,7 @@ class ContactSubscriptions extends Base
$this->registerEvent('pubsubsubscription_get_handle', 'onPubsubSubscriptionReceived', 'contact');
}
public function onPubsubSubscriptionReceived($packet)
public function onPubsubSubscriptionReceived(Packet $packet)
{
$jid = $packet->content;
$this->rpc('MovimTpl.fill', '#'.cleanupId($jid) . '_contact_subscriptions', $this->prepareSubscriptions($jid));

11
app/Widgets/Login/Login.php

@ -17,6 +17,7 @@ use App\Widgets\Toast\Toast;
use Movim\Widget\Base;
use Movim\Cookie;
use Moxl\Xec\Payload\Packet;
class Login extends Base
{
@ -39,7 +40,7 @@ class Login extends Base
$this->registerEvent('streamerror', 'onFailAuth');
}
public function onStart($packet)
public function onStart(Packet $packet)
{
//$session = Session::instance();
@ -49,17 +50,17 @@ class Login extends Base
//}
}
public function onConnected($packet)
public function onConnected()
{
Toast::send($this->__('connection.socket_connected'));
}
public function onSASLSuccess($packet)
public function onSASLSuccess(Packet $packet)
{
Toast::send($this->__('connection.authenticated'));
}
public function onConfig($packet)
public function onConfig(Packet $packet)
{
$p = new Presence;
$p->start();
@ -163,7 +164,7 @@ class Login extends Base
$this->showErrorBlock('timeout');
}
public function onSASLFailure($packet)
public function onSASLFailure(Packet $packet)
{
switch ($packet->content) {
case 'invalid-mechanism':

2
app/Widgets/Menu/Menu.php

@ -39,7 +39,7 @@ class Menu extends Base
}
}
public function onRetract($packet)
public function onRetract(Packet $packet)
{
$this->ajaxHttpGetAll();
}

2
app/Widgets/Notifications/Notifications.php

@ -43,7 +43,7 @@ class Notifications extends Base
}
}
public function onRoster($packet)
public function onRoster(Packet $packet)
{
$contact = $this->me->session->contacts()->where('jid', $packet->content)->first();

2
app/Widgets/Post/Post.php

@ -94,7 +94,7 @@ class Post extends Base
$this->rpc('MovimTpl.fill', '#comments', $view->draw('_post_comments_error'));
}
public function onDelete($packet)
public function onDelete(Packet $packet)
{
$this->rpc('Post.refreshComments');
}

3
app/Widgets/Presence/Presence.php

@ -20,6 +20,7 @@ use App\Widgets\Chats\Chats;
use App\Widgets\Dialog\Dialog;
use Movim\CurrentCall;
use Moxl\Xec\Action\Blocking\Request;
use Moxl\Xec\Payload\Packet;
class Presence extends Base
{
@ -46,7 +47,7 @@ class Presence extends Base
->request();
}
public function tonMyPresence($packet)
public function tonMyPresence(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#presence_widget', $this->preparePresence());
}

6
app/Widgets/Publish/Publish.php

@ -36,7 +36,7 @@ class Publish extends Base
$this->addcss('publish.css');
}
public function onPublish($packet)
public function onPublish(Packet $packet)
{
Toast::send($this->__('post.published'));
@ -53,7 +53,7 @@ class Publish extends Base
}
}
public function onBlogConfig($packet)
public function onBlogConfig(Packet $packet)
{
if ($packet->content['access_model'] == 'presence') {
$view = $this->tpl();
@ -61,7 +61,7 @@ class Publish extends Base
}
}
public function onPublishErrorForbidden($packet)
public function onPublishErrorForbidden(Packet $packet)
{
Toast::send($this->__('publish.publish_error_forbidden'));

2
app/Widgets/PublishStories/PublishStories.php

@ -19,7 +19,7 @@ class PublishStories extends Base
$this->addcss('publishstories.css');
}
public function onPublish($packet)
public function onPublish(Packet $packet)
{
Toast::send($this->__('story.published'));

34
app/Widgets/Rooms/Rooms.php

@ -111,7 +111,7 @@ class Rooms extends Base
}
}
public function onMessage($packet)
public function onMessage(Packet $packet)
{
$message = $packet->content;
@ -124,7 +124,7 @@ class Rooms extends Base
}
}
public function onDisplayed($packet)
public function onDisplayed(Packet $packet)
{
$message = $packet->content;
@ -133,7 +133,7 @@ class Rooms extends Base
}
}
public function onDestroyed($packet)
public function onDestroyed(Packet $packet)
{
$this->ajaxHttpGet();
$this->rpc('Chat_ajaxGet');
@ -141,13 +141,13 @@ class Rooms extends Base
Toast::send($this->__('chatrooms.destroyed'));
}
public function onConnected($packet)
public function onConnected(Packet $packet)
{
list($presence, $notify) = array_values($packet->content);
$this->onPresence($presence->jid);
}
public function onDisconnected($packet)
public function onDisconnected(Packet $packet)
{
if ($packet->content) {
$this->onPresence($packet->content);
@ -155,7 +155,7 @@ class Rooms extends Base
}
}
public function onBookmarkGet($packet)
public function onBookmarkGet(Packet $packet)
{
foreach (
$this->me->session->conferences()
@ -180,12 +180,12 @@ class Rooms extends Base
$this->ajaxHttpGet();
}
public function onBookmarkRetract($packet)
public function onBookmarkRetract(Packet $packet)
{
$this->ajaxHttpGet();
}
public function onBookmarkSet($packet)
public function onBookmarkSet(Packet $packet)
{
$conference = $packet->content;
@ -388,55 +388,55 @@ class Rooms extends Base
Toast::send($this->__('chatrooms.conflict'));
}
public function onRegistrationRequired($packet)
public function onRegistrationRequired(Packet $packet)
{
Toast::send($this->__('chatrooms.registrationrequired'));
$this->ajaxExit($packet->content);
}
public function onRemoteServerNotFound($packet)
public function onRemoteServerNotFound(Packet $packet)
{
Toast::send($this->__('chatrooms.remoteservernotfound'));
$this->ajaxExit($packet->content);
}
public function onRemoteServerTimeout($packet)
public function onRemoteServerTimeout(Packet $packet)
{
Toast::send($this->__('chatrooms.remoteservertimeout'));
$this->ajaxExit($packet->content);
}
public function onItemNotFound($packet)
public function onItemNotFound(Packet $packet)
{
Toast::send($this->__('chatrooms.itemnotfound'));
$this->ajaxExit($packet->content);
}
public function onNotAuthorized($packet)
public function onNotAuthorized(Packet $packet)
{
Toast::send($this->__('chatrooms.notauthorized'));
$this->ajaxExit($packet->content);
}
public function onForbidden($packet)
public function onForbidden(Packet $packet)
{
Toast::send($this->__('chatrooms.forbidden'));
$this->ajaxExit($packet->content);
}
public function onJidMalformed($packet)
public function onJidMalformed(Packet $packet)
{
Toast::send($this->__('chatrooms.jidmalformed'));
$this->ajaxExit($packet->content);
}
public function onNotAcceptable($packet)
public function onNotAcceptable(Packet $packet)
{
Toast::send($this->__('chatrooms.notacceptable'));
$this->ajaxExit($packet->content);
}
public function onServiceUnavailable($packet)
public function onServiceUnavailable(Packet $packet)
{
Toast::send($this->__('chatrooms.serviceunavailable'));
$this->ajaxExit($packet->content);

5
app/Widgets/RoomsExplore/RoomsExplore.php

@ -7,6 +7,7 @@ use Movim\Widget\Base;
use App\Contact;
use App\Widgets\Drawer\Drawer;
use Moxl\Xec\Payload\Packet;
class RoomsExplore extends Base
{
@ -17,7 +18,7 @@ class RoomsExplore extends Base
$this->registerEvent('extendedchannelsearch_search_error', 'onGlobalSearchError', 'chat');
}
public function onGlobalSearch($packet)
public function onGlobalSearch(Packet $packet)
{
$view = $this->tpl();
@ -47,7 +48,7 @@ class RoomsExplore extends Base
$this->rpc('RoomsExplore.searchClear');
}
public function onGlobalSearchError($packet)
public function onGlobalSearchError(Packet $packet)
{
$this->rpc('MovimTpl.fill', '#roomsexplore_global', '');
$this->searchLocally($packet->content);

24
app/Widgets/RoomsUtils/RoomsUtils.php

@ -238,28 +238,28 @@ class RoomsUtils extends Base
$r->setData($vcard)->setTo($room)->request();
}
public function onAvatarSet($packet)
public function onAvatarSet(Packet $packet)
{
$this->rpc('Dialog_ajaxClear');
Toast::send($this->__('avatar.updated'));
}
public function onMucCreated($packet)
public function onMucCreated(Packet $packet)
{
$this->rpc('RoomsUtils.configureCreatedRoom');
}
public function onPresenceMucNotAllowed($packet)
public function onPresenceMucNotAllowed(Packet $packet)
{
Toast::send($this->__('chatrooms.notallowed'));
}
public function onDiscoRegistrationRequired($packet)
public function onDiscoRegistrationRequired(Packet $packet)
{
Toast::send($this->__('rooms.disco_registration_required'));
}
public function onSetRole($packet)
public function onSetRole(Packet $packet)
{
Toast::send($this->__('room.role_changed'));
}
@ -267,7 +267,7 @@ class RoomsUtils extends Base
/**
* @brief Affiliation changed for a user
*/
public function onAffiliationChanged($packet)
public function onAffiliationChanged(Packet $packet)
{
$affiliation = $packet->content;
@ -297,7 +297,7 @@ class RoomsUtils extends Base
/**
* @brief When the affiliation change is unauthorized
*/
public function onAffiliationChangeUnauthorized($packet)
public function onAffiliationChangeUnauthorized(Packet $packet)
{
Toast::send($this->__('room.change_affiliation_unauthorized'));
}
@ -305,7 +305,7 @@ class RoomsUtils extends Base
/**
* @brief If a chatroom is successfuly created
*/
public function onChatroomCreated($packet)
public function onChatroomCreated(Packet $packet)
{
Toast::send($this->__('chatrooms.created'));
@ -345,7 +345,7 @@ class RoomsUtils extends Base
/**
* @brief If a chatroom creation is failing
*/
public function onChatroomCreatedError($packet)
public function onChatroomCreatedError(Packet $packet)
{
Toast::send($packet->content);
}
@ -617,7 +617,7 @@ class RoomsUtils extends Base
}
}
public function onInviteError($packet)
public function onInviteError(Packet $packet)
{
Toast::send($packet->content);
}
@ -913,7 +913,7 @@ class RoomsUtils extends Base
$g->request();
}
public function onDiscoGateway($packet)
public function onDiscoGateway(Packet $packet)
{
$view = $this->tpl();
@ -953,7 +953,7 @@ class RoomsUtils extends Base
$this->rpc('MovimTpl.fill', '#gateway_rooms', $view->draw('_rooms_gateway_rooms'));
}
public function onDiscoGatewayError($packet)
public function onDiscoGatewayError(Packet $packet)
{
$this->ajaxResetGatewayRooms();
}

2
app/Widgets/Stickers/Stickers.php

@ -29,7 +29,7 @@ class Stickers extends \Movim\Widget\Base
$this->registerEvent('bob', 'onRequest');
}
public function onRequest($packet)
public function onRequest(Packet $packet)
{
list($to, $id, $cid) = array_values($packet->content);

3
app/Widgets/Upload/Upload.php

@ -7,6 +7,7 @@ use App\Widgets\Toast\Toast;
use Movim\Widget\Base;
use Moxl\Xec\Action\Upload\Request;
use Moxl\Xec\Payload\Packet;
class Upload extends Base
{
@ -28,7 +29,7 @@ class Upload extends Base
}
}
public function onRequested($packet)
public function onRequested(Packet $packet)
{
$content = $packet->content;

14
app/Widgets/Visio/Visio.php

@ -88,7 +88,7 @@ class Visio extends Base
}
}
public function onMucMujiCreated($packet)
public function onMucMujiCreated(Packet $packet)
{
$presence = $packet->content;
@ -97,17 +97,17 @@ class Visio extends Base
->request();
}
public function onMucMujiPreparing($packet)
public function onMucMujiPreparing(Packet $packet)
{
$this->ajaxMujiTrigger();
}
public function onCallInviteRetract($packet)
public function onCallInviteRetract(Packet $packet)
{
$this->rpc('MovimVisio.clear');
}
public function onExternalServices($packet)
public function onExternalServices(Packet $packet)
{
$externalServices = [];
if ($packet->content) {
@ -139,7 +139,7 @@ class Visio extends Base
}
}
public function onMujiPresence($packet)
public function onMujiPresence(Packet $packet)
{
list($stanza, $presence) = $packet->content;
if (
@ -159,7 +159,7 @@ class Visio extends Base
}
}
public function onExternalServicesError($packet)
public function onExternalServicesError(Packet $packet)
{
$this->setDefaultServices();
@ -192,7 +192,7 @@ class Visio extends Base
}
// Deprecated
public function onAccept($packet)
public function onAccept(Packet $packet)
{
$this->rpc('Notif.incomingCallAnswer');
CurrentCall::getInstance()->start(\baseJid($packet->from), $packet->content);

Loading…
Cancel
Save