Aroltd/nabucco-server
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated to newer Ratchet and also fixed some explosions.

Browse source
This commit is contained in:
flash 2023-12-02 03:07:27 +00:00
parent c1710d2c2b
commit 4dce69a63b
6 changed files with 817 additions and 434 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composer.json
View file

@ -1,5 +1,8 @@
{ {
"require": { "require": {
"cboden/ratchet": "0.3.*" "cboden/ratchet": "^0.4.4"
},
"require-dev": {
"phpstan/phpstan": "^1.10"
} }
} }

1219
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
lib/db.php
View file

@ -236,7 +236,7 @@ class Database {
Database::$statements["logstore"]["uname"] = $user->username; Database::$statements["logstore"]["uname"] = $user->username;
Database::$statements["logstore"]["color"] = $user->color; Database::$statements["logstore"]["color"] = $user->color;
Database::$statements["logstore"]["chan"] = $chan == null ? $user->channel : $chan; Database::$statements["logstore"]["chan"] = $chan == null ? $user->channel : $chan;
Database::$statements["logstore"]["chrank"] = $chan[0] == "@" ? 0 : Context::GetChannel($user->channel)->permissionLevel; Database::$statements["logstore"]["chrank"] = $chan[0] == "@" ? 0 : Context::GetChannel($user->channel)->permissionLevel ?? 0;
Database::$statements["logstore"]["msg"] = $msg; Database::$statements["logstore"]["msg"] = $msg;
Database::$statements["logstore"]["flags"] = substr($flags, 0, 4) ."0"; Database::$statements["logstore"]["flags"] = substr($flags, 0, 4) ."0";
Database::Execute("logstore"); Database::Execute("logstore");

13
lib/mods.php
View file

@ -10,13 +10,14 @@ class Modules {
$mods = glob("./mods/*", GLOB_ONLYDIR); $mods = glob("./mods/*", GLOB_ONLYDIR);
foreach($mods as $mod) { foreach($mods as $mod) {
$name = substr($mod, strrpos($mod, "/")+1); $name = substr($mod, strrpos($mod, "/")+1);
if(file_exists("{$mod}/{$name}.php")) { $fileName = "{$mod}/{$name}.php";
include("{$mod}/{$name}.php"); if(file_exists($fileName)) {
if(class_exists("\\sockchat\\mods\\{$name}\\Main")) { include($fileName);
$className = "\\sockchat\\mods\\{$name}\\Main";
if(class_exists($className)) {
Modules::$mods[$name] = $name; Modules::$mods[$name] = $name;
call_user_func([$className, 'Init']);
$cmds = call_user_func_array("\\sockchat\\mods\\{$name}\\Main::Init", []); $cmds = call_user_func([$className, 'GetCommands']);
$cmds = call_user_func_array("\\sockchat\\mods\\{$name}\\Main::GetCommands", []);
foreach($cmds as $cmd) { foreach($cmds as $cmd) {
if(array_key_exists($cmd, self::$cmds)) if(array_key_exists($cmd, self::$cmds))
echo "Error loading module $name: Command $cmd has already been defined by module ". self::$cmds[$cmd] ."!\n"; echo "Error loading module $name: Command $cmd has already been defined by module ". self::$cmds[$cmd] ."!\n";

4
mods/core/core.php
View file

@ -1,6 +1,6 @@
<?php <?php
namespace sockchat\mods\core; namespace sockchat\mods\core;
use \sockchat\mods\GenericMod; use \sockchat\mods\GenericMod;
use \sockchat\Context; use \sockchat\Context;
@ -402,7 +402,7 @@ class Main extends GenericMod {
} }
} }
public static function OnCommandReceive($user, &$cmd, &$args) { public static function OnCommandReceive($user, $cmd, $args) {
/*if(!self::IsSilenced($user) || (self::IsSilenced($user) && in_array($cmd, self::$allowedCmds))) { /*if(!self::IsSilenced($user) || (self::IsSilenced($user) && in_array($cmd, self::$allowedCmds))) {
if($cmd == "afk") { if($cmd == "afk") {
$val = isset($args[0]) ? strtoupper(mb_substr($args[0], 0, self::$maxAfkTagLength)) : "AFK"; $val = isset($args[0]) ? strtoupper(mb_substr($args[0], 0, self::$maxAfkTagLength)) : "AFK";

8
server.php
View file

@ -37,12 +37,12 @@ class Chat implements MessageComponentInterface {
} }
public function onOpen(ConnectionInterface $conn) { public function onOpen(ConnectionInterface $conn) {
$conn->remoteAddress = $conn->WebSocket->request->getHeader('X-Real-IP') ?? $conn->remoteAddress; $conn->remoteAddress = $conn->httpRequest->getHeader('X-Real-IP')[0] ?? $conn->remoteAddress;
Context::CheckPings(); Context::CheckPings();
} }
public function onMessage(ConnectionInterface $conn, $msg) { public function onMessage(ConnectionInterface $conn, $msg) {
$conn->remoteAddress = $conn->WebSocket->request->getHeader('X-Real-IP') ?? $conn->remoteAddress; $conn->remoteAddress = $conn->httpRequest->getHeader('X-Real-IP')[0] ?? $conn->remoteAddress;
Context::CheckPings(); Context::CheckPings();
if(true) { if(true) {
$parts = explode(Utils::$separator, $msg); $parts = explode(Utils::$separator, $msg);
@ -128,7 +128,7 @@ class Chat implements MessageComponentInterface {
} }
public function onClose(ConnectionInterface $conn) { public function onClose(ConnectionInterface $conn) {
$conn->remoteAddress = $conn->WebSocket->request->getHeader('X-Real-IP') ?? $conn->remoteAddress; $conn->remoteAddress = $conn->httpRequest->getHeader('X-Real-IP')[0] ?? $conn->remoteAddress;
echo $conn->remoteAddress ." has disconnected\n"; echo $conn->remoteAddress ." has disconnected\n";
foreach(Context::$onlineUsers as $user) { foreach(Context::$onlineUsers as $user) {
if($user->sock == $conn) { if($user->sock == $conn) {
@ -141,7 +141,7 @@ class Chat implements MessageComponentInterface {
} }
public function onError(ConnectionInterface $conn, \Exception $err) { public function onError(ConnectionInterface $conn, \Exception $err) {
$conn->remoteAddress = $conn->WebSocket->request->getHeader('X-Real-IP') ?? $conn->remoteAddress; $conn->remoteAddress = $conn->httpRequest->getHeader('X-Real-IP')[0] ?? $conn->remoteAddress;
Context::CheckPings(); Context::CheckPings();
echo "Error on ". $conn->remoteAddress .": ". $err ."\n"; echo "Error on ". $conn->remoteAddress .": ". $err ."\n";
} }