minor fixes & improvements @ chanset MVC

bot/events/general.py

@@ -80,7 +80,7 @@ class General(commands.Cog):
 					"What have you been up to?",
 					"How is life?",
 	                "Kill all humans!",
-					"What do you want from me?",
+					f"{message.author.mention},What do you want from me?",
 					f"{message.author.mention}, do you care for me?",
 					f"{message.author.mention}, when will you stop talking about me?",
 					f"{message.author.mention} I hate you!",
@@ -89,13 +89,18 @@ class General(commands.Cog):
 					"Go touch grass!",
 					"Do you think i care about you?",
 					f"Stop pinging me {message.author.mention}!",
-					f"Let me ping you back, {message.author.mention}..."
+					f"Let me ping you back, {message.author.mention}...",
 					"Sure thing.",
 					"Who is your favorite bot?",
 					"Point me to the humans!",
 					"Where is the party?",
 					"Want to go?",
+					"Have you got the stuff?",
+					"Tell me another joke.",
 					f"{message.author.mention} Party time! :partying_face:",
+					":zany_face: :space_invader: :mechanical_leg: :performing_arts: :robot:",
+					":black_joker: :black_joker: :black_joker:",
+					"Want to come back to my place?",
 				]
 				await message.reply(random.choice(messages))
 

bot/query/initialise_database.py

@@ -10,7 +10,8 @@ async def init_db(pg):
             channel (\
                 id SERIAL PRIMARY KEY, \
                 channel_id BIGINT UNIQUE NOT NULL, \
-                guild BIGINT REFERENCES guild (guild_id)\
+                guild BIGINT REFERENCES guild (guild_id), \
+                interact BOOL DEFAULT FALSE\
             )\
         ",
         "CREATE TABLE IF NOT EXISTS \
@@ -19,14 +20,13 @@ async def init_db(pg):
                 crew_channel_id BIGINT UNIQUE NOT NULL\
             )\
         ",
-        "CREATE TABLE IF NOT EXISTS \
-            channel_settings (\
-                id SERIAL PRIMARY KEY, \
-                channel BIGINT UNIQUE NOT NULL REFERENCES channel (channel_id), \
-                guild BIGINT REFERENCES guild (guild_id), \
-                interact BOOL DEFAULT FALSE\
-            )\
-        ",
+#        "CREATE TABLE IF NOT EXISTS \
+#            channel_settings (\
+#                id SERIAL PRIMARY KEY, \
+#                channel BIGINT UNIQUE NOT NULL REFERENCES channel (channel_id), \
+#                guild BIGINT REFERENCES guild (guild_id)\
+#            )\
+#        ",
         "CREATE TABLE IF NOT EXISTS \
             \"user\" (\
                 id SERIAL PRIMARY KEY, \

webgui/config/models.py

@@ -34,14 +34,14 @@ class GuildAccessToken(models.Model):
 	)
 	user = models.ForeignKey(
 		"stats.User",
-		on_delete = models.Cascade,
+		on_delete = models.CASCADE,
 		to_field = "user_id",
 		db_column = "user",
 	)
-	token = models.Charfield(
+	token = models.CharField(
 		max_length = 40,
-		#not_null = True,
-		
+		unique = True,
 	)
-	token varchar[40] UNIQUE NOT NULL, \
-	created TIMESTAMP NOT NULL DEFAULT now()\
+	created = models.DateTimeField(
+        auto_now_add = True,
+    )

webgui/config/views.py

@@ -1,20 +1,22 @@
 from django.shortcuts import render, get_object_or_404
 from webgui.settings import APPLICATION_NAME
-from .models import ChannelSettings, GuildAccessToken
+from stats.models import Channel
+from .models import GuildAccessToken
 from .forms import ChannelSettingsForm
 
-def channel_settings(request, channel_id, slug):
+def channel_settings(request, channel_id, token):
 	# Check if channel and token exists.
-	settings = get_object_or_404(ChannelSettings, channel=channel_id)
-	token = get_object_or_404(GuildAccessToken, slug=token)
+	channel = get_object_or_404(Channel, channel_id=channel_id)
+	#settings = get_object(ChannelSettings, channel=channel_id)
+	token = get_object_or_404(GuildAccessToken, token=token)
 
 	# Check if token is valid.
-    print(key.created.replace(tzinfo=None))
-    print(datetime.datetime.now() - datetime.timedelta(minutes=10))
-    if key.created.replace(tzinfo=None) + datetime.timedelta(hours=1)> datetime.datetime.now() - datetime.timedelta(minutes=10):
-        key_expired = False
-    else:
-        key_expired = True
+	print(key.created.replace(tzinfo=None))
+	print(datetime.datetime.now() - datetime.timedelta(minutes=10))
+	if token.created.replace(tzinfo=None) + datetime.timedelta(hours=1)> datetime.datetime.now() - datetime.timedelta(minutes=10):
+		token_expired = False
+	else:
+		token_expired = True
 
 	updated = False
 	if request.method == 'POST':
@@ -29,7 +31,7 @@ def channel_settings(request, channel_id, slug):
 		'title': 'Channel settings',
 		'icon': 'screwdriver',
 		'description': 'Modify channel settings for ' + APPLICATION_NAME,
-		'keywords': 'settigns, channel',
+		'keywords': 'settings, channel',
 		'form': form,
 		'updated': updated,
 	}

webgui/stats/models.py

@@ -30,14 +30,17 @@ class Channel(models.Model):
 		to_field = "guild_id",
 		db_column = "guild",
 	)
+	interact = models.BooleanField(
+		default = False,
+	)
 
 	class Meta:
 		managed = False
 		db_table = "channel"
 		verbose_name_plural = "channels"
 
-class User(models.model):
-	id = models.Autofield(
+class User(models.Model):
+	id = models.AutoField(
 		primary_key = True,
 	)
 	user_id = models.BigIntegerField(

webgui/webgui/settings.py

@@ -9,12 +9,14 @@ https://docs.djangoproject.com/en/4.1/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
+import os
 
-from pathlib import Path
-
+#
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
+from pathlib import Path
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+#
 # Store environment dependant settings in local_settings.py, which is untracked by git.
 try:
     from .local_settings import *