Final Merge of my changes

README.md

@@ -1 +1,2 @@
-# new-discord-bot
+# CCubed Discord Bot
+Discord bot for the ccubed discord server. This bot interacts with memebers of the server. 

bot.py

@@ -32,16 +32,14 @@
 import openai
 '''
 #
-
 API_KEY_1 = os.environ.get("API_KEY_1")
 API_KEY_2 = os.environ.get("API_KEY_2")
 
 openai.api_key = API_KEY_1 + API_KEY_2 # Free tier key, sharable
 
 bot = commands.Bot(command_prefix="!", intents=discord.Intents.all())
 intents = discord.Intents.default()
-
-TOKEN = os.environ.get("TOKEN")
+TOKEN= os.environ.get("TOKEN")
 
 @bot.event
 async def on_ready():
@@ -56,7 +54,6 @@ async def on_ready():
 
 
 
-
 welcome_enabled = True  # initially the welcome messages are enabled
 
 
@@ -95,10 +92,6 @@ async def on_member_join(member):
 
 
 
-
-
-
-
 class IgnoreButton(discord.ui.Button):
     def __init__(self, flagged_message):
         super().__init__(label="Ignore", style=discord.ButtonStyle.green, emoji="✅")
@@ -318,8 +311,6 @@ def __init__(self):
             discord.SelectOption(label="UofT St. George", value="UofT St. George"),
             discord.SelectOption(label="UofT Scarborough", value="UofT Scarborough")
         ]
-
-
         super().__init__(placeholder="Select your University", min_values=1, max_values=1, options=options)
 
     async def callback(self, interaction: discord.Interaction):
@@ -332,7 +323,6 @@ async def callback(self, interaction: discord.Interaction):
             # If the role exists, add it to the member
             await interaction.user.add_roles(role)
 
-
 class InterestSelect(Select):
     def __init__(self):
         options = [
@@ -366,7 +356,6 @@ async def callback(self, interaction: discord.Interaction):
 
                 await interaction.user.add_roles(role)
 
-
 @bot.tree.command(name='select')
 async def select(interaction: discord.Interaction):
     embed = discord.Embed(title="Select your University and Interests", description="Please choose your university and interests from the dropdown menus below.", color=0x00ff00)
@@ -479,7 +468,6 @@ async def userinfo(ctx: discord.Interaction, member: discord.Member):
     embed.add_field(name="Bot?", value=member.bot)
     await ctx.response.send_message(embed=embed)
 
-
 @bot.tree.command(name='roll', description='Roll a dice')
 async def roll(interaction: discord.Interaction, *, dice: str):
     try:
@@ -548,6 +536,16 @@ async def deleterole(interaction: discord.Interaction, *, name: str):
     role = discord.utils.get(interaction.guild.roles, name=name)
     await role.delete()
 
+#Social Media Links
+@bot.tree.command(name='social', description='Social Media Links')
+async def social(interaction: discord.Interaction):
+    ig = "Instagram: https://www.instagram.com/ccubed_dev/?hl=en"
+    linked = "LinkedIn: https://www.linkedin.com/company/ccubed-dev"
+    twitter = "Twitter: https://twitter.com/ccubed_dev"
+    fb = "Facebook: https://www.facebook.com/ccubed.dev"
+    site = "Website: https://ccubed.dev/"
+    await interaction.response.send_message(f'{ig} \n {linked} \n {twitter} \n {fb} \n {site}')
+
 @bot.tree.command(name='addrole')
 @commands.has_permissions(manage_roles=True)  # only allow users with role management permissions to run this command
 async def add_role(ctx, member: discord.Member, role: discord.Role):

venv/Lib/site-packages/_distutils_hack/__init__.py

@@ -0,0 +1,222 @@
+# don't import any costly modules
+import sys
+import os
+
+
+is_pypy = '__pypy__' in sys.builtin_module_names
+
+
+def warn_distutils_present():
+    if 'distutils' not in sys.modules:
+        return
+    if is_pypy and sys.version_info < (3, 7):
+        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
+        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
+        return
+    import warnings
+
+    warnings.warn(
+        "Distutils was imported before Setuptools, but importing Setuptools "
+        "also replaces the `distutils` module in `sys.modules`. This may lead "
+        "to undesirable behaviors or errors. To avoid these issues, avoid "
+        "using distutils directly, ensure that setuptools is installed in the "
+        "traditional way (e.g. not an editable install), and/or make sure "
+        "that setuptools is always imported before distutils."
+    )
+
+
+def clear_distutils():
+    if 'distutils' not in sys.modules:
+        return
+    import warnings
+
+    warnings.warn("Setuptools is replacing distutils.")
+    mods = [
+        name
+        for name in sys.modules
+        if name == "distutils" or name.startswith("distutils.")
+    ]
+    for name in mods:
+        del sys.modules[name]
+
+
+def enabled():
+    """
+    Allow selection of distutils by environment variable.
+    """
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local')
+    return which == 'local'
+
+
+def ensure_local_distutils():
+    import importlib
+
+    clear_distutils()
+
+    # With the DistutilsMetaFinder in place,
+    # perform an import to cause distutils to be
+    # loaded from setuptools._distutils. Ref #2906.
+    with shim():
+        importlib.import_module('distutils')
+
+    # check that submodules load as expected
+    core = importlib.import_module('distutils.core')
+    assert '_distutils' in core.__file__, core.__file__
+    assert 'setuptools._distutils.log' not in sys.modules
+
+
+def do_override():
+    """
+    Ensure that the local copy of distutils is preferred over stdlib.
+
+    See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
+    for more motivation.
+    """
+    if enabled():
+        warn_distutils_present()
+        ensure_local_distutils()
+
+
+class _TrivialRe:
+    def __init__(self, *patterns):
+        self._patterns = patterns
+
+    def match(self, string):
+        return all(pat in string for pat in self._patterns)
+
+
+class DistutilsMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        # optimization: only consider top level modules and those
+        # found in the CPython test suite.
+        if path is not None and not fullname.startswith('test.'):
+            return
+
+        method_name = 'spec_for_{fullname}'.format(**locals())
+        method = getattr(self, method_name, lambda: None)
+        return method()
+
+    def spec_for_distutils(self):
+        if self.is_cpython():
+            return
+
+        import importlib
+        import importlib.abc
+        import importlib.util
+
+        try:
+            mod = importlib.import_module('setuptools._distutils')
+        except Exception:
+            # There are a couple of cases where setuptools._distutils
+            # may not be present:
+            # - An older Setuptools without a local distutils is
+            #   taking precedence. Ref #2957.
+            # - Path manipulation during sitecustomize removes
+            #   setuptools from the path but only after the hook
+            #   has been loaded. Ref #2980.
+            # In either case, fall back to stdlib behavior.
+            return
+
+        class DistutilsLoader(importlib.abc.Loader):
+            def create_module(self, spec):
+                mod.__name__ = 'distutils'
+                return mod
+
+            def exec_module(self, module):
+                pass
+
+        return importlib.util.spec_from_loader(
+            'distutils', DistutilsLoader(), origin=mod.__file__
+        )
+
+    @staticmethod
+    def is_cpython():
+        """
+        Suppress supplying distutils for CPython (build and tests).
+        Ref #2965 and #3007.
+        """
+        return os.path.isfile('pybuilddir.txt')
+
+    def spec_for_pip(self):
+        """
+        Ensure stdlib distutils when running under pip.
+        See pypa/pip#8761 for rationale.
+        """
+        if self.pip_imported_during_build():
+            return
+        clear_distutils()
+        self.spec_for_distutils = lambda: None
+
+    @classmethod
+    def pip_imported_during_build(cls):
+        """
+        Detect if pip is being imported in a build script. Ref #2355.
+        """
+        import traceback
+
+        return any(
+            cls.frame_file_is_setup(frame) for frame, line in traceback.walk_stack(None)
+        )
+
+    @staticmethod
+    def frame_file_is_setup(frame):
+        """
+        Return True if the indicated frame suggests a setup.py file.
+        """
+        # some frames may not have __file__ (#2940)
+        return frame.f_globals.get('__file__', '').endswith('setup.py')
+
+    def spec_for_sensitive_tests(self):
+        """
+        Ensure stdlib distutils when running select tests under CPython.
+
+        python/cpython#91169
+        """
+        clear_distutils()
+        self.spec_for_distutils = lambda: None
+
+    sensitive_tests = (
+        [
+            'test.test_distutils',
+            'test.test_peg_generator',
+            'test.test_importlib',
+        ]
+        if sys.version_info < (3, 10)
+        else [
+            'test.test_distutils',
+        ]
+    )
+
+
+for name in DistutilsMetaFinder.sensitive_tests:
+    setattr(
+        DistutilsMetaFinder,
+        f'spec_for_{name}',
+        DistutilsMetaFinder.spec_for_sensitive_tests,
+    )
+
+
+DISTUTILS_FINDER = DistutilsMetaFinder()
+
+
+def add_shim():
+    DISTUTILS_FINDER in sys.meta_path or insert_shim()
+
+
+class shim:
+    def __enter__(self):
+        insert_shim()
+
+    def __exit__(self, exc, value, tb):
+        remove_shim()
+
+
+def insert_shim():
+    sys.meta_path.insert(0, DISTUTILS_FINDER)
+
+
+def remove_shim():
+    try:
+        sys.meta_path.remove(DISTUTILS_FINDER)
+    except ValueError:
+        pass

venv/Lib/site-packages/_distutils_hack/override.py

@@ -0,0 +1 @@
+__import__('_distutils_hack').do_override()

venv/Lib/site-packages/aiohttp-3.8.4.dist-info/INSTALLER

@@ -0,0 +1 @@
+pip

venv/Lib/site-packages/aiohttp-3.8.4.dist-info/LICENSE.txt

@@ -0,0 +1,13 @@
+   Copyright aio-libs contributors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.