From 5d410ab9944abee0bfc04476c24855f0a0097069 Mon Sep 17 00:00:00 2001 From: Umiko Date: Mon, 5 May 2025 02:50:37 +0700 Subject: [PATCH] Fix user rights to upload file, hopefully... --- bot/TeamTalk/structs.py | 73 ++++++++++++++++++++++++++++++++++++++++- bot/app_vars.py | 4 +-- changelog.txt | 3 ++ 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/bot/TeamTalk/structs.py b/bot/TeamTalk/structs.py index 85532b5..fc6caeb 100644 --- a/bot/TeamTalk/structs.py +++ b/bot/TeamTalk/structs.py @@ -2,6 +2,8 @@ from enum import Enum, Flag import TeamTalkPy +major, minor, patch, build = TeamTalkPy.ttstr(TeamTalkPy.getVersion()).split(".") + class State(Enum): NOT_CONNECTED = 0 @@ -145,7 +147,7 @@ class UserStatusMode(Flag): N = 4096 -class UserRight(Flag): +class UserRightPre15(Flag): Null = TeamTalkPy.UserRight.USERRIGHT_NONE MultiLogin = TeamTalkPy.UserRight.USERRIGHT_MULTI_LOGIN ViewAllUsers = TeamTalkPy.UserRight.USERRIGHT_VIEW_ALL_USERS @@ -172,6 +174,75 @@ class UserRight(Flag): ViewHiddenChannels = TeamTalkPy.UserRight.USERRIGHT_VIEW_HIDDEN_CHANNELS +if major == "5" and minor >= "15": + class UserRight15(Flag): + Null = TeamTalkPy.UserRight.USERRIGHT_NONE + MultiLogin = TeamTalkPy.UserRight.USERRIGHT_MULTI_LOGIN + ViewAllUsers = TeamTalkPy.UserRight.USERRIGHT_VIEW_ALL_USERS + CreateTemporaryChannel = TeamTalkPy.UserRight.USERRIGHT_CREATE_TEMPORARY_CHANNEL + ModifyChannels = TeamTalkPy.UserRight.USERRIGHT_MODIFY_CHANNELS + BroadcastTextMessage = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_BROADCAST + KickUsers = TeamTalkPy.UserRight.USERRIGHT_KICK_USERS + BanUsers = TeamTalkPy.UserRight.USERRIGHT_BAN_USERS + MoveUsers = TeamTalkPy.UserRight.USERRIGHT_MOVE_USERS + OperatorEnable = TeamTalkPy.UserRight.USERRIGHT_OPERATOR_ENABLE + UploadFiles = TeamTalkPy.UserRight.USERRIGHT_UPLOAD_FILES + DownloadFiles = TeamTalkPy.UserRight.USERRIGHT_DOWNLOAD_FILES + UpdateServerProperties = TeamTalkPy.UserRight.USERRIGHT_UPDATE_SERVERPROPERTIES + TransmitVoice = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_VOICE + TransmitVideoCapture = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_VIDEOCAPTURE + TransmitDesktop = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_DESKTOP + TransmitDesktopInput = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_DESKTOPINPUT + TransmitMediaFileAudio = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE_AUDIO + TransmitMediaFileVideo = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE_VIDEO + TransmitMediaFile = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE + LockedNickname = TeamTalkPy.UserRight.USERRIGHT_LOCKED_NICKNAME + LockedStatus = TeamTalkPy.UserRight.USERRIGHT_LOCKED_STATUS + RecordVoice = TeamTalkPy.UserRight.USERRIGHT_RECORD_VOICE + ViewHiddenChannels = TeamTalkPy.UserRight.USERRIGHT_VIEW_HIDDEN_CHANNELS + textMessageUser = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_USER + textMessageChannel = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_CHANNEL + + UserRight = UserRight15 +else: + UserRight = UserRightPre15 + + +class UserRight15(Flag): + Null = TeamTalkPy.UserRight.USERRIGHT_NONE + MultiLogin = TeamTalkPy.UserRight.USERRIGHT_MULTI_LOGIN + ViewAllUsers = TeamTalkPy.UserRight.USERRIGHT_VIEW_ALL_USERS + CreateTemporaryChannel = TeamTalkPy.UserRight.USERRIGHT_CREATE_TEMPORARY_CHANNEL + ModifyChannels = TeamTalkPy.UserRight.USERRIGHT_MODIFY_CHANNELS + BroadcastTextMessage = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_BROADCAST + KickUsers = TeamTalkPy.UserRight.USERRIGHT_KICK_USERS + BanUsers = TeamTalkPy.UserRight.USERRIGHT_BAN_USERS + MoveUsers = TeamTalkPy.UserRight.USERRIGHT_MOVE_USERS + OperatorEnable = TeamTalkPy.UserRight.USERRIGHT_OPERATOR_ENABLE + UploadFiles = TeamTalkPy.UserRight.USERRIGHT_UPLOAD_FILES + DownloadFiles = TeamTalkPy.UserRight.USERRIGHT_DOWNLOAD_FILES + UpdateServerProperties = TeamTalkPy.UserRight.USERRIGHT_UPDATE_SERVERPROPERTIES + TransmitVoice = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_VOICE + TransmitVideoCapture = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_VIDEOCAPTURE + TransmitDesktop = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_DESKTOP + TransmitDesktopInput = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_DESKTOPINPUT + TransmitMediaFileAudio = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE_AUDIO + TransmitMediaFileVideo = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE_VIDEO + TransmitMediaFile = TeamTalkPy.UserRight.USERRIGHT_TRANSMIT_MEDIAFILE + LockedNickname = TeamTalkPy.UserRight.USERRIGHT_LOCKED_NICKNAME + LockedStatus = TeamTalkPy.UserRight.USERRIGHT_LOCKED_STATUS + RecordVoice = TeamTalkPy.UserRight.USERRIGHT_RECORD_VOICE + ViewHiddenChannels = TeamTalkPy.UserRight.USERRIGHT_VIEW_HIDDEN_CHANNELS + textMessageUser = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_USER + textMessageChannel = TeamTalkPy.UserRight.USERRIGHT_TEXTMESSAGE_CHANNEL + + +if major == "5" and minor >= "15": + UserRight = UserRight15 +else: + UserRight = UserRightPre15 + + class UserAccount: def __init__( self, diff --git a/bot/app_vars.py b/bot/app_vars.py index 0111fff..a3b6170 100644 --- a/bot/app_vars.py +++ b/bot/app_vars.py @@ -6,8 +6,8 @@ if TYPE_CHECKING: from bot.translator import Translator app_name = "pandorafox♾" -app_version = "2.3.5" -client_name = app_name + "-V (Version)" + app_version +app_version = "2.3.6" +client_name = app_name + "-Version" + app_version about_text: Callable[[Translator], str] = lambda translator: translator.translate( """\ A media streaming bot for TeamTalk. diff --git a/changelog.txt b/changelog.txt index cbf3c64..d82541a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,7 @@ This change log is written to find out the changes that have been made by Pandora, and the source code still refers to TTMediaBot. +5/5/2025 +Fix user rights to upload file, hopefully... + 5/4/2025 Revamp Dockerfile to fix several issues: •