Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mynaparrot/plugNmeet-Joomla
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.1
Choose a base ref
...
head repository: mynaparrot/plugNmeet-Joomla
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.2
Choose a head ref
  • 1 commit
  • 19 files changed
  • 1 contributor

Commits on Oct 19, 2022

  1. bump version of

    jibon57 committed Oct 19, 2022
    Copy the full SHA
    f4a6f46 View commit details
Showing with 136 additions and 76 deletions.
  1. BIN JCB-file/JCB_plugnmeet.zip
  2. +1 −1 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/composer.json
  3. +19 −19 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/composer.lock
  4. +19 −4 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/PlugNmeet.php
  5. +2 −2 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Responses/ClientFilesResponses.php
  6. +5 −5 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Responses/FetchRecordingsResponse.php
  7. +4 −1 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Responses/GenerateJoinTokenResponse.php
  8. +11 −5 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Responses/GetActiveRoomInfoResponse.php
  9. +5 −3 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Responses/GetActiveRoomsInfoResponse.php
  10. +12 −9 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/src/Utils/ActiveRoomInfo.php
  11. +16 −3 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/vendor/autoload.php
  12. +7 −7 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/vendor/composer/autoload_real.php
  13. +4 −4 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/vendor/composer/autoload_static.php
  14. +4 −4 com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/vendor/composer/installed.php
  15. +5 −5 com_plugnmeet/admin/sql/install.mysql.utf8.sql
  16. +1 −0 com_plugnmeet/admin/sql/updates/mysql/1.1.1.sql
  17. +3 −3 com_plugnmeet/plugnmeet.xml
  18. +1 −1 com_plugnmeet/script.php
  19. +17 −0 com_plugnmeet/update.xml
Binary file modified JCB-file/JCB_plugnmeet.zip
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"description": "plugNmeet PHP SDK",
"type": "library",
"license": "MIT",
"version": "1.1.1",
"version": "1.1.5",
"autoload": {
"psr-4": {
"Mynaparrot\\Plugnmeet\\": "src/"
38 changes: 19 additions & 19 deletions com_plugnmeet/admin/helpers/libs/plugnmeet-sdk-php/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -24,16 +24,17 @@

namespace Mynaparrot\Plugnmeet;

use Exception;
use Firebase\JWT\JWT;
use Firebase\JWT\Key;
use Mynaparrot\Plugnmeet\Parameters\CreateRoomParameters;
use Mynaparrot\Plugnmeet\Parameters\DeleteRecordingParameters;
use Mynaparrot\Plugnmeet\Parameters\EndRoomParameters;
use Mynaparrot\Plugnmeet\Parameters\FetchRecordingsParameters;
use Mynaparrot\Plugnmeet\Parameters\GenerateJoinTokenParameters;
use Mynaparrot\Plugnmeet\Parameters\RecordingDownloadTokenParameters;
use Mynaparrot\Plugnmeet\Parameters\GetActiveRoomInfoParameters;
use Mynaparrot\Plugnmeet\Parameters\IsRoomActiveParameters;
use Mynaparrot\Plugnmeet\Parameters\RecordingDownloadTokenParameters;
use Mynaparrot\Plugnmeet\Responses\ClientFilesResponses;
use Mynaparrot\Plugnmeet\Responses\CreateRoomResponse;
use Mynaparrot\Plugnmeet\Responses\DeleteRecordingResponse;
@@ -45,6 +46,7 @@
use Mynaparrot\Plugnmeet\Responses\IsRoomActiveResponse;
use Mynaparrot\Plugnmeet\Responses\RecordingDownloadTokenResponse;
use Ramsey\Uuid\Uuid;
use stdClass;

/**
*
@@ -255,7 +257,7 @@ public function getUUID()
*/
protected function sendRequest($path, array $body)
{
$output = new \stdClass();
$output = new stdClass();
$output->status = false;

$fields = json_encode($body);
@@ -281,16 +283,29 @@ protected function sendRequest($path, array $body)
$result = curl_exec($ch);
$error = curl_error($ch);
$errno = curl_errno($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);

$response = "";
if (!empty($result)) {
$response = json_decode($result);
}

if (0 !== $errno) {
$output->response = "Error: " . $error;
return $output;
} elseif ((int)$httpCode !== 200) {
if (isset($response->msg)) {
$output->response = $response->msg;
} else {
$output->response = "HTTP response error code: " . $httpCode;
}
return $output;
}

$output->status = true;
$output->response = json_decode($result);
} catch (\Exception $e) {
$output->response = $response;
} catch (Exception $e) {
$output->response = "Exception: " . $e->getMessage();
}

Original file line number Diff line number Diff line change
@@ -30,15 +30,15 @@
class ClientFilesResponses extends BaseResponse
{
/**
* @return array|null
* @return array<string>|null
*/
public function getCSSFiles(): ?array
{
return $this->rawResponse->css;
}

/**
* @return array|null
* @return array<string>|null
*/
public function getJSFiles(): ?array
{
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ class FetchRecordingsResponse extends BaseResponse
*/
public function getTotalRecordings(): int
{
if (!isset($this->rawResponse->result)) {
if (!isset($this->rawResponse->result->total_recordings)) {
return 0;
}
return $this->rawResponse->result->total_recordings;
@@ -47,7 +47,7 @@ public function getTotalRecordings(): int
*/
public function getFrom(): int
{
if (!isset($this->rawResponse->result)) {
if (!isset($this->rawResponse->result->from)) {
return 0;
}
return $this->rawResponse->result->from;
@@ -58,7 +58,7 @@ public function getFrom(): int
*/
public function getLimit(): int
{
if (!isset($this->rawResponse->result)) {
if (!isset($this->rawResponse->result->limit)) {
return 20;
}
return $this->rawResponse->result->limit;
@@ -69,14 +69,14 @@ public function getLimit(): int
*/
public function getOrderBy(): string
{
if (!isset($this->rawResponse->result)) {
if (!isset($this->rawResponse->result->order_by)) {
return "DESC";
}
return $this->rawResponse->result->order_by;
}

/**
* @return RecordingInfo []
* @return RecordingInfo[]
*/
public function getRecordings(): array
{
Original file line number Diff line number Diff line change
@@ -34,6 +34,9 @@ class GenerateJoinTokenResponse extends BaseResponse
*/
public function getToken(): string
{
return $this->rawResponse->token ?? "";
if (!isset($this->rawResponse->token)) {
return "";
}
return $this->rawResponse->token;
}
}
Original file line number Diff line number Diff line change
@@ -33,21 +33,27 @@
class GetActiveRoomInfoResponse extends BaseResponse
{
/**
* @return ActiveRoomInfo
* @return ActiveRoomInfo|null
*/
public function getActiveRoomInfo(): ActiveRoomInfo
public function getActiveRoomInfo(): ?ActiveRoomInfo
{
return new ActiveRoomInfo($this->rawResponse->room->room_info);
if (isset($this->rawResponse->room->room_info)) {
return new ActiveRoomInfo($this->rawResponse->room->room_info);
}
return null;
}

/**
* @return ParticipantInfo []
* @return ParticipantInfo[]
*/
public function getParticipantsInfo(): array
{
$participants = [];

if (count($this->rawResponse->room->participants_info) > 0) {
if (
isset($this->rawResponse->room->participants_info) &&
count($this->rawResponse->room->participants_info) > 0
) {
foreach ($this->rawResponse->room->participants_info as $participant) {
$participants[] = new ParticipantInfo($participant);
}
Original file line number Diff line number Diff line change
@@ -24,13 +24,15 @@

namespace Mynaparrot\Plugnmeet\Responses;

use stdClass;

/**
*
*/
class GetActiveRoomsInfoResponse extends BaseResponse
{
/**
* @return GetActiveRoomInfoResponse []
* @return GetActiveRoomInfoResponse[]
*/
public function getRooms(): array
{
@@ -41,10 +43,10 @@ public function getRooms(): array

if (count($this->rawResponse->rooms) > 0) {
foreach ($this->rawResponse->rooms as $room) {
$response = new \stdClass();
$response = new stdClass();
$response->room = $room;

$output = new \stdClass();
$output = new stdClass();
$output->status = true;
$output->response = $response;

Original file line number Diff line number Diff line change
@@ -71,37 +71,40 @@ public function getRoomSid(): string
*/
public function getJoinedParticipants(): int
{
return $this->roomInfo->joined_participants;
if (isset($this->roomInfo->joined_participants)) {
return $this->roomInfo->joined_participants;
}
return 0;
}

/**
* @return bool
*/
public function isRunning(): bool
{
return $this->roomInfo->is_running;
return $this->roomInfo->is_running === 1 ? true : false;
}

/**
* @return bool
*/
public function isActiveRecording(): bool
{
return $this->roomInfo->is_recording;
return $this->roomInfo->is_recording === 1 ? true : false;
}

/**
* @return bool
*/
public function isActiveRTMP(): bool
{
return $this->roomInfo->is_active_rtmp;
return $this->roomInfo->is_active_rtmp === 1 ? true : false;
}

/**
* @return string
* @return string|null
*/
public function getWebhookUrl(): string
public function getWebhookUrl(): ?string
{
return $this->roomInfo->webhook_url;
}
@@ -111,13 +114,13 @@ public function getWebhookUrl(): string
*/
public function isBreakoutRoom(): bool
{
return $this->roomInfo->is_breakout_room;
return $this->roomInfo->is_breakout_room === 1 ? true : false;
}

/**
* @return string
* @return string|null
*/
public function getParentRoomId(): string
public function getParentRoomId(): ?string
{
return $this->roomInfo->parent_room_id;
}
Loading