danog/magnaluna
1
0
Fork 0
mirror of https://github.com/danog/magnaluna.git synced 2024-11-26 11:34:39 +01:00
Code Issues Projects Releases Wiki Activity

adapt for the latest MadelineProto

Browse Source
This commit is contained in:
Daniil Gentili 2020-03-01 16:30:44 +01:00
parent 7a60660875
commit 323a861a3a
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
composer.json
View File

@ -10,17 +10,8 @@
"issues": "https://github.com/danog/magnaluna/issues"
},
"require": {
"danog/madelineproto": "^4",
"amphp/dns": "dev-master#aa1892bd as 0.9",
"amphp/socket": "0.10.12 as 1",
"amphp/websocket": "dev-master#db2da8c5b3ed22eae37da5ffa10ab3ea8de19342 as 1",
"amphp/websocket-client": "dev-master#aff808025637bd705672338b4904ad03a4dbdc04 as 1"
"danog/madelineproto": "^5"
},
"repositories": [{
"type": "git",
"url": "https://github.com/danog/phpseclib"
}],
"minimum-stability": "dev",
"license": "AGPL-3.0-only",
"require-dev": {
"amphp/php-cs-fixer-config": "dev-master"

32
magna.php
View File

@ -11,7 +11,7 @@
*/
if (\file_exists('vendor/autoload.php')) {
require 'vendor/autoload.php';
require '../MadelineProtoClean/vendor/autoload.php';
} else {
if (!\file_exists('madeline.php')) {
\copy('https://phar.madelineproto.xyz/madeline.php', 'madeline.php');
@ -22,6 +22,9 @@ if (\file_exists('vendor/autoload.php')) {
if (!\file_exists('songs.php')) {
\copy('https://github.com/danog/magnaluna/raw/master/songs.php', 'songs.php');
}
if (!\glob('*.raw')) {
\copy('https://github.com/danog/MadelineProto/raw/deprecated/input.raw', 'input.raw');
}
echo 'Deserializing MadelineProto from session.madeline...'.PHP_EOL;
@ -44,15 +47,19 @@ class MessageLoop extends ResumableSignalLoop
$logger = &$MadelineProto->logger;
while (true) {
while (!isset($this->call->mId)) {
do {
$result = yield $this->waitSignal($this->pause($this->timeout));
if ($result) {
$logger->logger("Got signal in $this, exiting");
return;
}
}
} while (!isset($this->call->mId));
try {
yield $MadelineProto->messages->editMessage(['id' => $this->call->mId, 'peer' => $this->call->getOtherID(), 'message' => 'Total running calls: '.\count(yield $MadelineProto->getEventHandler()->calls).PHP_EOL.PHP_EOL.$this->call->getDebugString()]);
$message = 'Total running calls: '.\count(yield $MadelineProto->getEventHandler()->calls).PHP_EOL.PHP_EOL.$this->call->getDebugString();
$message .= PHP_EOL.PHP_EOL.PHP_EOL;
$message .= "Emojis: ".implode('', $this->call->getVisualization());
yield $MadelineProto->messages->editMessage(['id' => $this->call->mId, 'peer' => $this->call->getOtherID(), 'message' => $message]);
} catch (\danog\MadelineProto\RPCErrorException $e) {
$MadelineProto->logger($e);
}
@ -145,6 +152,15 @@ class PonyEventHandler extends \danog\MadelineProto\EventHandler
}
public function configureCall($call)
{
\danog\MadelineProto\VoIPServerConfig::update(
[
'audio_init_bitrate' => 100 * 1000,
'audio_max_bitrate' => 100 * 1000,
'audio_min_bitrate' => 10 * 1000,
'audio_congestion_window' => 4 * 1024,
]
);
include 'songs.php';
$call->configuration['enable_NS'] = false;
$call->configuration['enable_AGC'] = false;
@ -154,14 +170,18 @@ class PonyEventHandler extends \danog\MadelineProto\EventHandler
$call->parseConfig();
$call->playOnHold($songs);
if ($call->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_INCOMING) {
if ($call->accept() === false) {
if (!$res = yield $call->accept()) {
$this->logger('DID NOT ACCEPT A CALL');
}
}
if ($call->getCallState() !== \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
$this->calls[$call->getOtherID()] = $call;
try {
$call->mId = yield $this->messages->sendMessage(['peer' => $call->getOtherID(), 'message' => 'Total running calls: '.\count($this->calls).PHP_EOL.PHP_EOL.$call->getDebugString()])['id'];
$message = 'Total running calls: '.\count(yield $this->calls).PHP_EOL.PHP_EOL.$call->getDebugString();
//$message .= PHP_EOL;
//$message .= "Emojis: ".implode('', $call->getVisualization());
$call->mId = yield $this->messages->sendMessage(['peer' => $call->getOtherID(), 'message' => $message])['id'];
} catch (\Throwable $e) {
$this->logger($e);
}