Skip to content

Commit

Permalink
add a bunch of new stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
hbashton committed Feb 5, 2017
1 parent fcaa338 commit 22dd320
Show file tree
Hide file tree
Showing 10 changed files with 264 additions and 66 deletions.
28 changes: 18 additions & 10 deletions banhammer.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,19 @@ function banme($update, $MadelineProto, $msg_str)
}
}
if (!isset($sentMessage)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
if (isset($message)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
}
if (isset($kick)) {
\danog\MadelineProto\Logger::log($kick);
}
\danog\MadelineProto\Logger::log($sentMessage);
if (isset($sentMessage)) {
\danog\MadelineProto\Logger::log($sentMessage);
}
}
}

Expand Down Expand Up @@ -439,15 +443,19 @@ function kickhim($update, $MadelineProto, $msg_str)
}
}
if (!isset($sentMessage)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
if (isset($message)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
}
if (isset($kick)) {
\danog\MadelineProto\Logger::log($kick);
\danog\MadelineProto\Logger::log($kickback);
}
\danog\MadelineProto\Logger::log($sentMessage);
if (isset($sentMessage)) {
\danog\MadelineProto\Logger::log($sentMessage);
}
}
}
20 changes: 15 additions & 5 deletions bot.php
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,18 @@
invite_user($update, $MadelineProto, $msg_str);
break;

case 'addadmin':
unset($msg_arr[0]);
$msg_str = implode(" ", $msg_arr);
addadmin($update, $MadelineProto, $msg_str);
break;

case 'rmadmin':
unset($msg_arr[0]);
$msg_str = implode(" ", $msg_arr);
rmadmin($update, $MadelineProto, $msg_str);
break;

case 'setname':
unset($msg_arr[0]);
$msg_str = implode(" ", $msg_arr);
Expand Down Expand Up @@ -365,10 +377,8 @@
switch ($update['update']['message']['action']['_']) {
case 'messageActionChatAddUser':
if ($update['update']['message']['out'] == false) {
$user_id = $MadelineProto->get_info(
$update
['update']['message']['action']['users'][0]
)['User'];
$user_id = $update
['update']['message']['action']['users'][0];
$channelType = $update
['update']['message']['to_id']['_'];
if ($channelType == 'peerChannel'
Expand All @@ -384,7 +394,7 @@
$user_id
);
if ($id[0]) {
$username = id[2];
$username = $id[2];
}
$ch_id = -100 .
$update['update']['message']['to_id']
Expand Down
31 changes: 26 additions & 5 deletions check_msg.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,28 +136,49 @@ function check_flood($update, $MadelineProto)
if (array_key_exists($ch_id, $locked)) {
if (in_array('flood', $locked[$ch_id])) {
if (is_bot_admin($update, $MadelineProto)) {
if (from_admin_mod($update, $MadelineProto)) {
global $flooder;
$flooder['num'] = 0;
$flooder['user'] = $fromid;
}
if (!empty($GLOBALS['flooder'])) {
$flooder = $GLOBALS['flooder'];
if ($fromid == $flooder['user']) {
$id = catch_id(
$update,
$MadelineProto,
$fromid
);
if ($id[0]) {
$username = $id[2];
}
$GLOBALS['flooder']['num'] = $flooder['num'] + 1;
$num = $GLOBALS['flooder']['num'];
if ($num >= $locked[$ch_id]['floodlimit']) {
if (!from_admin_mod($update, $MadelineProto)) {
$kick = $MadelineProto->
channels->kickFromChannel(
['channel' => $peer,
'user_id' => $userid,
'user_id' => $fromid,
'kicked' => true]
);
$message = "Flooding is not allowed here ".
$username;
$mention = [[
'_' => 'inputMessageEntityMentionName',
'offset' => 29,
'length' => strlen($username),
'_' => 'inputMessageEntityMentionName',
'offset' => 29,
'length' => strlen($username),
'user_id' => $fromid]];
if (isset($message)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
\danog\MadelineProto\Logger::log($kick);
\danog\MadelineProto\Logger::log($sentMessage);
if (isset($sentMessage)) {
\danog\MadelineProto\Logger::log($sentMessage);
}
unset($GLOBALS['flooder']);
}
}
Expand Down
7 changes: 4 additions & 3 deletions invite.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
You should have received a copy of the GNU General Public License
along with BruhhBot. If not, see <http://www.gnu.org/licenses/>.
*/

function create_new_supergroup($update, $MadelineProto, $title, $about)
{
if ($update['update']['message']['to_id']['_'] == "peerUser") {
Expand Down Expand Up @@ -92,8 +93,8 @@ function export_new_invite($update, $MadelineProto)
);
\danog\MadelineProto\Logger::log($sentMessage);
} catch (Exception $e) {
$message = "I am not the owner of this chat.
On the bright side, just save the message with my /save command.";
$message = "I am not the owner of this chat. On the bright ".
"side, just save the message with my /save command.";
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
Expand Down Expand Up @@ -213,7 +214,7 @@ function invite_user($update, $MadelineProto, $msg_str)
}
} else {
$message = "Use /invite @username to ".
"invite someone tothis chat!";
"invite someone to this chat!";
$code = [['_' => 'messageEntityItalic', 'offset' => 12,
'length' => 9]];
$sentMessage = $MadelineProto->messages->sendMessage(
Expand Down
17 changes: 14 additions & 3 deletions moderators.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with BruhhBot. If not, see <http://www.gnu.org/licenses/>.
*/
function from_master($update, $MadelineProto)
function from_master($update, $MadelineProto, $str = "", $send = false)
{
if ($MadelineProto->get_info(
$update['update']
Expand All @@ -28,6 +28,17 @@ function from_master($update, $MadelineProto)
) {
return true;
} else {
if ($send) {
$peer = $MadelineProto->get_info($update['update']['message']['to_id'])
['InputPeer'];
$msg_id = $update['update']['message']['id'];
$message = $str;
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
\danog\MadelineProto\Logger::log($sentMessage);
}
return false;
}
}
Expand Down Expand Up @@ -76,7 +87,7 @@ function from_admin($update, $MadelineProto, $str = "", $send = false)
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
\danog\MadelineProto\Logger::log($sentMessage);
\danog\MadelineProto\Logger::log($sentMessage);
}
return false;
}
Expand Down Expand Up @@ -219,7 +230,7 @@ function from_admin_mod($update, $MadelineProto, $str = "", $send = false)

function is_admin_mod($update, $MadelineProto, $userid)
{
if (is_mod($update, $MadelineProto, $userid)
if (is_mod($update, $MadelineProto, $userid)
or is_admin($update, $MadelineProto, $userid)
or is_master($MadelineProto, $userid)
) {
Expand Down
20 changes: 13 additions & 7 deletions promote.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,16 @@ function promoteme($update, $MadelineProto, $msg)
$msg_id, 'message' => $message, 'entities' => $mention]
);
} else {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
if (isset($message)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
}
if (isset($sentMessage)) {
\danog\MadelineProto\Logger::log($sentMessage);
}
\danog\MadelineProto\Logger::log($sentMessage);
}
}

Expand All @@ -104,8 +108,6 @@ function demoteme($update, $MadelineProto, $msg)
if ($id[0]) {
$userid = $id[1];
$username = $id[2];
$mention = [['_' => 'inputMessageEntityMentionName', 'offset' =>
5, 'length' => strlen($username), 'user_id' => $userid]];
if (!file_exists('promoted.json')) {
$json_data = [];
$json_data[$ch_id] = [];
Expand Down Expand Up @@ -137,6 +139,10 @@ function demoteme($update, $MadelineProto, $msg)
$message = "I don't know of anyone called ".$message;
}
}
$mention = [['_' => 'inputMessageEntityMentionName', 'offset' =>
5, 'length' => strlen($username), 'user_id' => $userid], ['_' => 'messageEntityBold',
'offset' => strlen($message) - strlen($title),
'length' => strlen($title) ]];
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message, 'entities' => $mention]
Expand Down
26 changes: 13 additions & 13 deletions save_get.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with BruhhBot. If not, see <http://www.gnu.org/licenses/>.
*/
function saveme($update, $MadelineProto, $msg, $name)
function saveme($update, $MadelineProto, $msg, $name)
{
switch ($update['update']['message']['to_id']['_']) {
case 'peerUser':
Expand All @@ -40,7 +40,7 @@ function saveme($update, $MadelineProto, $msg, $name)
if (isset($cont)) {
$msg_id = $update['update']['message']['id'];
$mods = "Only mods get to save messages. You don't fit that criteria.";
if (isset($peerUSER)
if (isset($peerUSER)
or from_admin_mod($update, $MadelineProto, $mods, true)
) {
if (!empty($name) && !empty($msg)) {
Expand All @@ -64,7 +64,7 @@ function saveme($update, $MadelineProto, $msg, $name)
}
$saved[$ch_id][$name] = $msg;
file_put_contents('saved.json', json_encode($saved));
$message = "Message ".$name." has been saved";
$message = "Message $name has been saved";
$code = [['_' => 'messageEntityBold', 'offset' => 8,
'length' => strlen($name)]];
$sentMessage = $MadelineProto->messages->sendMessage(
Expand All @@ -76,7 +76,7 @@ function saveme($update, $MadelineProto, $msg, $name)
$saved[$ch_id]["from"] = [];
$saved[$ch_id][$name] = $msg;
file_put_contents('saved.json', json_encode($saved));
$message = "Message ".$name." has been saved";
$message = "Message $name has been saved";
$code = [['_' => 'messageEntityBold', 'offset' => 8,
'length' => strlen($name)]];
$sentMessage = $MadelineProto->messages->sendMessage(
Expand All @@ -94,18 +94,18 @@ function saveme($update, $MadelineProto, $msg, $name)
$msg_id, 'message' => $message, 'entities' => $code]
);
}
if (!isset($sentMessage)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
\danog\MadelineProto\Logger::log($sentMessage);
}
if (!isset($sentMessage)) {
$sentMessage = $MadelineProto->messages->sendMessage(
['peer' => $peer, 'reply_to_msg_id' =>
$msg_id, 'message' => $message]
);
}
\danog\MadelineProto\Logger::log($sentMessage);
}
}

function getme($update, $MadelineProto, $name)
function getme($update, $MadelineProto, $name)
{
switch ($update['update']['message']['to_id']['_']) {
case 'peerUser':
Expand Down Expand Up @@ -174,7 +174,7 @@ function getme($update, $MadelineProto, $name)
}
}

function savefrom($update, $MadelineProto, $name)
function savefrom($update, $MadelineProto, $name)
{
switch ($update['update']['message']['to_id']['_']) {
case 'peerUser':
Expand Down
Loading

0 comments on commit 22dd320

Please sign in to comment.