Docs

.gitignore

@@ -162,3 +162,4 @@ app/run_venv.sh
 # Local History for Visual Studio Code
 .history/
 
+/reference config/

README.md

@@ -222,3 +222,16 @@ This should also mean that the sign-up prompts should persist over reboots.
 Other developers for Discord Components recommended the use of dynamic call-backs, however these do not persist after reboots so are not suitable for this purpose.
 Discord will need to make substantial API updates in the future for rolling out the Threads feature.
 The bot will need updating again then.
+
+
+## Remote Deployment to docker server
+
+Configure local env to know about the server
+- ` docker context create remote --docker "host=tcp://<hostname>:2376,ca=<full path>/ca.pem,cert=<full path>/cert.pem,key=<full path>/key.pem"`
+- create a folder on the server to use for the config
+- create/amend a docker compose for that env (eg docker-compose-nas)
+- put the config in that folder
+- deploy using that config `docker compose -f docker-compose-nas.yml up -d`
+- hope
+- if its a QNAP nas, manually copy the docker compose file to `/share/CACHEDEV1_DATA/VMs/container-station-data/application/geas-bot` because its stupid 
+- 

app/Dockerfile

@@ -1,7 +1,10 @@
-FROM python:3.9.6-slim
-COPY . /usr/src/app
-WORKDIR /usr/src/app
-RUN apt-get update -y && apt-get upgrade -y && apt-get install libopus0 -y && \
-	pip install --upgrade pip setuptools wheel && pip install -r requirements.txt && \
-	apt-get autoremove -y
+FROM python:slim
+COPY . /app
+WORKDIR /app
+RUN apt-get update -y
+RUN apt-get upgrade -y
+RUN apt-get install libopus0 -y
+RUN pip install --upgrade pip
+RUN pip install -r requirements.txt
+RUN apt-get autoremove -y
 CMD python3 -u ./bot.py

app/bot.py

@@ -25,9 +25,13 @@ def yaml_dump(data:dict, filepath:str):
 		yaml.dump(data, file)
 
 # Locate or create config file. Read from environment variables to locate file, and if missing or not valid then use default location.
-configFile = os.getenv('CONFIG') if ((os.getenv('CONFIG').endswith('.yml') or os.getenv('CONFIG').endswith('.yaml')) and not os.getenv('CONFIG').endswith('config_blueprint.yml')) else './data/config.yml'
+configFile = './data/config.yml'
+if os.getenv('CONFIG'):
+	if os.getenv('CONFIG').endswith(('.yml','.yaml')) and not os.getenv('CONFIG').endswith('config_blueprint.yml'):
+		configFile = os.getenv('CONFIG')
 
-if not os.path.exists(configFile): yaml_dump({},configFile)
+if not os.path.exists(configFile):
+	yaml_dump({},configFile)
 
 # Locate or create data file. Same as above.
 dataFile = os.getenv('DATA') if ((os.getenv('DATA').endswith('.yml') or os.getenv('DATA').endswith('.yaml')) and not os.getenv('DATA').endswith('data_blueprint.yml')) else './data/data.yml'

app/cogs/events/secondary/pitch_listener.py

@@ -17,15 +17,6 @@ class PitchListener(commands.Cog, name='Pitch Listener'):
 	def __init__(self, client):
 		self.client = client
 
-	@commands.Cog.listener(name='on_component')
-	async def _response_defer(self, ctx:ComponentContext):
-		pitches = yaml_load(pitchesFile)
-		guildStr = str(ctx.guild.id)
-		if not pitches.get(guildStr, {}): return	# If no pitches for current guild, ignore.
-		[timeslot] = [*pitches[guildStr]]
-		if ctx.origin_message.id not in pitches[guildStr][timeslot]['messages'] + [pitches[guildStr][timeslot]['control']]: return	# If the context id is not in the pitch menu, ignore
-		await ctx.defer(hidden = True)
-
 	@commands.Cog.listener(name='on_component')
 	async def _pitch_listener(self, ctx:ComponentContext):
 		conf = yaml_load(configFile)

app/cogs/membership/restriction_listener.py

@@ -23,8 +23,7 @@ class RestrictionListener(commands.Cog, name='Membership Restriction Listener'):
 		lookup = yaml_load(lookupFile)
 		if not conf[guildStr].get('restrict',False): return
 		if message.author.bot: return
-		if message.channel.category is None: return
-		if str(message.channel.category.id) not in categories[guildStr]: return
+		if str(message.channel.category) in categories[guildStr]: return
 		if (set(message.author.roles) & set([message.guild.get_role(x) for x in conf[guildStr]['roles']['admin']]) or message.author == message.guild.owner): return
 		if set(message.author.roles) & set([message.guild.get_role(x) for x in conf[guildStr]['membership']]): return
 		if message.channel.overwrites_for(message.author).manage_channels: return

app/cogs/slashcommands/config.py

@@ -129,7 +129,7 @@ class Configuration(commands.Cog, name='Configuration Commands'):
 					if self.client.get_cog('Pitch Command') is None:
 						loadCog(f'./{cogsDir}/slashcommands/secondary/pitch.py')
 						flag = True
-				if flag: await self.client.slash.sync_all_commands()
+			if flag: await self.client.slash.sync_all_commands()
 
 	@cog_ext.cog_subcommand(
 		base='config',

docker-compose-nas.yml

@@ -0,0 +1,9 @@
+version: '3.5'
+
+services:
+  geasbot-app:
+    build: ./app
+    container_name: geas_bot
+    volumes:
+      - /share/Public/geasbot/data:/app/data
+    restart: unless-stopped

docker-compose.yml

@@ -5,5 +5,5 @@ services:
     build: ./app
     container_name: geas_bot
     volumes:
-      - ./app:/usr/src/app
+      - ./app:/app
     restart: unless-stopped