diff --git a/DefaultConstants.py b/DefaultConstants.py index 2f24940..a45dd4a 100644 --- a/DefaultConstants.py +++ b/DefaultConstants.py @@ -1,4 +1,5 @@ class Constants: + # COPY THIS FILE AND CREATE YOUR OWN VERSION NAMED AppConstants.py THAT WAY YOU CAN PULL CHANGES WITHOUT OVERWRITING SETTINGS TEST_SERVER = False SASSBOT_LOG_LEVEL = 10 # DEBUG = 10, INFO = 20, WARNING = 30, ERROR = 40, CRITICAL = 50 OTHER_LIBRARIES_LOG_LEVEL = 20 # DEBUG = 10, INFO = 20, WARNING = 30, ERROR = 40, CRITICAL = 50 @@ -45,10 +46,6 @@ class Constants: CONFESSION_COMMAND_ID = 1159321755270250571 CONFESS_REVIEW_COMMAND_ID = 1159321755270250570 - KICK_PROXY = "" - FANS_PROXY = "127.0.0.1:8888" - OF_PROXY = "" - KICK_PROXY = "" FANS_PROXY = "172.18.0.2:8888" OF_PROXY = "" @@ -209,13 +206,6 @@ class Constants: scBelowTitleText = f"{streamerName} is now live on StripChat!" epBelowTitleText = f"{streamerName} is now live on ePlay!" - # Icon in this case is the small image that shows in the top left of the imbed before the streamer's name for that platform - # This is used if an avatar/icon can't be found on a platform, otherwise the platform's version will be used - defaultIcon = 'images/errIcon.png' - - # This thumbnail is used if there is no thumbnail for a platform AND there is nothing in the image list - defaultThumbnail = 'images/twitErrImg.jpg' - # Leave empty strings if you want to use default thumbnail behavior; which is: (1)pull thumbnail from platform, (2)if it doesn't exist use image from image list, (3)if list empty use defaultThumbnail # Add your own image path/url if you want to exclusively use the same image over and over for a specific platform's thumbnail # If you want thumbnails to only come from the image list, make the string equal to LIST i.e cbThumbnail = "LIST" . Useful if you don't want NSFW thumbnails in alerts @@ -229,4 +219,16 @@ class Constants: mfcThumbnail = "" bcThumbnail = "" scThumbnail = "" - epThumbnail = "" \ No newline at end of file + epThumbnail = "" + + # Icon in this case is the small image that shows in the top left of the imbed before the streamer's name for that platform + # This is used if an avatar/icon can't be found on a platform, otherwise the platform's version will be used + defaultIcon = 'images/errIcon.png' + + # This thumbnail is used if there is no thumbnail for a platform AND there is nothing in the image list + defaultThumbnail = 'images/twitErrImg.jpg' + + # Calm is default bot avatar, pissed is what it changes to after MIN_TIME_BEFORE_AVATAR_CHANGE has been met + # Make them the same image if you don't want the feature to change anything + calmAvatar = 'images/avatars/calmStreamer.png' + pissedAvatar = 'images/avatars/pissedStreamer.png' \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1d484a3..b422952 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,13 +9,13 @@ services: sassbot: image: ghcr.io/bombg/sassbot:latest #ghcr.io/bombg/sassbot:latest-arm for arm processors i.e. Raspberry Pi volumes: - - /home/bombg/Repos/SassBot/Constants.py:/opt/SassBot/Constants.py + - /home/bombg/Repos/SassBot/Constants.py:/opt/SassBot/AppConstants.py - /home/bombg/Repos/SassBot/secrets:/opt/SassBot/secrets - /home/bombg/Repos/SassBot/sassBot.db:/opt/SassBot/sassBot.db - - /home/bombg/Repos/SassBot/images/errIcon.png:/opt/SassBot/images/errIcon.png - - /home/bombg/Repos/SassBot/images/twitErrImg.jpg:/opt/SassBot/images/twitErrImg.jpg - - /home/bombg/Repos/SassBot/images/avatars/calmStreamer.png:/opt/SassBot/images/avatars/calmStreamer.png - - /home/bombg/Repos/SassBot/images/avatars/pissedStreamer.png:/opt/SassBot/images/avatars/pissedStreamer.png + - /home/bombg/Repos/SassBot/Fae/FaeIcon.png:/opt/SassBot/images/errIcon.png + - /home/bombg/Repos/SassBot/Fae/FaeErr.jpg:/opt/SassBot/images/twitErrImg.jpg + - /home/bombg/Repos/SassBot/Fae/FaeC.png:/opt/SassBot/images/avatars/calmStreamer.png + - /home/bombg/Repos/SassBot/Fae/FaeP.png:/opt/SassBot/images/avatars/pissedStreamer.png restart: unless-stopped # The example below is if you want to look at images nodriver has created for troubleshooting purposes diff --git a/images/avatars/calmStreamer.png b/images/avatars/calmStreamer.png index 15931e8..7ca72dc 100644 Binary files a/images/avatars/calmStreamer.png and b/images/avatars/calmStreamer.png differ diff --git a/images/avatars/pissedStreamer.png b/images/avatars/pissedStreamer.png index 15931e8..5c43230 100644 Binary files a/images/avatars/pissedStreamer.png and b/images/avatars/pissedStreamer.png differ diff --git a/images/errIcon.png b/images/errIcon.png index a6db6d5..095da12 100644 Binary files a/images/errIcon.png and b/images/errIcon.png differ diff --git a/images/twitErrImg.jpg b/images/twitErrImg.jpg index 9407000..1fb1e60 100644 Binary files a/images/twitErrImg.jpg and b/images/twitErrImg.jpg differ diff --git a/plugins/checks.py b/plugins/checks.py index 69cfdf3..4586359 100644 --- a/plugins/checks.py +++ b/plugins/checks.py @@ -183,11 +183,11 @@ async def changeAvatar(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> Non onTime, offTime, totalOnTime = db.getStreamTableValues() hours, minutes = StaticMethods.timeToHoursMinutes(offTime) if online and not globals.normalAvtar: - await rest.edit_my_user(avatar = 'images/avatars/calmStreamer.png') + await rest.edit_my_user(avatar = Constants.calmAvatar) logger.info(f"changed avatar to good {Constants.streamerName}") globals.normalAvtar = True if not online and globals.normalAvtar and hours >= Constants.MIN_TIME_BEFORE_AVATAR_CHANGE and offTime != 0: - await rest.edit_my_user(avatar = 'images/avatars/pissedStreamer.png') + await rest.edit_my_user(avatar = Constants.pissedAvatar) logger.info(f"changed avatar to bad {Constants.streamerName}") globals.normalAvtar = False