Browse Source

Fix spelling of Signaling (single L)

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/363/head
Joas Schilling 8 years ago
parent
commit
288c1bb321
No known key found for this signature in database GPG Key ID: E166FD8976B3BAC8
  1. 6
      appinfo/routes.php
  2. 6
      docs/api-v1.md
  3. 8
      js/signaling.js
  4. 2
      js/simplewebrtc.js
  5. 2
      lib/AppInfo/Application.php
  6. 2
      lib/Controller/CallController.php
  7. 6
      lib/Controller/SignalingController.php
  8. 4
      lib/Migration/Version2001Date20170913104501.php
  9. 12
      lib/Signaling/Messages.php
  10. 2
      tests/integration/spreedcheats/lib/Controller/ApiController.php

6
appinfo/routes.php

@ -36,15 +36,15 @@ return [
],
'ocs' => [
[
'name' => 'Signalling#signalling',
'url' => '/api/{apiVersion}/signalling',
'name' => 'Signaling#signaling',
'url' => '/api/{apiVersion}/signaling',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1',
],
],
[
'name' => 'Signalling#pullMessages',
'name' => 'Signaling#pullMessages',
'url' => '/api/{apiVersion}/messages',
'verb' => 'GET',
'requirements' => [

6
docs/api-v1.md

@ -23,7 +23,7 @@
* [Join a call](#join-a-call)
* [Send ping to keep the call alive](#send-ping-to-keep-the-call-alive)
* [Leave a call (but staying in the room for future calls)](#leave-a-call--but-staying-in-the-room-for-future-calls-)
- [Signalling](#signalling)
- [Signaling](#signaling)
Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
@ -351,6 +351,6 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
+ `200 OK`
+ `404 Not Found` When the room could not be found for the participant
## Signalling
## Signaling
To be defined
See the [Draft](https://github.com/nextcloud/spreed/wiki/Signaling-API) in the wiki…

8
js/signaling.js

@ -155,7 +155,7 @@
this._sendMessages(message).done(function(result) {
this._trigger(ev, [result.ocs.data]);
}.bind(this)).fail(function(/*xhr, textStatus, errorThrown*/) {
console.log('Sending signalling message with callback has failed.');
console.log('Sending signaling message with callback has failed.');
// TODO: Add error handling
});
};
@ -163,7 +163,7 @@
InternalSignaling.prototype._sendMessages = function(messages) {
var defer = $.Deferred();
$.ajax({
url: OC.linkToOCS('apps/spreed/api/v1', 2) + 'signalling',
url: OC.linkToOCS('apps/spreed/api/v1', 2) + 'signaling',
type: 'POST',
data: {messages: JSON.stringify(messages)},
beforeSend: function (request) {
@ -188,7 +188,7 @@
// 3. Pass information about the clients that need to be called by you to the callback.
//
// The clients will then use the message command to exchange
// their signalling information.
// their signaling information.
$.ajax({
url: OC.linkToOCS('apps/spreed/api/v1/call', 2) + token,
type: 'POST',
@ -333,7 +333,7 @@
this._trigger('message', [message.data]);
break;
default:
console.log('Uknown Signalling Message');
console.log('Unknown Signaling Message');
break;
}
}.bind(this));

2
js/simplewebrtc.js

@ -17760,7 +17760,7 @@
}
};
// send via signalling channel
// send via signaling channel
Peer.prototype.send = function (messageType, payload) {
var message = {
to: this.id,

2
lib/AppInfo/Application.php

@ -22,7 +22,7 @@
namespace OCA\Spreed\AppInfo;
use OCA\Spreed\Room;
use OCA\Spreed\Signalling\Messages;
use OCA\Spreed\Signaling\Messages;
use OCP\AppFramework\App;
use Symfony\Component\EventDispatcher\GenericEvent;

2
lib/Controller/CallController.php

@ -30,7 +30,7 @@ use OCA\Spreed\Exceptions\ParticipantNotFoundException;
use OCA\Spreed\Exceptions\RoomNotFoundException;
use OCA\Spreed\Manager;
use OCA\Spreed\Participant;
use OCA\Spreed\Signalling\Messages;
use OCA\Spreed\Signaling\Messages;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;

6
lib/Controller/SignallingController.php → lib/Controller/SignalingController.php

@ -27,7 +27,7 @@ use OCA\Spreed\Config;
use OCA\Spreed\Exceptions\RoomNotFoundException;
use OCA\Spreed\Manager;
use OCA\Spreed\Room;
use OCA\Spreed\Signalling\Messages;
use OCA\Spreed\Signaling\Messages;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
@ -35,7 +35,7 @@ use OCP\IDBConnection;
use OCP\IRequest;
use OCP\ISession;
class SignallingController extends OCSController {
class SignalingController extends OCSController {
/** @var Config */
private $config;
/** @var ISession */
@ -82,7 +82,7 @@ class SignallingController extends OCSController {
* @param string $messages
* @return DataResponse
*/
public function signalling($messages) {
public function signaling($messages) {
$response = [];
$messages = json_decode($messages, true);
foreach($messages as $message) {

4
lib/Migration/Version2001Date20170913104501.php

@ -31,8 +31,8 @@ class Version2001Date20170913104501 extends SimpleMigrationStep {
/** @var Schema $schema */
$schema = $schemaClosure();
if (!$schema->hasTable('videocalls_signalling')) {
$table = $schema->createTable('videocalls_signalling');
if (!$schema->hasTable('videocalls_signaling')) {
$table = $schema->createTable('videocalls_signaling');
$table->addColumn('sender', Type::STRING, [
'notnull' => true,

12
lib/Signalling/Messages.php → lib/Signaling/Messages.php

@ -19,7 +19,7 @@
*
*/
namespace OCA\Spreed\Signalling;
namespace OCA\Spreed\Signaling;
use OCA\Spreed\Room;
@ -49,7 +49,7 @@ class Messages {
*/
public function deleteMessages(array $sessionIds) {
$query = $this->db->getQueryBuilder();
$query->delete('videocalls_signalling')
$query->delete('videocalls_signaling')
->where($query->expr()->in('recipient', $query->createNamedParameter($sessionIds, IQueryBuilder::PARAM_STR_ARRAY)))
->orWhere($query->expr()->in('sender', $query->createNamedParameter($sessionIds, IQueryBuilder::PARAM_STR_ARRAY)));
$query->execute();
@ -62,7 +62,7 @@ class Messages {
*/
public function addMessage($senderSessionId, $recipientSessionId, $message) {
$query = $this->db->getQueryBuilder();
$query->insert('videocalls_signalling')
$query->insert('videocalls_signaling')
->values(
[
'sender' => $query->createNamedParameter($senderSessionId),
@ -80,7 +80,7 @@ class Messages {
*/
public function addMessageForAllParticipants(Room $room, $message) {
$query = $this->db->getQueryBuilder();
$query->insert('videocalls_signalling')
$query->insert('videocalls_signaling')
->values(
[
'sender' => $query->createParameter('sender'),
@ -114,7 +114,7 @@ class Messages {
$query = $this->db->getQueryBuilder();
$query->select('*')
->from('videocalls_signalling')
->from('videocalls_signaling')
->where($query->expr()->eq('recipient', $query->createNamedParameter($sessionId)))
->andWhere($query->expr()->lte('timestamp', $query->createNamedParameter($time)));
$result = $query->execute();
@ -125,7 +125,7 @@ class Messages {
$result->closeCursor();
$query = $this->db->getQueryBuilder();
$query->delete('videocalls_signalling')
$query->delete('videocalls_signaling')
->where($query->expr()->eq('recipient', $query->createNamedParameter($sessionId)))
->andWhere($query->expr()->lte('timestamp', $query->createNamedParameter($time)));
$query->execute();

2
tests/integration/spreedcheats/lib/Controller/ApiController.php

@ -51,7 +51,7 @@ class ApiController extends OCSController {
public function resetSpreed() {
$query = $this->db->getQueryBuilder();
$query->delete('videocalls_signalling')->execute();
$query->delete('videocalls_signaling')->execute();
$query = $this->db->getQueryBuilder();
$query->delete('spreedme_rooms')->execute();

Loading…
Cancel
Save