Fix type issues
This commit is contained in:
parent
85edda3a4d
commit
bad7a0f67c
|
@ -6,11 +6,13 @@
|
||||||
<path value="//wsl$/Ubuntu-20.04/usr/share/php" />
|
<path value="//wsl$/Ubuntu-20.04/usr/share/php" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/includes" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/includes" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.tdlib==1.0.1.3" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.tdlib==1.0.1.3" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.telegram_client_manager==2.0.0.6" />
|
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.background_worker==1.0.2.6" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.background_worker==1.0.2.6" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.msqg==1.0.0.2" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.msqg==1.0.0.2" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.verbose_adventure==1.0.0.4" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.verbose_adventure==1.0.0.4" />
|
||||||
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.acm2==1.0.0.2" />
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.acm2==1.0.0.2" />
|
||||||
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.pop==1.0.0.2" />
|
||||||
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.synical==1.0.0.0" />
|
||||||
|
<path value="//wsl$/Ubuntu-20.04/etc/ppm/packages/net.intellivoid.telegram_client_manager==2.0.1.0" />
|
||||||
</include_path>
|
</include_path>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpInterpreters">
|
<component name="PhpInterpreters">
|
||||||
|
@ -88,7 +90,7 @@
|
||||||
</interpreter>
|
</interpreter>
|
||||||
</phpInfoCache>
|
</phpInfoCache>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.1">
|
<component name="PhpProjectSharedConfiguration" php_language_level="8.0">
|
||||||
<option name="suggestChangeDefaultLanguageLevel" value="false" />
|
<option name="suggestChangeDefaultLanguageLevel" value="false" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
6
Makefile
6
Makefile
|
@ -13,12 +13,12 @@ build:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
# Installs the compiled package to the system
|
# Installs the compiled package to the system
|
||||||
ppm --fix-conflict --no-prompt --install="build/net.intellivoid.synical_bot.ppm" --branch="production"
|
ppm --fix-conflict --no-prompt --install="build/net.intellivoid.synical_bot.ppm" --branch="master"
|
||||||
|
|
||||||
install_fast:
|
install_fast:
|
||||||
# Installs the compiled package to the system
|
# Installs the compiled package to the system
|
||||||
ppm --fix-conflict --no-prompt --skip-dependencies --install="build/net.intellivoid.synical_bot.ppm" --branch="production"
|
ppm --fix-conflict --no-prompt --skip-dependencies --install="build/net.intellivoid.synical_bot.ppm" --branch="master"
|
||||||
|
|
||||||
run:
|
run:
|
||||||
# Runs the bot
|
# Runs the bot
|
||||||
ppm --main="net.intellivoid.synical_bot" --version="latest"
|
ppm --main="net.intellivoid.synical_bot" --version="latest"
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
return Request::emptyResponse();
|
return Request::emptyResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
|
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
|
||||||
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
||||||
{
|
{
|
||||||
return Request::sendMessage([
|
return Request::sendMessage([
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
return Request::emptyResponse();
|
return Request::emptyResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
|
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
|
||||||
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
||||||
{
|
{
|
||||||
return Request::sendMessage([
|
return Request::sendMessage([
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$TargetPermissions = $ChatMemberCache->getAdministratorUser($TargetUser->User->ID);
|
$TargetPermissions = $ChatMemberCache->getAdministratorUser($TargetUser->User);
|
||||||
if($TargetPermissions !== null)
|
if($TargetPermissions !== null)
|
||||||
{
|
{
|
||||||
if($TargetPermissions->IsOwner)
|
if($TargetPermissions->IsOwner)
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
return Request::emptyResponse();
|
return Request::emptyResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom()->getId());
|
$CallerPermissions = $ChatMemberCache->getAdministratorUser($this->getMessage()->getFrom());
|
||||||
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
if($CallerPermissions == null || $CallerPermissions->CanRestrictMembers == false)
|
||||||
{
|
{
|
||||||
return Request::sendMessage([
|
return Request::sendMessage([
|
||||||
|
|
|
@ -89,7 +89,11 @@
|
||||||
"components": [
|
"components": [
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"file": "SynicalBot.php"
|
"file": "AdminCommands/AdminCacheCommand.php"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"file": "AdminCommands/BanCommand.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
|
@ -101,15 +105,11 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"file": "AdminCommands/BanCommand.php"
|
"file": "commands/InfoCommand.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"file": "AdminCommands/AdminCacheCommand.php"
|
"file": "commands/StartCommand.php"
|
||||||
},
|
|
||||||
{
|
|
||||||
"required": true,
|
|
||||||
"file": "SynicalBot/Utilities.php"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
|
@ -117,17 +117,17 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"file": "commands/InfoCommand.php"
|
"file": "SynicalBot/Utilities.php"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"file": "commands/StartCommand.php"
|
"file": "SynicalBot.php"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"files": [
|
"files": [
|
||||||
"package.json",
|
|
||||||
"worker",
|
|
||||||
".htaccess",
|
".htaccess",
|
||||||
"main"
|
"main",
|
||||||
|
"package.json",
|
||||||
|
"worker"
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
Reference in New Issue