Clean up

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "docs"]
 	path = docs
 	url = https://github.com/danog/MadelineProtoDocs
-[submodule "userbots/magnaluna"]
-	path = userbots/magnaluna
-	url = https://github.com/danog/magnaluna

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at daniil@daniil.jt. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at daniil@daniil.it. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

README.md

@@ -511,12 +511,10 @@ Tip: if you receive an error (or nothing), [send us](https://t.me/pwrtelegramgro
 ## Very complex and complete examples
 
 You can find examples for nearly every MadelineProto function in
+* [magnaluna webradio](https://magna.madelineproto.xyz) - Multifeatured Telegram VoIP webradio
 * [`tests/testing.php`](https://github.com/danog/MadelineProto/blob/master/tests/testing.php) - examples for making/receiving calls, making secret chats, sending secret chat messages, videos, audios, voice recordings, gifs, stickers, photos, sending normal messages, videos, audios, voice recordings, gifs, stickers, photos.
-* [`bot.php`](https://github.com/danog/MadelineProto/blob/master/bot.php) - examples for sending normal messages, downloading any media
-* [`secret_bot.php`](https://github.com/danog/MadelineProto/blob/master/secret_bot.php) - secret chat bot
-* [`magna.php`](https://github.com/danog/MadelineProto/blob/master/magna.php) - examples for receiving calls
-* [`userbots/pipesbot.php`](https://github.com/danog/MadelineProto/blob/master/userbots/pipesbot.php) - examples for creating inline bots and using other inline bots via a userbot
-* [`userbots/MadelineProto_bot.php`](https://github.com/danog/MadelineProto/blob/master/userbots/MadelineProto_bot.php) - Multi-function bot
-* [`userbots/pwrtelegram_debug_bot`](https://github.com/danog/MadelineProto/blob/master/userbots/pwrtelegram_debug_bot.php) - Multi-function bot
+* [`bot.php`](https://github.com/danog/MadelineProto/blob/master/examples/bot.php) - examples for sending normal messages, downloading any media
+* [`secret_bot.php`](https://github.com/danog/MadelineProto/blob/master/examples/secret_bot.php) - secret chat bot
+* [`pipesbot.php`](https://github.com/danog/MadelineProto/blob/master/examples/pipesbot.php) - examples for creating inline bots and using other inline bots via a userbot
 
 

bot.php

@@ -0,0 +1 @@
+examples/bot.php

examples/bot.php

@@ -0,0 +1,95 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Example bot.
+ *
+ * Copyright 2016-2019 Daniil Gentili
+ * (https://daniil.it)
+ * This file is part of MadelineProto.
+ * MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with MadelineProto.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author    Daniil Gentili <daniil@daniil.it>
+ * @copyright 2016-2019 Daniil Gentili <daniil@daniil.it>
+ * @license   https://opensource.org/licenses/AGPL-3.0 AGPLv3
+ *
+ * @link      https://docs.madelineproto.xyz MadelineProto documentation
+ */
+
+ /*
+ * Various ways to load MadelineProto
+ */
+if (\file_exists(__DIR__.'/vendor/autoload.php')) {
+    include 'vendor/autoload.php';
+} else {
+    if (!\file_exists('madeline.php')) {
+        \copy('https://phar.madelineproto.xyz/madeline.php', 'madeline.php');
+    }
+    include 'madeline.php';
+}
+
+/**
+ * Event handler class.
+ */
+class EventHandler extends \danog\MadelineProto\EventHandler
+{
+    public function onUpdateNewChannelMessage($update)
+    {
+        yield $this->onUpdateNewMessage($update);
+    }
+    public function onUpdateNewMessage($update)
+    {
+        if (isset($update['message']['out']) && $update['message']['out']) {
+            return;
+        }
+        if ($update['_'] === 'updateReadChannelOutbox') {
+            return;
+        }
+        if (isset($update['message']['_']) && $update['message']['_'] === 'messageEmpty') {
+            return;
+        }
+        $res = \json_encode($update, JSON_PRETTY_PRINT);
+
+        try {
+            yield $this->messages->sendMessage(['peer' => $update, 'message' => "<code>$res</code>", 'reply_to_msg_id' => isset($update['message']['id']) ? $update['message']['id'] : null, 'parse_mode' => 'HTML']);
+            if (isset($update['message']['media']) && $update['message']['media']['_'] !== 'messageMediaGame') {
+                yield $this->messages->sendMedia(['peer' => $update, 'message' => $update['message']['message'], 'media' => $update]);
+                /*    '_' => 'inputMediaUploadedDocument',
+                    'file' => $update,
+                    'attributes' => [
+                        ['_' => 'documentAttributeFilename', 'file_name' => 'document.txt']
+                    ]
+                ],]);*/
+                //yield $this->download_to_dir($update, '/tmp');
+            }
+        } catch (\danog\MadelineProto\RPCErrorException $e) {
+            $this->logger((string) $e, \danog\MadelineProto\Logger::FATAL_ERROR);
+        } catch (\danog\MadelineProto\Exception $e) {
+            if (\stripos($e->getMessage(), 'invalid constructor given') === false) {
+                $this->logger((string) $e, \danog\MadelineProto\Logger::FATAL_ERROR);
+            }
+            //$this->messages->sendMessage(['peer' => '@danogentili', 'message' => $e->getCode().': '.$e->getMessage().PHP_EOL.$e->getTraceAsString()]);
+        }
+    }
+}
+$settings = [
+    'logger' => [
+        'logger_level' => 5
+    ],
+    'serialization' => [
+        'serialization_interval' => 30,
+        'cleanup_before_serialization' => true
+    ],
+];
+
+$MadelineProto = new \danog\MadelineProto\API('bot.madeline', $settings);
+$MadelineProto->async(true);
+$MadelineProto->loop(function () use ($MadelineProto) {
+    yield $MadelineProto->start();
+    yield $MadelineProto->setEventHandler('\EventHandler');
+});
+
+$MadelineProto->loop();

combined_bot.php → examples/combined_bot.php

@@ -1,33 +1,48 @@
 #!/usr/bin/env php
 <?php
-/*
-Copyright 2016-2019 Daniil Gentili
-(https://daniil.it)
-This file is part of MadelineProto.
-MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU Affero General Public License for more details.
-You should have received a copy of the GNU General Public License along with MadelineProto.
-If not, see <http://www.gnu.org/licenses/>.
-*/
+/**
+ * Example combined event handler bot.
+ *
+ * Copyright 2016-2019 Daniil Gentili
+ * (https://daniil.it)
+ * This file is part of MadelineProto.
+ * MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with MadelineProto.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author    Daniil Gentili <daniil@daniil.it>
+ * @copyright 2016-2019 Daniil Gentili <daniil@daniil.it>
+ * @license   https://opensource.org/licenses/AGPL-3.0 AGPLv3
+ *
+ * @link https://docs.madelineproto.xyz MadelineProto documentation
+ */
+
 \set_include_path(\get_include_path().':'.\realpath(\dirname(__FILE__).'/MadelineProto/'));
 
 /*
  * Various ways to load MadelineProto
  */
-if (!\file_exists(__DIR__.'/vendor/autoload.php')) {
-    echo 'You did not run composer update, using madeline.php'.PHP_EOL;
+if (\file_exists(__DIR__.'/vendor/autoload.php')) {
+    include 'vendor/autoload.php';
+} else {
     if (!\file_exists('madeline.php')) {
         \copy('https://phar.madelineproto.xyz/madeline.php', 'madeline.php');
     }
     include 'madeline.php';
-} else {
-    require_once 'vendor/autoload.php';
 }
 
+/**
+ * Combined event handler class.
+ */
 class EventHandler extends \danog\MadelineProto\CombinedEventHandler
 {
-    public function onAny($update, $path)
+    public function onUpdateNewChannelMessage($update, $path)
+    {
+        yield $this->onUpdateNewMessage($update, $path);
+    }
+    public function onUpdateNewMessage($update, $path)
     {
         if (isset($update['message']['out']) && $update['message']['out']) {
             return;

examples/index.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Example script.
+ *
+ * Copyright 2016-2019 Daniil Gentili
+ * (https://daniil.it)
+ * This file is part of MadelineProto.
+ * MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with MadelineProto.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author    Daniil Gentili <daniil@daniil.it>
+ * @copyright 2016-2019 Daniil Gentili <daniil@daniil.it>
+ * @license   https://opensource.org/licenses/AGPL-3.0 AGPLv3
+ *
+ * @link      https://docs.madelineproto.xyz MadelineProto documentation
+ */
+
+require 'vendor/autoload.php';
+
+$MadelineProto = new \danog\MadelineProto\API('session.madeline');
+$me = $MadelineProto->start();
+
+$me = $MadelineProto->get_self();
+
+\danog\MadelineProto\Logger::log($me);
+
+if (!$me['bot']) {
+    $MadelineProto->messages->sendMessage(['peer' => '@danogentili', 'message' => "Hi!\nThanks for creating MadelineProto! <3"]);
+    $MadelineProto->channels->joinChannel(['channel' => '@MadelineProto']);
+
+    try {
+        $MadelineProto->messages->importChatInvite(['hash' => 'https://t.me/joinchat/Bgrajz6K-aJKu0IpGsLpBg']);
+    } catch (\danog\MadelineProto\RPCErrorException $e) {
+    }
+
+    $MadelineProto->messages->sendMessage(['peer' => 'https://t.me/joinchat/Bgrajz6K-aJKu0IpGsLpBg', 'message' => 'Testing MadelineProto!']);
+}
+echo 'OK, done!'.PHP_EOL;

examples/mtproxyd

@@ -0,0 +1,52 @@
+#!/usr/bin/env php
+<?php
+$debug = false; // Set this to true to avoid automatic updates of this script
+/**
+ * MTProxy.
+ *
+ * Copyright 2016-2019 Daniil Gentili
+ * (https://daniil.it)
+ * This file is part of MadelineProto.
+ * MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with MadelineProto.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author    Daniil Gentili <daniil@daniil.it>
+ * @copyright 2016-2019 Daniil Gentili <daniil@daniil.it>
+ * @license   https://opensource.org/licenses/AGPL-3.0 AGPLv3
+ *
+ * @link      https://docs.madelineproto.xyz MadelineProto documentation
+ */
+
+
+
+
+echo "mtproxyd - Copyright by Daniil Gentili, licensed under AGPLv3\n\n";
+if (!isset($argv[2])) {
+    echo "Usage: ".$argv[0]." seed port\n\nseed is any string or word that will be used as seed to generate the proxy secret\nport is the port where to start listening for connections\n";
+    exit(1);
+}
+
+if (!\file_exists('madeline.php')) {
+    \copy('https://phar.madelineproto.xyz/madeline.php', 'madeline.php');
+}
+
+if (!$debug) {
+    $mtproxyd = \file_get_contents('https://phar.madelineproto.xyz/mtproxyd?v=new');
+    if ($mtproxyd) {
+        \file_put_contents($argv[0], $mtproxyd);
+    }
+}
+
+\define('MADELINE_BRANCH', 'deprecated');
+require_once 'madeline.php';
+
+$secret = \md5($argv[1]);
+echo "Secret is $secret\n";
+
+$MadelineProto = new \danog\MadelineProto\API('proxy.madeline');
+$MadelineProto->parse_dc_options($MadelineProto->help->getConfig()['dc_options']);
+$handler = new \danog\MadelineProto\Server(['type' => AF_INET, 'protocol' => 0, 'address' => '0.0.0.0', 'port' => $argv[2], 'handler' => '\danog\MadelineProto\Server\Proxy', 'extra' => ['madeline' => $MadelineProto->API->datacenter->sockets, 'secret' => \hex2bin($secret), 'timeout' => 10]]);
+$handler->start();