19 Commits

Author SHA1 Message Date
91eecb4b0b Fixed channels logic 2023-05-02 16:13:11 +02:00
740c6a1464 Updated version to 2.1 2023-05-02 16:10:32 +02:00
3ca44dcd2d Updated version to 2.0 2023-05-02 15:10:29 +02:00
301439f144 Fixed bot trigger on deafen and mute 2023-05-02 15:09:23 +02:00
3435d59d96 Merge pull request 'Update dependency requests to v2.29.0' (#3) from renovate/requests-2.x into main
Reviewed-on: #3
2023-04-26 23:49:52 +03:00
d560bce8c6 Update dependency requests to v2.29.0 2023-04-26 18:48:15 +03:00
528604b6b4 Made a few dependencies strict 2023-04-23 10:35:27 +02:00
76c7812284 Renamed Renovate config 2023-04-20 13:38:00 +02:00
8e48334cea Merge pull request 'Configure Renovate' (#1) from renovate/configure into main
Reviewed-on: #1
2023-04-20 14:37:19 +03:00
bc9cebbec6 Add renovate.json 2023-04-20 14:13:46 +03:00
a178aa2af9 Merge branch 'main' of https://git.profitroll.eu/profitroll/YusarinBot 2023-04-19 14:27:12 +02:00
fb3e291d77 Sorted imports and removed unused ones 2023-04-19 14:23:41 +02:00
75c1889477 Formatted everything with black 2023-04-19 14:21:39 +02:00
5329b4c727 Bump pycord to 2.4.1 2023-04-19 14:16:32 +02:00
0f3a6121d6 Fixed black badge link 2023-03-22 21:30:45 +01:00
7f1f86ca03 Fixed update checker behavior 2023-03-22 21:26:05 +01:00
c600747848 Bump py-cord to 2.4.1 2023-03-22 21:09:58 +01:00
a2bd55dcdf Updated version to 1.9 2023-03-22 21:09:32 +01:00
98ac531a36 Changed version API requests 2023-03-22 21:09:09 +01:00
6 changed files with 20 additions and 21 deletions

6
.renovaterc Normal file
View File

@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
}

View File

@@ -7,7 +7,7 @@
<a href="https://crowdin.com/project/yusarinbot"> <a href="https://crowdin.com/project/yusarinbot">
<img alt="Crowdin" src="https://badges.crowdin.net/yusarinbot/localized.svg"> <img alt="Crowdin" src="https://badges.crowdin.net/yusarinbot/localized.svg">
</a> </a>
<a href="https://git.end-play.xyz/profitroll/TelegramPoster"> <a href="https://git.end-play.xyz/profitroll/YusarinBot">
<img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"> <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
</a> </a>
<a href="https://discord.com/invite/2zpzErtnNT"> <a href="https://discord.com/invite/2zpzErtnNT">

View File

@@ -42,23 +42,16 @@ class CogChannel(commands.Cog):
vc_to = after.channel vc_to = after.channel
# If user left vc # If user left vc
if vc_to is None: if before.channel is not None and len(before.channel.members) == 0:
if isUserVoice(vc_from): if isUserVoice(vc_from):
if isVoiceOfUser(vc_from, member): if isVoiceOfUser(vc_from, member):
await removeUserVoice(vc_from) await removeUserVoice(vc_from)
return
else: else:
if loadJson("config.json")["enable_nomic"]: if loadJson("config.json")["enable_nomic"]:
await changeNomicPerms("deny", vc_from, member) await changeNomicPerms("deny", vc_from, member)
# If user joined vc # If user joined vc
else: if after.channel is not None and after.channel.id == guildConfGet(member.guild, "channel"):
if isUserVoice(vc_from):
if isVoiceOfUser(vc_from, member):
await removeUserVoice(vc_from)
else:
if loadJson("config.json")["enable_nomic"]:
await changeNomicPerms("deny", vc_from, member)
if isUserVoice(vc_to): if isUserVoice(vc_to):
if loadJson("config.json")["enable_nomic"]: if loadJson("config.json")["enable_nomic"]:
await changeNomicPerms("allow", vc_to, member) await changeNomicPerms("allow", vc_to, member)

View File

@@ -1,2 +1,2 @@
ujson~=5.7.0 ujson==5.7.0
py-cord[speed]~=2.3.2 py-cord[speed]==2.4.1

View File

@@ -1,2 +1,2 @@
py-cord~=2.3.2 py-cord==2.4.1
requests~=2.28.2 requests==2.29.0

View File

@@ -12,7 +12,7 @@ from os import getpid
from functions import * from functions import *
pid = getpid() pid = getpid()
version = 1.8 version = 2.1
if ( if (
loadJson("config.json")["owner"] == "SET-OWNER-ID" loadJson("config.json")["owner"] == "SET-OWNER-ID"
@@ -24,15 +24,15 @@ if (
exit() exit()
if loadJson("config.json")["check_for_updates"]: if loadJson("config.json")["check_for_updates"]:
appendLog(f"Currently using YusarinBot v{str(version)}")
try: try:
serv_ver = loads( releases = get(
get("https://api.end-play.xyz/version?app=yusarinbot&apikey=publickey").text "https://git.end-play.xyz/api/v1/repos/profitroll/YusarinBot/releases?draft=false&pre-release=false&page=1&limit=1"
)["version"] ).json()
if float(serv_ver) > version: if float(releases[0]["tag_name"].replace("v", "")) > version:
appendLog( appendLog(
f"YusarinBot version {serv_ver} is available. Download new version here: https://git.end-play.xyz/profitroll/YusarinBot/releases/latest" f"YusarinBot version {releases[0]['tag_name']} is available. Download new version here: {releases[0]['html_url']}"
) )
appendLog(f"Currently using YusarinBot v{str(version)}")
except Exception as exp: except Exception as exp:
appendLog( appendLog(
f"Could not get YusarinBot cloud version due to {exp}. Currently using {str(version)}" f"Could not get YusarinBot cloud version due to {exp}. Currently using {str(version)}"