Merge branch 'develop'

Author: DigiDuncan

changelogs/3.10.md

@@ -0,0 +1,27 @@
+# SizeBot 3.10 Changelog
+
+*For the last major version's changelog, see [SizeBot 3½ Changelog](https://github.com/sizedev/SizeBot/blob/master/changelogs/3.5.md).*
+
+*For the last minor version's changelog, see [SizeBot 3.9 Changelog](https://github.com/sizedev/SizeBot/blob/master/changelogs/3.9.md).*
+
+We're now verified! This has come with some good and some bad, but I'll explain it all here!
+
+## Slash Commands
+- There is a new slash command, `/sb`. To use it, simply run `/sb`, and the the command you usually would after a prefix (for instance, `&stats` is now `/sb stats`.)
+    - More slash commands will come in the future! This is a stop-gap solution.
+- You can still run commands like normal by **pinging the bot instead**, and right now that's the recommended way to run commands.
+    - For instance, `@SizeBot stats`.
+
+## Triggers
+- **Triggers are disabled** for the time being until we can work on a verified-bot-friendly solution.
+
+## Additions
+- Added a new stat, `tier`.
+- Added a new oommands, `facts`.
+
+## Fixes
+- Fixed slow changes not working
+- Fixed push buttons not working
+- Fixed scale on step not working
+- Fixed `start` not working
+- Fixed several errors with some user inputs

changelogs/3.11.md

@@ -0,0 +1,31 @@
+# SizeBot 3.11 Changelog
+
+*For the last major version's changelog, see [SizeBot 3½ Changelog](https://github.com/sizedev/SizeBot/blob/master/changelogs/3.5.md).*
+
+*For the last minor version's changelog, see [SizeBot 3.9 Changelog](https://github.com/sizedev/SizeBot/blob/master/changelogs/3.9.md).*
+
+A bit of a smaller update while we ramp up for 4.0!
+
+## Additions
+- Added size limits.
+    - You can set them with `setminimum` and `setmaximum`.
+    - You can remove them with `resetminimum` and `resetmaximum`.
+    - Any height change will cap at these sizes, even changes from others.
+- Added a new command, `stacked`.
+    - Use it like `stacked "<object name>" [user]`.
+    - With no user provided, defaults to yourself.
+    - Tells you how many of that object is needed to stack to equal your height.
+- Added a new command, `toggleallowmatching`.
+    - Toggles whether or not to allow others to match your size.
+    - Enables/disables `copyheight`, `outgrow`, and `outshrink`.
+    - Is enabled by default.
+- Added a new command, `list`.
+    - Currently only supports `list stats`, which will list all stats in the bot.
+- As always, new objects added!
+
+## Changes
+- `outgrow` and `outshrink` can now take a user argument.
+
+## Fixes
+- The bot will now warn you if you've run an unrecognized command.
+- Improved error handling and reporting.

pokemon.json

@@ -10,7 +10,7 @@
 import sizebot.data
 from sizebot.lib import changes, userdb, nickmanager
 from sizebot.lib.diff import Diff, LimitedRate, Rate
-from sizebot.lib.errors import ChangeMethodInvalidException
+from sizebot.lib.errors import ChangeMethodInvalidException, UserNotFoundException
 from sizebot.lib.objs import DigiObject, objects
 from sizebot.lib.types import BotContext, GuildContext, StrToSend
 from sizebot.lib.units import SV, Decimal
@@ -169,7 +169,7 @@ async def pushme(self, ctx: GuildContext):
         category = "change"
     )
     @commands.guild_only()
-    async def outgrow(self, ctx: GuildContext, *, obj: DigiObject | None = None):
+    async def outgrow(self, ctx: GuildContext, *, obj: DigiObject | Member | None = None):
         """Outgrows the next object in the object database, or an object you specify."""
         guildid = ctx.guild.id
         userid = ctx.author.id
@@ -181,22 +181,38 @@ async def outgrow(self, ctx: GuildContext, *, obj: DigiObject | None = None):
                 await ctx.send("You have nothing left to outgrow!")
                 return
             obj = objs_larger[0]
+            name = obj.name
+            length = obj.unitlength
+        elif isinstance(obj, Member):
+            try:
+                userdata2 = userdb.load(ctx.guild.id, obj.id)
+                name = userdata2.nickname
+                length = userdata2.height
+            except UserNotFoundException:
+                await ctx.send("This user is not registered with SizeBot!")
+                return
+            if not userdata2.allow_matching:
+                await ctx.send("This user is does not allow others to match their height!")
+                return
+        else:
+            name = obj.name
+            length = obj.unitlength
 
-        if obj.unitlength < userdata.height:
-            await ctx.send(f"You're already larger than {obj.article} {obj.name}!")
+        if length < userdata.height:
+            await ctx.send(f"You're already larger than {obj.article if hasattr(obj, 'article') else ''} {name}!")
             return
 
         random_factor = Decimal(random.randint(11, 20) / 10)
-        userdata.height = obj.unitlength * random_factor
+        userdata.height = length * random_factor
         userdb.save(userdata)
 
-        await ctx.send(f"You outgrew {obj.article} **{obj.name}** *({obj.unitlength:,.3mu})* and are now **{userdata.height:,.3mu}** tall!")
+        await ctx.send(f"You outgrew {obj.article if hasattr(obj, 'article') else ''} **{name}** *({length:,.3mu})* and are now **{userdata.height:,.3mu}** tall!")
 
     @commands.command(
         category = "change"
     )
     @commands.guild_only()
-    async def outshrink(self, ctx: GuildContext, *, obj: DigiObject | None = None):
+    async def outshrink(self, ctx: GuildContext, *, obj: DigiObject | Member | None = None):
         """Outshrinks the next object in the object database or an object you specify."""
         guildid = ctx.guild.id
         userid = ctx.author.id
@@ -209,16 +225,32 @@ async def outshrink(self, ctx: GuildContext, *, obj: DigiObject | None = None):
                 await ctx.send("You have nothing left to outshrink!")
                 return
             obj = objs_smaller[0]
+            name = obj.name
+            length = obj.unitlength
+        elif isinstance(obj, Member):
+            try:
+                userdata2 = userdb.load(ctx.guild.id, obj.id)
+                name = userdata2.nickname
+                length = userdata2.height
+            except UserNotFoundException:
+                await ctx.send("This user is not registered with SizeBot!")
+                return
+            if not userdata2.allow_matching:
+                await ctx.send("This user is does not allow others to match their height!")
+                return
+        else:
+            name = obj.name
+            length = obj.unitlength
 
-        if obj.unitlength > userdata.height:
-            await ctx.send(f"You're already smaller than {obj.article} {obj.name}!")
+        if length > userdata.height:
+            await ctx.send(f"You're already smaller than {obj.article if hasattr(obj, 'article') else ''} {name}!")
             return
 
         random_factor = Decimal(random.randint(11, 20) / 10)
-        userdata.height = obj.unitlength / random_factor
+        userdata.height = length / random_factor
         userdb.save(userdata)
 
-        await ctx.send(f"You outshrunk {obj.article} **{obj.name}** *({obj.unitlength:,.3mu})* and are now **{userdata.height:,.3mu}** tall!")
+        await ctx.send(f"You outshrunk {obj.article if hasattr(obj, 'article') else ''} **{name}** *({length:,.3mu})* and are now **{userdata.height:,.3mu}** tall!")
 
     # TODO: CamelCase
     @tasks.loop(seconds=6)

sizebot/cogs/change.py

@@ -137,7 +137,7 @@ async def clearlargest(self, ctx: GuildContext):
     async def edgedebug(self, ctx: GuildContext):
         userdata = userdb.load(ctx.guild.id, ctx.author.id)
         usersizes = getUserSizes(ctx.guild)
-        guilddata = guilddb.load(ctx.guild.id)
+        guilddata = guilddb.load_or_create(ctx.guild.id)
         sm = guilddata.small_edge
         lg = guilddata.large_edge
 
@@ -159,7 +159,7 @@ async def on_message(self, m: discord.Message):
             return
 
         try:
-            guilddata = guilddb.load(m.guild.id)
+            guilddata = guilddb.load_or_create(m.guild.id)
         except GuildNotFoundException:
             return  # Guild does not have edges set
 

sizebot/cogs/edge.py

@@ -212,7 +212,7 @@ async def send_command_help(self, ctx: BotContext, cmd: commands.Command):
         embed = Embed(
             title=signature,
             description=description
-        ).set_author(name=f"Help [SizeBot {__version__}]").set_footer(text=f"See `{conf.prefix}help <command>` for more details about a command and how to use it.")
+        ).set_author(name=f"Help [SizeBot {__version__}]").set_footer(text=f"See `help <command>` for more details about a command and how to use it.")
 
         if cmd.aliases:
             embed.add_field(name="**Aliases:**", value=", ".join(cmd.aliases), inline=False)
@@ -379,10 +379,10 @@ async def pong(self, ctx: BotContext, subcommand: str = ""):
         waitMsg = await ctx.send(emojis.loading)
 
         if subcommand.lower() in ["heartbeat", "discord"]:
-            response = f"Ping! :ping_pong:\nDiscord HEARTBEAT latency: -{round(self.bot.latency, 3)} seconds"
+            response = f"Pong! :ping_pong:\nDiscord HEARTBEAT latency: -{round(self.bot.latency, 3)} seconds"
         else:
             messageLatency = waitMsg.created_at - ctx.message.created_at
-            response = f"Ping! :ping_pong:\nCommand latency: -{utils.pretty_time_delta(messageLatency.total_seconds(), True)}"
+            response = f"Pong! :ping_pong:\nCommand latency: -{utils.pretty_time_delta(messageLatency.total_seconds(), True)}"
         await waitMsg.edit(content = response)
 
     @commands.command(
@@ -414,6 +414,15 @@ async def invite(self, ctx: BotContext):
                        f"- (Use this [link](https://discord.com/oauth2/authorize?client_id={ctx.bot.application_id}&permissions=0&scope=applications.commands+bot) if you would like to manually manage the bot permissions).\n"
                        "If you need help, reach out to DigiDuncan (@digiduncan) and use `&help`! You can also go to this server for additional help: https://discord.gg/bbGjN8dTgk")
 
+    @commands.command(
+        usage = "<list>",
+        category = "help"
+    )
+    async def list(self, ctx: BotContext, list_type: str):
+        """List something about SizeBot! """
+        if list_type in ["stat", "stats"]:
+            await ctx.send(f"**STATS:**\n{stats_string}")
+
 
 class HelpCategory:
     def __init__(self, cid: str, name: str, description: str, emoji: str):

sizebot/cogs/help.py

@@ -19,25 +19,28 @@ def __init__(self, bot: commands.Bot):
         self.bot = bot
 
     @commands.command(
+        aliases = ["caps", "limit", "cap"],
         category = "misc"
     )
     @commands.guild_only()
     async def limits(self, ctx: GuildContext):
         """See the guild's current caps."""
         guilddata = guilddb.load_or_create(ctx.guild.id)
-        print_low = '*Unset*' if guilddata.low_limit is None else format(guilddata.low_limit, ",.3mu")
-        print_high = '*Unset*' if guilddata.high_limit is None else format(guilddata.high_limit, ",.3mu")
-        await ctx.send(f"**SERVER-SET LOW CAPS AND HIGH CAPS:**\nLow Limit: {print_low}\nHigh Limit: {print_high}")
+        userdata = userdb.load(ctx.guild.id, ctx.author.id)
+        print_glow = '*Unset*' if guilddata.low_limit is None else format(guilddata.low_limit, ",.3mu")
+        print_ghigh = '*Unset*' if guilddata.high_limit is None else format(guilddata.high_limit, ",.3mu")
+        print_ulow = '*Unset*' if userdata.minimum_limit is None else format(userdata.minimum_limit, ",.3mu")
+        print_uhigh = '*Unset*' if userdata.maximum_limit is None else format(userdata.maximum_limit, ",.3mu")
+        await ctx.send(f"**SERVER-SET LOW CAPS AND HIGH CAPS:**\nLow Limit: {print_glow}\nHigh Limit: {print_ghigh}\n**USER-SET LOW CAPS AND HIGH CAPS:**\nLow Limit: {print_ulow}\nHigh Limit: {print_uhigh}")
 
     @commands.command(
-        aliases = ["lowlimit", "lowcap", "setlowcap", "setfloor"],
         usage = "[size]",
         hidden = True,
         category = "mod"
     )
     @is_mod()
     @commands.guild_only()
-    async def setlowlimit(self, ctx: GuildContext, *, size: SV):
+    async def setguildminimum(self, ctx: GuildContext, *, size: SV):
         """Set the low size limit (floor)."""
         guilddata = guilddb.load_or_create(ctx.guild.id)
         guilddata.low_limit = size
@@ -46,14 +49,13 @@ async def setlowlimit(self, ctx: GuildContext, *, size: SV):
         logger.info(f"{size:,.3mu} is now the low size cap in guild {ctx.guild.id}.")
 
     @commands.command(
-        aliases = ["highlimit", "highcap", "sethighcap", "setceiling"],
         usage = "[size]",
         hidden = True,
         category = "mod"
     )
     @is_mod()
     @commands.guild_only()
-    async def sethighlimit(self, ctx: GuildContext, *, size: SV):
+    async def setguildmaximum(self, ctx: GuildContext, *, size: SV):
         """Set the high size limit (ceiling)."""
         guilddata = guilddb.load_or_create(ctx.guild.id)
         guilddata.high_limit = size
@@ -62,14 +64,14 @@ async def sethighlimit(self, ctx: GuildContext, *, size: SV):
         logger.info(f"{size:,.3mu} is now the high size cap in guild {ctx.guild.id}.")
 
     @commands.command(
-        aliases = ["resetlowlimit", "resetlowcap", "clearlowcap", "resetfloor", "clearfloor"],
+        aliases = ["resetguildminimum"],
         usage = "[size]",
         hidden = True,
         category = "mod"
     )
     @is_mod()
     @commands.guild_only()
-    async def clearlowlimit(self, ctx: GuildContext):
+    async def clearguildminimum(self, ctx: GuildContext):
         """Set the low size limit (floor)."""
         guilddata = guilddb.load_or_create(ctx.guild.id)
         guilddata.low_limit = None
@@ -78,21 +80,75 @@ async def clearlowlimit(self, ctx: GuildContext):
         logger.info(f"Cleared low size cap in guild {ctx.guild.id}.")
 
     @commands.command(
-        aliases = ["resethighlimit", "resethighcap", "clearhighcap", "resetceiling", "clearceiling"],
+        aliases = ["resetguildmaximum"],
         usage = "[size]",
         hidden = True,
         category = "mod"
     )
     @is_mod()
     @commands.guild_only()
-    async def clearhighlimit(self, ctx: GuildContext):
+    async def clearguildmaximum(self, ctx: GuildContext):
         """Set the high size limit (ceiling)."""
         guilddata = guilddb.load_or_create(ctx.guild.id)
         guilddata.high_limit = None
         guilddb.save(guilddata)
         await ctx.send("There is now no highest allowed size in this guild.")
         logger.info(f"Cleared high size cap in guild {ctx.guild.id}.")
 
+    @commands.command(
+        usage = "[size]",
+        category = "misc"
+    )
+    @commands.guild_only()
+    async def setminimum(self, ctx: GuildContext, *, size: SV):
+        """Set the low size limit (floor)."""
+        userdata = userdb.load(ctx.guild.id, ctx.author.id)
+        userdata.minimum_limit = size
+        userdb.save(userdata)
+        await ctx.send(f"{size:,.3mu} is now your minimum size.")
+        logger.info(f"{size:,.3mu} is now the low size cap for user {userdata.id}.")
+
+    @commands.command(
+        usage = "[size]",
+        category = "misc"
+    )
+    @commands.guild_only()
+    async def setmaximum(self, ctx: GuildContext, *, size: SV):
+        """Set the high size limit (ceiling)."""
+        userdata = userdb.load(ctx.guild.id, ctx.author.id)
+        userdata.maximum_limit = size
+        userdb.save(userdata)
+        await ctx.send(f"{size:,.3mu} is now your maximum size.")
+        logger.info(f"{size:,.3mu} is now the high size cap for user {userdata.id}.")
+
+    @commands.command(
+        aliases = ["resetminimum"],
+        usage = "[size]",
+        category = "misc"
+    )
+    @commands.guild_only()
+    async def clearminimum(self, ctx: GuildContext):
+        """Clear the low size limit (floor)."""
+        userdata = userdb.load(ctx.guild.id, ctx.author.id)
+        userdata.minimum_limit = None
+        userdb.save(userdata)
+        await ctx.send("You no longer have a lower limit.")
+        logger.info(f"None is now the low size cap for user {userdata.id}.")
+
+    @commands.command(
+        aliases = ["resetmaximum"],
+        usage = "[size]",
+        category = "misc"
+    )
+    @commands.guild_only()
+    async def clearmaximum(self, ctx: GuildContext):
+        """Set the high size limit (ceiling)."""
+        userdata = userdb.load(ctx.guild.id, ctx.author.id)
+        userdata.maximum_limit = None
+        userdb.save(userdata)
+        await ctx.send("You no longer have an upper limit.")
+        logger.info(f"None is now the high size cap for user {userdata.id}.")
+
     @commands.Cog.listener()
     async def on_message(self, m: discord.Message):
         # non-guild messages
@@ -104,7 +160,7 @@ async def on_message(self, m: discord.Message):
         except UserNotFoundException:
             return
         try:
-            guilddata = guilddb.load(m.guild.id)
+            guilddata = guilddb.load_or_create(m.guild.id)
         except GuildNotFoundException:
             return
 
@@ -120,6 +176,18 @@ async def on_message(self, m: discord.Message):
                 userdb.save(userdata)
                 await m.channel.send(f"{userdata.nickname} hit the upper limit of this guild and has been set to {guilddata.high_limit:,.3mu}.")
 
+        if userdata.minimum_limit:
+            if userdata.height < userdata.minimum_limit:
+                userdata.height = userdata.minimum_limit
+                userdb.save(userdata)
+                await m.channel.send(f"{userdata.nickname} hit their lower limit and has been set to {userdata.minimum_limit:,.3mu}.")
+
+        if userdata.maximum_limit:
+            if userdata.height > userdata.maximum_limit:
+                userdata.height = userdata.maximum_limit
+                userdb.save(userdata)
+                await m.channel.send(f"{userdata.nickname} hit their upper limit and has been set to {userdata.maximum_limit:,.3mu}.")
+
         if userdata.display:
             await nickmanager.nick_update(m.author)