update ae7q extension to use ae7qparser

Fixes #195
Fixes #186
Fixes #168

.github/pull_request_template.md

@@ -1,29 +0,0 @@
-### Description
-
-*Describe the changes you made here.*
-
-Fixes #{issue}
-
-### Type of change
-
-Please delete options that are not relevant.
-
-- Bug fix (non-breaking change which fixes an issue)
-- New feature (non-breaking change which adds functionality)
-- Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- This change requires a documentation update
-
-### How has this been tested?
-
-*Describe the procedure used for verifying your changes here.*
-
-### Checklist
-
-- [ ] Issue exists for PR
-- [ ] Code reviewed by the author
-- [ ] Code documented (comments or other documentation)
-- [ ] Changes tested
-- [ ] `flake8` passes
-- [ ] `CHANGELOG.md` updated
-- [ ] Informative commit messages
-- [ ] Descriptive PR title

.github/workflows/linting.yml

@@ -1,6 +1,6 @@
 name: Linting
 
-on: [push,pull_request]
+on: [push]
 
 jobs:
   flake8_py3:

.gitignore

@@ -9,8 +9,6 @@ cty.zip
 
 /docker-compose.yml
 
-.vscode/
-
 
 #########################################################
 # Byte-compiled / optimized / DLL files

CHANGELOG.md

@@ -7,25 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 
-## [2.4.0] - 2020-09-27
-### Added
-- Canadian prefix info to the `?prefixes` command.
-- `?worksplit` command.
-- Maps for CQ Zones, ITU Zones, ITU Regions, and Canadian prefixes.
-- Attribution for all maps.
-- Option to append ` | ?help` to the playing status.
-- `?dbconv` command to convert voltage, power, and antenna gain values.
-### Changed
-- ARRL/RAC section maps to include all current ARRL/RAC sections.
-### Fixed
-- Issue where multiple prefixes were not handled properly.
-
-
-## [2.3.2] - 2020-07-22
-### Fixed
-- Dependency issues
-
-
 ## [2.3.1] - 2020-04-02
 ### Fixed
 - Wordlist containing innappropriate words.
@@ -124,9 +105,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## 1.0.0 - 2019-07-31 [YANKED]
 
 
-[Unreleased]: https://github.com/miaowware/qrm2/compare/v2.4.0...HEAD
+[Unreleased]: https://github.com/miaowware/qrm2/compare/v2.3.1...HEAD
-[2.4.0]: https://github.com/miaowware/qrm2/releases/tag/v2.4.0
-[2.3.2]: https://github.com/miaowware/qrm2/releases/tag/v2.3.2
 [2.3.1]: https://github.com/miaowware/qrm2/releases/tag/v2.3.1
 [2.3.0]: https://github.com/miaowware/qrm2/releases/tag/v2.3.0
 [2.2.3]: https://github.com/miaowware/qrm2/releases/tag/v2.2.3

CONTRIBUTING.md

@@ -1,77 +0,0 @@
-# Contributing to qrm
-
-## Before You Start
-
-- Make sure there's an issue for the feature, bugfix, or other improvement you want to make.
-- Make sure it's something that the project maintainers want.
-  We can discuss it and assign the issue to you.
-- Make sure work isn't already being done on the issue.
-
-### Environment Setup
-
-Once all of the above is done, you can get started by setting up your development envronment.
-
-1. [Fork this repo][1] into your own GitHub namespace.
-1. Make sure the `master` branch is up to date, then make yourself a new branch with a descriptive name.
-1. Once the forked repo is cloned and on the proper branch, you can set up the development environment.
-    1. Install python 3.7 or higher.
-    1. Run `make dev-install`.
-       This should install everything you need to develop and run qrm.
-    1. [Create a bot and token][2], and add it to `data/keys.py`.
-       Also add your [QRZ credentials][3] if needed.
-    1. In `data/options.py`, change values as needed.
-       Some commands require adding your Discord user ID to `owner_uids`.
-    1. To activate the virtual env that was created by `make`, run `source botenv/bin/activate` (or the equivelent for your shell or operating system).
-
-## While You Develop
-
-To run qrm, use the command `./run.sh`.
-We recommend you use the `--pass-errors` flags to avoid perpetual restart loops if you break the bot.
-It exists because repeatedly mashing [Ctrl+C] at high speed to break a fast loop is not fun.
-
-Commit messages should be descriptive and mention issues that they fix ("fixes #123") or contain progress on ("progress on #123").
-Make commits as needed, but try to keep it reasonable.
-If there are too many, your contribution may be squashed when merged.
-You may want to squash your commits locally yourself:
-
-```sh
-git reset --soft [commit before your changes]
-git commit
-```
-
-Make sure to document your code as you go, in both comments and external documentation (in `/dev-notes/`) as needed.
-`dev-notes` is especially important if you introduce a new json file format or to document some development process (like the command to crush the various images in the repository).
-
-**Test your changes.**
-If your code doesn't work, it's not ready for merging.
-Make sure you not only test intended behaviour, but also edge cases and error cases.
-Make sure to run `flake8` to ensure your code uses the proper style, and `mypy [files...]` to ensure proper typing.
-
-If you're making a user-facing change, put a quick summary in `CHANGELOG.md` under the `[Unreleased]` heading.
-Follow the [Keep a Changelog][4] format.
-
-### A Note on Style
-
-qrm tries to keep to PEP 8 style whenever possible.
-Use the utility `flake8` to check that you follow this style.
-When you start a PR or push commits, GitHub will automatically run this for you;
-if that fails, you will be expected to fix those errors before merge.
-
-Otherwise, try to follow the existing style:
-double-quotes except when required to be single,
-indentation of mult-line structures matching other examples in the code,
-add type hints,
-etc.
-
-## When You're Ready to Merge
-
-1. When you have finished working on your contribution, create a pull request from your fork's branch into the master branch of this repository.
-1. Read through and complete the pull request template.
-   If the checklist is not complete, your contribution will not be merged.
-1. Your pull request will get reviewed by at least one maintainer.
-1. If approved, another maintainer may merge the pull request if everything looks good.
-
-[1]: https://github.com/miaowware/qrm2/fork
-[2]: https://discordpy.readthedocs.io/en/latest/discord.html
-[3]: https://www.qrz.com/page/xml_data.html
-[4]: https://keepachangelog.com/en/1.0.0/

Makefile

@@ -71,17 +71,6 @@ clean:
 
 
 ### Dev targets ###
-.PHONY: dev-install
-dev-install: $(BOTENV)/dev_req_done data/options.py data/keys.py
-
-# Installing dev requirements
-$(BOTENV)/dev_req_done: dev-requirements.txt $(BOTENV)/success
-	@echo "\033[34;1m--> Installing the dependencies...\033[0m"
-	@. $(BOTENV)/bin/activate; \
-		pip install ${PIP_OUTPUT} -U pip setuptools wheel; \
-		pip install ${PIP_OUTPUT} -U -r dev-requirements.txt
-	@touch $(BOTENV)/dev_req_done
-
 
 
 ### Special targets ###

README-DOCKER.md

@@ -1,6 +1,6 @@
 # Docker help for qrm2
 
-You have multiple ways to use docker to run an instance of qrm2.
+You have multiple ways to use docker to run an instance of qrm2
 
 - [Docker help for qrm2](#docker-help-for-qrm2)
   - [Using docker-compose and the prebuilt-image (recommended)](#using-docker-compose-and-the-prebuilt-image-recommended)
@@ -23,16 +23,13 @@ This is the easiest method for running the bot without any modifications.
     version: '3'
     services:
       qrm2:
-        image: "classabbyamp/qrm2:latest"
+        image: "classabbyamp/discord-qrm2:latest"
-        # OR
-        # image: "docker.pkg.github.com/miaowware/qrm2/qrm2:latest"
         restart: on-failure
         volumes:
           - "./data:/app/data:rw"
         environment:
           - PYTHONUNBUFFERED=1
     ```
-   > Note that there are two possible sources for the image: docker's and github's registry. Github's registry requires [a few extra steps](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages) during the initial setup.
 
 3. Create a subdirectory named `data`.
 
@@ -62,7 +59,7 @@ This is the easiest method to run the bot with modifications.
     services:
       qrm2:
         build: .
-        image: "qrm2:local-latest"
+        image: "discord-qrm2:local-latest"
         restart: on-failure
         volumes:
           - "./data:/app/data:rw"
@@ -78,7 +75,7 @@ This is the easiest method to run the bot with modifications.
 
     ```none
     $ docker-compose build --pull
-    $ docker-compose up -d
+    $ docker-compose -d
     ```
 
     > Run without "-d" to test the bot. (run in foreground)
@@ -98,7 +95,7 @@ This methods is not very nice to use.
 2. Run docker build:
 
     ```none
-    $ docker build -t qrm2:local-latest .
+    $ docker build -t discord-qrm2:local-latest .
     ```
 
 

README.md

@@ -28,10 +28,6 @@ Run. For more information on options, see the [quick-bot-no-pain run.sh document
 $ run.sh
 ```
 
-## Contributing
-
-Check out the [contribution guidelines](/CONTRIBUTING.md) for more information about how to contribute to this project.
-
 ## Copyright
 
 Copyright (C) 2019-2020 Abigail Gold, 0x5c

common.py

@@ -63,7 +63,6 @@ emojis = SimpleNamespace(
 paths = SimpleNamespace(
     data=Path("./data/"),
     resources=Path("./resources/"),
-    img=Path("./resources/img/"),
     bandcharts=Path("./resources/img/bandcharts/"),
     maps=Path("./resources/img/maps/"),
 )
@@ -71,16 +70,6 @@ paths = SimpleNamespace(
 
 # --- Classes ---
 
-
-class CallsignInfoData:
-    """Represents a country's callsign info"""
-    def __init__(self, data: list):
-        self.title: str = data[0]
-        self.desc: str = data[1]
-        self.calls: str = data[2]
-        self.emoji: str = data[3]
-
-
 class ImageMetadata:
     """Represents the metadata of a single image."""
     def __init__(self, metadata: list):

dev-notes/image-processing.md

@@ -1,4 +0,0 @@
-# Image processing instructions
-
-For images like bandplans and maps, first resize the image to a reasonable size, then run `pngquant --quality 30-40` on the images.
-Do not apply that to non-flat images like actual pictures.

dev-notes/metadata-format.md

@@ -20,5 +20,5 @@ Used for grouping info such as name, description, source, and such.
 | `name`        | The name of the file.                           | `Canada`, `ITU Zones`                            |
 | `long_name`   | The long name (title) of the file.              | `Worldwide map of ITU Zones`                     |
 | `description` | The description accompanying the file.          | `Full radio allocations chart for all services.` |
-| `source`      | The source of the file.                         | `Instituto Federal de Telecomunicaciones (IFT)`  |
+| `source`      | The source of the file.                         | `Instituto Federal de Telecomunicaciones (IFT)` |
 | `emoji`       | A Unicode emoji associated with the file.       | `📻`, `🇨🇦`                                       |

dev-requirements.txt

@@ -1,3 +0,0 @@
--r requirements.txt
-flake8
-discord.py-stubs

exts/ae7q.py

@@ -16,8 +16,10 @@ the GNU General Public License, version 2.
 # KC4USA: reserved, no call history, *but* has application history
 
 
+import re
+
 import aiohttp
-from bs4 import BeautifulSoup
+import ae7qparser
 
 import discord.ext.commands as commands
 
@@ -40,64 +42,86 @@ class AE7QCog(commands.Cog):
         """Looks up the history of a callsign on [ae7q.com](http://ae7q.com/)."""
         with ctx.typing():
             callsign = callsign.upper()
-            desc = ""
-            base_url = "http://ae7q.com/query/data/CallHistory.php?CALL="
-            embed = cmn.embed_factory(ctx)
 
-            async with self.session.get(base_url + callsign) as resp:
+            call_data = ae7qparser.get_call(callsign)
-                if resp.status != 200:
-                    raise cmn.BotHTTPError(resp)
-                page = await resp.text()
-
-            soup = BeautifulSoup(page, features="html.parser")
-            tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")]
-
-            table = tables[0]
-
-            # find the first table in the page, and use it to make a description
-            if len(table[0]) == 1:
-                for row in table:
-                    desc += " ".join(row.getText().split())
-                    desc += "\n"
-                desc = desc.replace(callsign, f"`{callsign}`")
-                table = tables[1]
-
-            table_headers = table[0].find_all("th")
-            first_header = "".join(table_headers[0].strings) if len(table_headers) > 0 else None
-
-            # catch if the wrong table was selected
-            if first_header is None or first_header != "Entity Name":
-                embed.title = f"AE7Q History for {callsign}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + callsign
-                embed.description = desc
-                embed.description += f"\nNo records found for `{callsign}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = await process_table(table[1:])
 
             embed = cmn.embed_factory(ctx)
-            embed.title = f"AE7Q History for {callsign}"
+            embed.title = f"AE7Q Callsign History for {callsign}"
+            embed.url = call_data.query_url
             embed.colour = cmn.colours.good
-            embed.url = base_url + callsign
+            embed.description = ""
 
-            # add the first three rows of the table to the embed
+            if isinstance(call_data, ae7qparser.Ae7qCallData):
-            for row in table[0:3]:
+                if call_data.conditions:
-                header = f"**{row[0]}** ({row[1]})"     # **Name** (Applicant Type)
+                    embed.description = " ".join([
-                body = (f"Class: *{row[2]}*\n"
+                                                    " ".join([y.strip() for y in x]) for x in call_data.conditions
-                        f"Region: *{row[3]}*\n"
+                                                 ]).replace(callsign, f"`{callsign}`")
-                        f"Status: *{row[4]}*\n"
-                        f"Granted: *{row[5]}*\n"
-                        f"Effective: *{row[6]}*\n"
-                        f"Cancelled: *{row[7]}*\n"
-                        f"Expires: *{row[8]}*")
-                embed.add_field(name=header, value=body, inline=False)
 
-            if len(table) > 3:
+                if not call_data.call_history:
-                desc += f"\nRecords 1 to 3 of {len(table)}. See ae7q.com for more..."
+                    if not call_data.event_callsign_history:
+                        embed.colour = cmn.colours.bad
+                        embed.description += f"\nNo records found for `{callsign}`"
+                    else:
+                        # add the first five rows of the event callsign history to the embed
+                        for row in call_data.event_callsign_history[0:5]:
+                            header = f"**{row.start_date:%Y-%m-%d}-{row.end_date:%Y-%m-%d}**"
+                            body = (f"Requestor: *{row.entity_name} ({row.callsign})*\n"
+                                    f"Event: *{row.event_name}*")
+                            embed.add_field(name=header, value=body, inline=False)
 
-            embed.description = desc
+                        if len(call_data.event_callsign_history) > 5:
+                            embed.description += (f"\nRecords 1 to 5 of {len(call_data.event_callsign_history)}. "
+                                                  f"See [ae7q.com]({call_data.query_url}) for more...")
+
+                else:
+                    # add the first three rows of the callsign history to the embed
+                    for row in call_data.call_history[0:3]:
+                        header = f"**{row.entity_name}** ({row.applicant_type})"
+                        body = (f"Class: *{row.operator_class}*\n"
+                                f"Region: *{row.region_state}*\n"
+                                f"Status: *{row.license_status}*\n")
+                        if row.grant_date:
+                            body += f"Granted: *{row.grant_date:%Y-%m-%d}*\n"
+                        if row.effective_date:
+                            body += f"Effective: *{row.effective_date:%Y-%m-%d}*\n"
+                        if row.cancel_date:
+                            body += f"Cancelled: *{row.cancel_date:%Y-%m-%d}*\n"
+                        if row.expire_date:
+                            body += f"Expires: *{row.expire_date:%Y-%m-%d}*\n"
+
+                        embed.add_field(name=header, value=body, inline=False)
+
+                    if len(call_data.call_history) > 3:
+                        embed.description += (f"\nRecords 1 to 3 of {len(call_data.call_history)}. "
+                                              f"See [ae7q.com]({call_data.query_url}) for more...")
+
+            elif isinstance(call_data, ae7qparser.Ae7qCanadianCallData):
+                if not call_data.callsign_data:
+                    embed.colour = cmn.colours.bad
+                    embed.description += f"\nNo records found for `{callsign}`"
+                else:
+                    if call_data.given_names != "" and call_data.surname != "":
+                        embed.add_field(name="Name", value=f"{call_data.given_names} {call_data.surname}", inline=True)
+                    if call_data.address != "":
+                        embed.add_field(name="Address", value=call_data.address, inline=True)
+                    if call_data.locality != "":
+                        embed.add_field(name="Locality", value=call_data.locality, inline=True)
+                    if call_data.province != "":
+                        embed.add_field(name="Province", value=call_data.province, inline=True)
+                    if call_data.postal_code != "":
+                        embed.add_field(name="Postal Code", value=call_data.postal_code, inline=True)
+                    if call_data.country != "":
+                        embed.add_field(name="Country", value=call_data.country, inline=True)
+                    if call_data.region != "":
+                        embed.add_field(name="Region", value=call_data.region, inline=True)
+                    if call_data.grid_square != "":
+                        embed.add_field(name="Grid Square", value=call_data.grid_square, inline=True)
+                    if call_data.qualifications != "":
+                        embed.add_field(name="License Qualifications", value=call_data.qualifications, inline=True)
+
+            else:
+                embed.colour = cmn.colours.bad
+                embed.description += f"\nNo records found for `{callsign}`"
 
             await ctx.send(embed=embed)
 
@@ -106,202 +130,283 @@ class AE7QCog(commands.Cog):
         """Looks up the licenses for which a licensee is trustee on [ae7q.com](http://ae7q.com/)."""
         with ctx.typing():
             callsign = callsign.upper()
-            desc = ""
-            base_url = "http://ae7q.com/query/data/CallHistory.php?CALL="
-            embed = cmn.embed_factory(ctx)
 
-            async with self.session.get(base_url + callsign) as resp:
+            call_data = ae7qparser.get_call(callsign)
-                if resp.status != 200:
-                    raise cmn.BotHTTPError(resp)
-                page = await resp.text()
-
-            soup = BeautifulSoup(page, features="html.parser")
-            tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")]
-
-            try:
-                table = tables[2] if len(tables[0][0]) == 1 else tables[1]
-            except IndexError:
-                embed.title = f"AE7Q Trustee History for {callsign}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + callsign
-                embed.description = desc
-                embed.description += f"\nNo records found for `{callsign}`"
-                await ctx.send(embed=embed)
-                return
-
-            table_headers = table[0].find_all("th")
-            first_header = "".join(table_headers[0].strings) if len(table_headers) > 0 else None
-
-            # catch if the wrong table was selected
-            if first_header is None or not first_header.startswith("With"):
-                embed.title = f"AE7Q Trustee History for {callsign}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + callsign
-                embed.description = desc
-                embed.description += f"\nNo records found for `{callsign}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = await process_table(table[2:])
 
             embed = cmn.embed_factory(ctx)
             embed.title = f"AE7Q Trustee History for {callsign}"
+            embed.url = call_data.query_url
             embed.colour = cmn.colours.good
-            embed.url = base_url + callsign
+            embed.description = ""
 
-            # add the first three rows of the table to the embed
+            if isinstance(call_data, ae7qparser.Ae7qCallData):
-            for row in table[0:3]:
+                if not call_data.trustee_history:
-                header = f"**{row[0]}** ({row[3]})"     # **Name** (Applicant Type)
+                    embed.colour = cmn.colours.bad
-                body = (f"Name: *{row[2]}*\n"
+                    embed.description += f"\nNo records found for `{callsign}`"
-                        f"Region: *{row[1]}*\n"
+                else:
-                        f"Status: *{row[4]}*\n"
+                    # add the first three rows of the trustee history to the embed
-                        f"Granted: *{row[5]}*\n"
+                    for row in call_data.trustee_history[0:3]:
-                        f"Effective: *{row[6]}*\n"
+                        header = f"**{row.callsign}** ({row.applicant_type})"
-                        f"Cancelled: *{row[7]}*\n"
+                        body = (f"Name: *{row.entity_name}*\n"
-                        f"Expires: *{row[8]}*")
+                                f"Region: *{row.region_state}*\n"
-                embed.add_field(name=header, value=body, inline=False)
+                                f"Status: *{row.license_status}*\n")
+                        if row.grant_date:
+                            body += f"Granted: *{row.grant_date:%Y-%m-%d}*\n"
+                        if row.effective_date:
+                            body += f"Effective: *{row.effective_date:%Y-%m-%d}*\n"
+                        if row.cancel_date:
+                            body += f"Cancelled: *{row.cancel_date:%Y-%m-%d}*\n"
+                        if row.expire_date:
+                            body += f"Expires: *{row.expire_date:%Y-%m-%d}*\n"
 
-            if len(table) > 3:
+                        embed.add_field(name=header, value=body, inline=False)
-                desc += f"\nRecords 1 to 3 of {len(table)}. See ae7q.com for more..."
 
-            embed.description = desc
+                    if len(call_data.trustee_history) > 3:
+                        embed.description += (f"\nRecords 1 to 3 of {len(call_data.trustee_history)}. "
+                                              f"See [ae7q.com]({call_data.query_url}) for more...")
 
-            await ctx.send(embed=embed)
+            else:
-
-    @_ae7q_lookup.command(name="applications", aliases=["a"], category=cmn.cat.lookup)
-    async def _ae7q_applications(self, ctx: commands.Context, callsign: str):
-        """Looks up the application history for a callsign on [ae7q.com](http://ae7q.com/)."""
-        """
-        with ctx.typing():
-            callsign = callsign.upper()
-            desc = ""
-            base_url = "http://ae7q.com/query/data/CallHistory.php?CALL="
-            embed = cmn.embed_factory(ctx)
-
-            async with self.session.get(base_url + callsign) as resp:
-                if resp.status != 200:
-                    raise cmn.BotHTTPError(resp)
-                page = await resp.text()
-
-            soup = BeautifulSoup(page, features="html.parser")
-            tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")]
-
-            table = tables[0]
-
-            # find the first table in the page, and use it to make a description
-            if len(table[0]) == 1:
-                for row in table:
-                    desc += " ".join(row.getText().split())
-                    desc += "\n"
-                desc = desc.replace(callsign, f"`{callsign}`")
-
-            # select the last table to get applications
-            table = tables[-1]
-
-            table_headers = table[0].find_all("th")
-            first_header = "".join(table_headers[0].strings) if len(table_headers) > 0 else None
-
-            # catch if the wrong table was selected
-            if first_header is None or not first_header.startswith("Receipt"):
-                embed.title = f"AE7Q Application History for {callsign}"
                 embed.colour = cmn.colours.bad
-                embed.url = base_url + callsign
-                embed.description = desc
                 embed.description += f"\nNo records found for `{callsign}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = await process_table(table[1:])
-
-            embed = cmn.embed_factory(ctx)
-            embed.title = f"AE7Q Application History for {callsign}"
-            embed.colour = cmn.colours.good
-            embed.url = base_url + callsign
-
-            # add the first three rows of the table to the embed
-            for row in table[0:3]:
-                header = f"**{row[1]}** ({row[3]})"     # **Name** (Callsign)
-                body = (f"Received: *{row[0]}*\n"
-                        f"Region: *{row[2]}*\n"
-                        f"Purpose: *{row[5]}*\n"
-                        f"Last Action: *{row[7]}*\n"
-                        f"Application Status: *{row[8]}*\n")
-                embed.add_field(name=header, value=body, inline=False)
-
-            if len(table) > 3:
-                desc += f"\nRecords 1 to 3 of {len(table)}. See ae7q.com for more..."
-
-            embed.description = desc
 
             await ctx.send(embed=embed)
-        """
+
-        raise NotImplementedError("Application history lookup not yet supported. "
+    @_ae7q_lookup.command(name="applications", aliases=["a", "apps"], category=cmn.cat.lookup)
-                                  "Check back in a later version of the bot.")
+    async def _ae7q_applications(self, ctx: commands.Context, query: str):
+        """Looks up the application history for a callsign, FRN, or Licensee ID on [ae7q.com](http://ae7q.com/)."""
+        with ctx.typing():
+            query = query.upper()
+
+            # LID
+            if re.match(r"L\d+", query):
+                data = ae7qparser.get_licensee_id(query)
+            # FRN
+            elif re.match(r"\d{10}", query):
+                data = ae7qparser.get_frn(query)
+            # callsign
+            else:
+                data = ae7qparser.get_call(query)
+
+            embed = cmn.embed_factory(ctx)
+            embed.title = f"AE7Q Application History for {query}"
+            embed.url = data.query_url
+            embed.colour = cmn.colours.good
+            embed.description = ""
+
+            if not data.application_history:
+                embed.colour = cmn.colours.bad
+                embed.description += f"\nNo records found for `{query}`"
+            else:
+                # add the first three rows of the app history to the embed
+                if isinstance(data.application_history, ae7qparser.ApplicationsHistoryTable):
+                    for row in data.application_history[0:3]:
+                        header = f"**{row.uls_file_number[0]}** ({row.receipt_date:%Y-%m-%d})"
+                        body = (f"Name: *{row.entity_name}*\n"
+                                f"Callsign: *{row.application_callsign}*\n"
+                                f"Region: *{row.region_state}*\n"
+                                f"Purpose: *{row.application_purpose}*\n")
+                        if row.payment_date:
+                            body += f"Payment: *{row.payment_date:%Y-%m-%d}*\n"
+                        if row.last_action_date:
+                            body += f"Last Action: *{row.last_action_date:%Y-%m-%d}*\n"
+                        body += f"Status: *{row.application_status}*"
+                        embed.add_field(name=header, value=body, inline=False)
+
+                elif isinstance(data.application_history, ae7qparser.VanityApplicationsHistoryTable):
+                    for row in data.application_history[0:3]:
+                        header = f"**{row.uls_file_number[0]}** ({row.receipt_date:%Y-%m-%d})"
+                        body = (f"Callsign: *{row.application_callsign}*\n"
+                                f"Region: *{row.region_state}*\n"
+                                f"Operator Class: *{row.operator_class}*\n"
+                                f"Purpose: *{row.application_purpose}*\n")
+                        if row.payment_date:
+                            body += f"Payment: *{row.payment_date:%Y-%m-%d}*\n"
+                        if row.last_action_date:
+                            body += f"Last Action: *{row.last_action_date:%Y-%m-%d}*\n"
+                        body += f"Status: *{row.application_status}*\n"
+                        if row.applied_callsigns:
+                            body += (f"Callsign{'s' if len(row.applied_callsigns) > 1 else ''} "
+                                     f"Applied For: *{', '.join(row.applied_callsigns)}*")
+                        embed.add_field(name=header, value=body, inline=False)
+
+                if len(data.application_history) > 3:
+                    embed.description += (f"\nRecords 1 to 3 of {len(data.application_history)}. "
+                                          f"See [ae7q.com]({data.query_url}) for more...")
+
+            await ctx.send(embed=embed)
+
+    @_ae7q_lookup.command(name="pending_apps", aliases=["pa"], category=cmn.cat.lookup)
+    async def _ae7q_pending_applications(self, ctx: commands.Context, query: str):
+        """Looks up the pending applications for a callsign, FRN, or Licensee ID on [ae7q.com](http://ae7q.com/)."""
+        with ctx.typing():
+            query = query.upper()
+
+            # LID
+            if re.match(r"L\d+", query):
+                data = ae7qparser.get_licensee_id(query)
+            # FRN
+            elif re.match(r"\d{10}", query):
+                data = ae7qparser.get_frn(query)
+            # callsign
+            else:
+                data = ae7qparser.get_call(query)
+
+            embed = cmn.embed_factory(ctx)
+            embed.title = f"AE7Q Pending Applications for {query}"
+            embed.url = data.query_url
+            embed.colour = cmn.colours.good
+            embed.description = ""
+
+            if not data.pending_applications:
+                embed.colour = cmn.colours.bad
+                embed.description += f"\nNo records found for `{query}`"
+            else:
+                # add the first three rows of the pending apps to the embed
+                if isinstance(data.pending_applications, ae7qparser.PendingApplicationsPredictionsTable):
+                    for row in data.pending_applications[0:3]:
+                        header = f"**{row.uls_file_number}** ({row.receipt_date:%Y-%m-%d})"
+                        body = (f"Callsign: *{row.applicant_callsign}*\n"
+                                f"Region: *{row.region_state}*\n"
+                                f"Operator Class: *{row.operator_class}*\n"
+                                f"Vanity Type: *{row.vanity_type}*\n")
+                        if row.process_date:
+                            body += f"Processes On: *{row.process_date:%Y-%m-%d}*\n"
+                        body += (f"Sequential #: *{row.sequential_number}*\n"
+                                 f"Vanity Callsign: *{row.vanity_callsign}*\n"
+                                 f"Prediction: *{row.prediction}*")
+                        embed.add_field(name=header, value=body, inline=False)
+
+                elif isinstance(data.pending_applications, ae7qparser.CallsignPendingApplicationsPredictionsTable):
+                    for row in data.pending_applications[0:3]:
+                        header = f"**{row.uls_file_number}** ({row.receipt_date:%Y-%m-%d})"
+                        body = (f"Callsign: *{row.applicant_callsign}*\n"
+                                f"Region: *{row.region_state}*\n"
+                                f"Operator Class: *{row.operator_class}*\n"
+                                f"Vanity Type: *{row.vanity_type}*\n")
+                        if row.process_date:
+                            body += f"Processes On: *{row.process_date:%Y-%m-%d}*\n"
+                        body += (f"Sequential #: *{row.sequential_number}*\n"
+                                 f"Prediction: *{row.prediction}*")
+                        embed.add_field(name=header, value=body, inline=False)
+
+                if len(data.pending_applications) > 3:
+                    embed.description += (f"\nRecords 1 to 3 of {len(data.pending_applications)}. "
+                                          f"See [ae7q.com]({data.query_url}) for more...")
+
+            await ctx.send(embed=embed)
+
+    @_ae7q_lookup.command(name="app_detail", aliases=["ad"], category=cmn.cat.lookup)
+    async def _ae7q_app_detail(self, ctx: commands.Context, ufn: str):
+        """Looks up the application data for a ULS file number on [ae7q.com](http://ae7q.com/)."""
+        with ctx.typing():
+            app_data = ae7qparser.get_application(ufn)
+
+            embed = cmn.embed_factory(ctx)
+            embed.title = f"AE7Q Application Data for {ufn}"
+            embed.url = app_data.query_url
+            embed.colour = cmn.colours.good
+
+            if not app_data.application_data:
+                embed.colour = cmn.colours.bad
+                embed.description += f"\nNo records found for `{ufn}`"
+            else:
+                if app_data.frn:
+                    embed.add_field(name="FRN", value=app_data.frn, inline=True)
+                if app_data.licensee_id:
+                    embed.add_field(name="Licensee ID", value=app_data.licensee_id, inline=True)
+                if app_data.applicant_type:
+                    embed.add_field(name="Applicant Type", value=app_data.applicant_type, inline=True)
+                if app_data.entity_type:
+                    embed.add_field(name="Entity Type", value=app_data.entity_type, inline=True)
+                if app_data.entity_name:
+                    embed.add_field(name="Name", value=app_data.entity_name, inline=True)
+                if app_data.callsign:
+                    embed.add_field(name="Callsign", value=app_data.callsign, inline=True)
+
+                address = f"ATTN: {app_data.attention}\n" if app_data.attention else ""
+                address += f"{app_data.street_address}\n" if app_data.street_address else ""
+                address += f"{app_data.po_box}\n" if app_data.po_box else ""
+                address += (f"{', '.join([app_data.locality, app_data.state.split('-')[0].strip()])}"
+                            f" {app_data.postal_code}")
+                if address:
+                    embed.add_field(name="Address", value=address, inline=True)
+                if app_data.county:
+                    embed.add_field(name="County", value=app_data.county, inline=True)
+                if app_data.maidenhead:
+                    embed.add_field(name="Grid Square", value=app_data.maidenhead, inline=True)
+                if app_data.uls_geo_region:
+                    embed.add_field(name="Region", value=app_data.uls_geo_region, inline=True)
+                if app_data.last_action_date:
+                    embed.add_field(name="Last Action", value=f"{app_data.last_action_date:%Y-%m-%d}", inline=True)
+                if app_data.receipt_date:
+                    embed.add_field(name="Receipt Date", value=f"{app_data.receipt_date:%Y-%m-%d}", inline=True)
+                if app_data.entered_timestamp:
+                    embed.add_field(name="Entered Time", value=f"{app_data.entered_timestamp:%Y-%m-%d}", inline=True)
+                if app_data.application_source:
+                    embed.add_field(name="Application Source", value=app_data.application_source, inline=True)
+                if app_data.application_purpose:
+                    embed.add_field(name="Purpose", value=app_data.application_purpose, inline=True)
+                if app_data.result:
+                    embed.add_field(name="Result", value=app_data.result, inline=True)
+                if app_data.fee_control_number:
+                    embed.add_field(name="Fee Control Number", value=app_data.fee_control_number, inline=True)
+                if app_data.payment_date:
+                    embed.add_field(name="Payment Date", value=f"{app_data.payment_date:%Y-%m-%d}", inline=True)
+                if app_data.operator_class:
+                    embed.add_field(name="Operator Class", value=app_data.operator_class, inline=True)
+                if app_data.operator_group:
+                    embed.add_field(name="Operator Group", value=app_data.operator_group, inline=True)
+                if app_data.uls_group:
+                    embed.add_field(name="ULS Group", value=app_data.uls_group, inline=True)
+                if app_data.vanity_type:
+                    embed.add_field(name="Vanity Type", value=app_data.vanity_type, inline=True)
+                if app_data.vanity_relationship:
+                    embed.add_field(name="Vanity Relationship", value=app_data.vanity_relationship, inline=True)
+                if app_data.trustee_name and app_data.trustee_callsign:
+                    embed.add_field(name="Trustee",
+                                    value=f"{app_data.trustee_name} ({app_data.trustee_callsign})",
+                                    inline=True)
+
+            await ctx.send(embed=embed)
 
     @_ae7q_lookup.command(name="frn", aliases=["f"], category=cmn.cat.lookup)
     async def _ae7q_frn(self, ctx: commands.Context, frn: str):
         """Looks up the history of an FRN on [ae7q.com](http://ae7q.com/)."""
-        """
-        NOTES:
-        - 2 tables: callsign history and application history
-        - If not found: no tables
-        """
         with ctx.typing():
-            base_url = "http://ae7q.com/query/data/FrnHistory.php?FRN="
+            frn = frn.upper()
-            embed = cmn.embed_factory(ctx)
 
-            async with self.session.get(base_url + frn) as resp:
+            frn_data = ae7qparser.get_frn(frn)
-                if resp.status != 200:
-                    raise cmn.BotHTTPError(resp)
-                page = await resp.text()
-
-            soup = BeautifulSoup(page, features="html.parser")
-            tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")]
-
-            if not len(tables):
-                embed.title = f"AE7Q History for FRN {frn}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + frn
-                embed.description = f"No records found for FRN `{frn}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = tables[0]
-
-            table_headers = table[0].find_all("th")
-            first_header = "".join(table_headers[0].strings) if len(table_headers) > 0 else None
-
-            # catch if the wrong table was selected
-            if first_header is None or not first_header.startswith("With Licensee"):
-                embed.title = f"AE7Q History for FRN {frn}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + frn
-                embed.description = f"No records found for FRN `{frn}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = await process_table(table[2:])
 
             embed = cmn.embed_factory(ctx)
-            embed.title = f"AE7Q History for FRN {frn}"
+            embed.title = f"AE7Q FRN History for {frn}"
+            embed.url = frn_data.query_url
             embed.colour = cmn.colours.good
-            embed.url = base_url + frn
+            embed.description = ""
 
-            # add the first three rows of the table to the embed
+            if not frn_data.frn_history:
-            for row in table[0:3]:
+                embed.colour = cmn.colours.bad
-                header = f"**{row[0]}** ({row[3]})"     # **Callsign** (Applicant Type)
+                embed.description += f"\nNo records found for `{frn}`"
-                body = (f"Name: *{row[2]}*\n"
+            else:
-                        f"Class: *{row[4]}*\n"
+                # add the first three rows of the FRN history to the embed
-                        f"Region: *{row[1]}*\n"
+                for row in frn_data.frn_history[0:3]:
-                        f"Status: *{row[5]}*\n"
+                    header = f"**{row.callsign}** ({row.applicant_type})"
-                        f"Granted: *{row[6]}*\n"
+                    body = (f"Name: *{row.entity_name}*\n"
-                        f"Effective: *{row[7]}*\n"
+                            f"Region: *{row.region_state}*\n"
-                        f"Cancelled: *{row[8]}*\n"
+                            f"Operator Class: *{row.operator_class}*\n"
-                        f"Expires: *{row[9]}*")
+                            f"Status: *{row.license_status}*\n")
-                embed.add_field(name=header, value=body, inline=False)
+                    if row.grant_date:
+                        body += f"Granted: *{row.grant_date:%Y-%m-%d}*\n"
+                    if row.effective_date:
+                        body += f"Effective: *{row.effective_date:%Y-%m-%d}*\n"
+                    if row.cancel_date:
+                        body += f"Cancelled: *{row.cancel_date:%Y-%m-%d}*\n"
+                    if row.expire_date:
+                        body += f"Expires: *{row.expire_date:%Y-%m-%d}*\n"
+                    embed.add_field(name=header, value=body, inline=False)
 
-            if len(table) > 3:
+                if len(frn_data.frn_history) > 3:
-                embed.description = f"Records 1 to 3 of {len(table)}. See ae7q.com for more..."
+                    embed.description += (f"\nRecords 1 to 3 of {len(frn_data.frn_history)}. "
+                                          f"See [ae7q.com]({frn_data.query_url}) for more...")
 
             await ctx.send(embed=embed)
 
@@ -310,87 +415,43 @@ class AE7QCog(commands.Cog):
         """Looks up the history of a licensee ID on [ae7q.com](http://ae7q.com/)."""
         with ctx.typing():
             licensee_id = licensee_id.upper()
-            base_url = "http://ae7q.com/query/data/LicenseeIdHistory.php?ID="
-            embed = cmn.embed_factory(ctx)
 
-            async with self.session.get(base_url + licensee_id) as resp:
+            lid_data = ae7qparser.get_licensee_id(licensee_id)
-                if resp.status != 200:
-                    raise cmn.BotHTTPError(resp)
-                page = await resp.text()
-
-            soup = BeautifulSoup(page, features="html.parser")
-            tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")]
-
-            if not len(tables):
-                embed.title = f"AE7Q History for Licensee {licensee_id}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + licensee_id
-                embed.description = f"No records found for Licensee `{licensee_id}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = tables[0]
-
-            table_headers = table[0].find_all("th")
-            first_header = "".join(table_headers[0].strings) if len(table_headers) > 0 else None
-
-            # catch if the wrong table was selected
-            if first_header is None or not first_header.startswith("With FCC"):
-                embed.title = f"AE7Q History for Licensee {licensee_id}"
-                embed.colour = cmn.colours.bad
-                embed.url = base_url + licensee_id
-                embed.description = f"No records found for Licensee `{licensee_id}`"
-                await ctx.send(embed=embed)
-                return
-
-            table = await process_table(table[2:])
 
             embed = cmn.embed_factory(ctx)
             embed.title = f"AE7Q History for Licensee {licensee_id}"
+            embed.url = lid_data.query_url
             embed.colour = cmn.colours.good
-            embed.url = base_url + licensee_id
+            embed.description = ""
 
-            # add the first three rows of the table to the embed
+            if not lid_data.licensee_id_history:
-            for row in table[0:3]:
+                embed.colour = cmn.colours.bad
-                header = f"**{row[0]}** ({row[3]})"     # **Callsign** (Applicant Type)
+                embed.description += f"\nNo records found for `{licensee_id}`"
-                body = (f"Name: *{row[2]}*\n"
+            else:
-                        f"Class: *{row[4]}*\n"
+                # add the first three rows of the FRN history to the embed
-                        f"Region: *{row[1]}*\n"
+                for row in lid_data.licensee_id_history[0:3]:
-                        f"Status: *{row[5]}*\n"
+                    header = f"**{row.callsign}** ({row.applicant_type})"
-                        f"Granted: *{row[6]}*\n"
+                    body = (f"Name: *{row.entity_name}*\n"
-                        f"Effective: *{row[7]}*\n"
+                            f"Region: *{row.region_state}*\n"
-                        f"Cancelled: *{row[8]}*\n"
+                            f"Operator Class: *{row.operator_class}*\n"
-                        f"Expires: *{row[9]}*")
+                            f"Status: *{row.license_status}*\n")
-                embed.add_field(name=header, value=body, inline=False)
+                    if row.grant_date:
+                        body += f"Granted: *{row.grant_date:%Y-%m-%d}*\n"
+                    if row.effective_date:
+                        body += f"Effective: *{row.effective_date:%Y-%m-%d}*\n"
+                    if row.cancel_date:
+                        body += f"Cancelled: *{row.cancel_date:%Y-%m-%d}*\n"
+                    if row.expire_date:
+                        body += f"Expires: *{row.expire_date:%Y-%m-%d}*\n"
 
-            if len(table) > 3:
+                    embed.add_field(name=header, value=body, inline=False)
-                embed.description = f"Records 1 to 3 of {len(table)}. See ae7q.com for more..."
+
+                if len(lid_data.licensee_id_history) > 3:
+                    embed.description += (f"\nRecords 1 to 3 of {len(lid_data.licensee_id_history)}. "
+                                          f"See [ae7q.com]({lid_data.query_url}) for more...")
 
             await ctx.send(embed=embed)
 
 
-async def process_table(table: list):
-    """Processes tables (*not* including headers) and returns the processed table"""
-    table_contents = []
-    for tr in table:
-        row = []
-        for td in tr.find_all("td"):
-            cell_val = td.getText().strip()
-            row.append(cell_val if cell_val else "-")
-
-            # take care of columns that span multiple rows by copying the contents rightward
-            if "colspan" in td.attrs and int(td.attrs["colspan"]) > 1:
-                for i in range(int(td.attrs["colspan"]) - 1):
-                    row.append(row[-1])
-
-        # get rid of ditto marks by copying the contents from the previous row
-        for i, cell in enumerate(row):
-            if cell == "\"":
-                row[i] = table_contents[-1][i]
-        # add row to table
-        table_contents += [row]
-    return table_contents
-
-
 def setup(bot: commands.Bot):
     bot.add_cog(AE7QCog(bot))

exts/base.py

@@ -46,9 +46,9 @@ class QrmHelpCommand(commands.HelpCommand):
             if parent:
                 fmt = f"{parent} {fmt}"
             alias = fmt
-            return f"{opt.display_prefix}{alias} {command.signature}\n    *Aliases:* {aliases}"
+            return f"{opt.prefix}{alias} {command.signature}\n    *Aliases:* {aliases}"
         alias = command.name if not parent else f"{parent} {command.name}"
-        return f"{opt.display_prefix}{alias} {command.signature}"
+        return f"{opt.prefix}{alias} {command.signature}"
 
     async def send_error_message(self, error):
         embed = cmn.embed_factory(self.context)
@@ -60,7 +60,7 @@ class QrmHelpCommand(commands.HelpCommand):
     async def send_bot_help(self, mapping):
         embed = cmn.embed_factory(self.context)
         embed.title = "qrm Help"
-        embed.description = (f"For command-specific help and usage, use `{opt.display_prefix}help [command name]`."
+        embed.description = (f"For command-specific help and usage, use `{opt.prefix}help [command name]`."
                              " Many commands have shorter aliases.")
         mapping = await mapping
 

exts/dbconv.py

@@ -1,201 +0,0 @@
-"""
-Conversion extension for qrm
----
-Copyright (C) 2020 Abigail Gold, 0x5c
-
-This file is part of qrm2 and is released under the terms of
-the GNU General Public License, version 2.
-"""
-
-
-import math
-from enum import Enum
-from typing import Optional
-
-import discord.ext.commands as commands
-
-import common as cmn
-from data import options as opt
-
-
-# not sure why but UnitConverter and Unit need to be defined before DbConvCog and convert()
-class UnitConverter(commands.Converter):
-    async def convert(self, ctx: commands.Context, argument: str):
-        try:
-            return Unit(argument)
-        except ValueError as e:
-            raise commands.BadArgument(message=str(e))
-
-
-class Unit:
-    def __init__(self, raw: str):
-        self.raw: str = raw
-        self.unit: str
-        self.type: UnitType
-        self.is_db: bool
-        self.mult: int
-        self._parse()
-
-    def _parse(self):
-        s = self.raw.lower()
-        if len(s) > 2 and s[:2] == "db":
-            self.is_db = True
-            if s[2:] in units:
-                u = units[s[2:]]
-                self.mult = u["mult"]
-                self.unit = u["log"]
-                self.type = u["type"]
-        elif s in units:
-            self.is_db = False
-            u = units[s]
-            self.mult = u["mult"]
-            self.unit = u["scalar"]
-            self.type = u["type"]
-        else:
-            raise ValueError(f"Invalid unit: {self.raw}")
-
-    def __str__(self):
-        return self.unit
-
-
-class UnitType(Enum):
-    voltage = 1
-    power = 2
-    antenna = 3
-
-
-class DbConvCog(commands.Cog):
-    def __init__(self, bot: commands.Bot):
-        self.bot = bot
-
-    @commands.command(name="dbconv", aliases=["dbc"], category=cmn.cat.ref)
-    async def _db_conv(self, ctx: commands.Context,
-                       value: Optional[float] = None,
-                       unit_from: Optional[UnitConverter] = None,
-                       unit_to: Optional[UnitConverter] = None):
-        """
-        Convert between decibels and scalar values for voltage, power, and antenna gain.
-
-        **Valid Units**
-        *Voltage:* V, mV, µV, uV, dBV, dBmV, dBµV, dBuV
-        *Power:* fW, mW, W, kW, dBf, dBm, dBW, dBk
-        *Antenna Gain:* dBi, dBd, dBq
-        """
-        embed = cmn.embed_factory(ctx)
-        if value is not None and unit_from is not None and unit_to is not None:
-            converted = convert(value, unit_from, unit_to)
-
-            embed.title = f"{value:.3g} {unit_from} = {converted:.3g} {unit_to}"
-            embed.colour = cmn.colours.good
-        else:
-            embed.title = "Decibel Quick Reference"
-            embed.description = (
-                "Decibels are a great way to easily represent large quantities that are common in electronics. "
-                "There are a few main types that are used often in radio: voltage, power, and antenna gain. "
-                "Here are some commonly-used reference levels for each type:"
-            )
-            v_db_info = ("**dBV** = relative to 1 V\n"
-                         "**dBmV** = relative to 1 mV (1e-3 V)\n"
-                         "**dBµV** = relative to 1 µV (1e-6 V)")
-            embed.add_field(name="Voltage Decibels", value=v_db_info, inline=False)
-            p_db_info = ("**dBW** = relative to 1 W\n"
-                         "**dBk** = relative to 1 kW (1e3 W)\n"
-                         "**dBm** = relative to 1 mW (1e-3 W)\n"
-                         "**dBf** = relative to 1 fW (1e-15 W)")
-            embed.add_field(name="Power Decibels", value=p_db_info, inline=False)
-            a_db_info = ("**dBi** = relative to a theoretical __i__sotropic radiator in free space "
-                         "(equal radiation in all directions)\n"
-                         "**dBd** = relative to a dipole in free space (0 dBd = 2.15 dBi)\n"
-                         "**dBq** = relative to a quarter-wave antenna in free space (0 dBq = -0.85 dBi)")
-            embed.add_field(name="Antenna Gain Decibels", value=a_db_info, inline=False)
-            embed.add_field(name="Use the bot to do the conversions",
-                            value=f"`{opt.display_prefix}dbconv [value] [unit_from] [unit_to]`",
-                            inline=False)
-        await ctx.send(embed=embed)
-
-
-def setup(bot: commands.Bot):
-    bot.add_cog(DbConvCog(bot))
-
-
-def convert(initial: float, unit1: Unit, unit2: Unit):
-    if unit1.type == unit2.type:
-        # dB to dB
-        if unit1.is_db and unit2.is_db:
-            if unit1.mult == unit2.mult:
-                return initial
-            elif unit1.type == UnitType.voltage:
-                return _calc_volt_db(_calc_volt(initial, unit1.mult), unit2.mult)
-            elif unit1.type == UnitType.power:
-                return _calc_power_db(_calc_power(initial, unit1.mult), unit2.mult)
-            elif unit1.type == UnitType.antenna:
-                return initial + (unit1.mult - unit2.mult)
-        # V/W to V/W
-        elif not unit1.is_db and not unit2.is_db:
-            if unit1.mult == unit2.mult:
-                return initial
-            return initial * unit1.mult / unit2.mult
-        # dB to V/W
-        elif unit1.is_db and not unit2.is_db:
-            if unit1.type == UnitType.voltage:
-                return _calc_volt(initial, unit1.mult) / unit2.mult
-            elif unit1.type == UnitType.power:
-                return _calc_power(initial, unit1.mult) / unit2.mult
-        # V/W to dB
-        elif not unit1.is_db and unit2.is_db:
-            if unit1.type == UnitType.voltage:
-                return _calc_volt_db(initial * unit1.mult, unit2.mult)
-            elif unit1.type == UnitType.power:
-                return _calc_power_db(initial * unit1.mult, unit2.mult)
-    raise ValueError(f"Can't convert between {unit1} and {unit2}")
-
-
-units = {
-    # voltage
-    "uv": {"mult": 1e-6,  "scalar": "µV", "log": "dBµV", "type": UnitType.voltage},
-    "µv": {"mult": 1e-6,  "scalar": "µV", "log": "dBµV", "type": UnitType.voltage},
-    "mv": {"mult": 1e-3,  "scalar": "mV", "log": "dBmV", "type": UnitType.voltage},
-    "v":  {"mult": 1,     "scalar":  "V", "log":  "dBV", "type": UnitType.voltage},
-    # power
-    "fw": {"mult": 1e-15, "scalar": "fW", "log":  "dBf", "type": UnitType.power},
-    "f":  {"mult": 1e-15, "scalar": "fW", "log":  "dBf", "type": UnitType.power},
-    "mw": {"mult": 1e-3,  "scalar": "mW", "log":  "dBm", "type": UnitType.power},
-    "m":  {"mult": 1e-3,  "scalar": "mW", "log":  "dBm", "type": UnitType.power},
-    "w":  {"mult": 1,     "scalar":  "W", "log":  "dBW", "type": UnitType.power},
-    "kw": {"mult": 1e3,   "scalar": "kW", "log":  "dBk", "type": UnitType.power},
-    "k":  {"mult": 1e3,   "scalar": "kW", "log":  "dBk", "type": UnitType.power},
-    # antenna
-    "q":  {"mult": -0.85, "scalar": None, "log":  "dBq", "type": UnitType.antenna},
-    "i":  {"mult": 0,     "scalar": None, "log":  "dBi", "type": UnitType.antenna},
-    "d":  {"mult": 2.15,  "scalar": None, "log":  "dBd", "type": UnitType.antenna},
-}
-
-
-def _calc_power_db(p: float, ref: float):
-    return 10 * math.log10(p / ref)
-
-
-def _calc_power(db: float, ref: float):
-    return 10 ** (db / 10) * ref
-
-
-def _calc_volt_db(v: float, ref: float):
-    return 20 * math.log10(v / ref)
-
-
-def _calc_volt(db: float, ref: float):
-    return 10 ** (db / 20) * ref
-
-
-# testing code
-if __name__ == "__main__":
-    while(True):
-        try:
-            ip = input("> ").split()
-            initial = float(ip[0])
-            unit1 = Unit(ip[1])
-            unit2 = Unit(ip[2])
-            conv = convert(initial, unit1, unit2)
-            print(f"{initial:.2f} {unit1} = {conv:.2f} {unit2}")
-        except ValueError as e:
-            print(e)

exts/fun.py

@@ -10,7 +10,6 @@ the GNU General Public License, version 2.
 
 import random
 
-import discord
 import discord.ext.commands as commands
 
 import common as cmn
@@ -37,16 +36,6 @@ class FunCog(commands.Cog):
         """Returns xkcd: Standards."""
         await ctx.send("http://xkcd.com/927")
 
-    @commands.command(name="worksplit", aliases=["split", "ft8"], category=cmn.cat.fun)
-    async def _worksplit(self, ctx: commands.Context):
-        """Posts "Work split you lids"."""
-        fn = "worksplit.jpg"
-        embed = cmn.embed_factory(ctx)
-        embed.title = "Work Split, You Lids!"
-        embed.set_image(url="attachment://" + fn)
-        img = discord.File(cmn.paths.img / fn, filename=fn)
-        await ctx.send(embed=embed, file=img)
-
     @commands.command(name="xd", hidden=True, category=cmn.cat.fun)
     async def _xd(self, ctx: commands.Context):
         """ecks dee"""

exts/ham.py

@@ -21,7 +21,6 @@ from resources import qcodes
 class HamCog(commands.Cog):
     def __init__(self, bot: commands.Bot):
         self.bot = bot
-        self.pfxs = callsign_info.options
 
     @commands.command(name="qcode", aliases=["q"], category=cmn.cat.ref)
     async def _qcode_lookup(self, ctx: commands.Context, qcode: str):
@@ -65,26 +64,22 @@ class HamCog(commands.Cog):
         await ctx.send(embed=embed)
 
     @commands.command(name="prefixes", aliases=["vanity", "pfx", "vanities", "prefix"], category=cmn.cat.ref)
-    async def _vanity_prefixes(self, ctx: commands.Context, country: str = ""):
+    async def _vanity_prefixes(self, ctx: commands.Context, country: str = None):
         """Lists valid callsign prefixes for different countries."""
-        country = country.lower()
+        if country is None:
-        embed = cmn.embed_factory(ctx)
+            await ctx.send_help(ctx.command)
-        if country not in self.pfxs:
-            desc = "Possible arguments are:\n"
-            for key, val in self.pfxs.items():
-                desc += f"`{key}`: {val.title}{('  ' + val.emoji if val.emoji else '')}\n"
-            embed.title = f"{country} Not Found!"
-            embed.description = desc
-            embed.colour = cmn.colours.bad
-            await ctx.send(embed=embed)
             return
+        embed = cmn.embed_factory(ctx)
+        if country.lower() not in callsign_info.options:
+            embed.title = f"{country} not found!"
+            embed.description = f"Valid countries: {', '.join(callsign_info.options.keys())}"
+            embed.colour = cmn.colours.bad
         else:
-            data = self.pfxs[country]
+            embed.title = callsign_info.options[country.lower()][0]
-            embed.title = data.title + ("  " + data.emoji if data.emoji else "")
+            embed.description = callsign_info.options[country.lower()][1]
-            embed.description = data.desc
             embed.colour = cmn.colours.good
 
-            for name, val in data.calls.items():
+            for name, val in callsign_info.options[country.lower()][2].items():
                 embed.add_field(name=name, value=val, inline=False)
         await ctx.send(embed=embed)
 

info.py

@@ -12,5 +12,5 @@ authors = ("@ClassAbbyAmplifier#2229", "@0x5c#0639")
 description = """A bot with various useful ham radio-related functions, written in Python."""
 license = "Released under the GNU General Public License v2"
 contributing = "Check out the source on GitHub, contributions welcome: https://github.com/miaowware/qrm2"
-release = "2.4.0"
+release = "2.3.1"
 bot_server = "https://discord.gg/Ntbg3J4"

main.py

@@ -193,10 +193,7 @@ async def _ensure_activity_time():
     try:
         tz = pytz.timezone(opt.status_tz)
     except pytz.exceptions.UnknownTimeZoneError:
-        status = "with invalid timezones"
+        await bot.change_presence(activity=discord.Game(name="with invalid timezones."))
-        if opt.show_help:
-            status += f" | {opt.display_prefix}help"
-        await bot.change_presence(activity=discord.Game(name=status))
         return
 
     now = datetime.now(tz=tz).time()
@@ -206,8 +203,6 @@ async def _ensure_activity_time():
         end_time = time(hour=sts[2][0], minute=sts[2][1], tzinfo=tz)
         if start_time < now <= end_time:
             status = sts[0]
-            if opt.show_help:
-                status += f" | {opt.display_prefix}help"
 
     await bot.change_presence(activity=discord.Game(name=status))
 
@@ -215,8 +210,6 @@ async def _ensure_activity_time():
 @tasks.loop(minutes=5)
 async def _ensure_activity_random():
     status = random.choice(opt.statuses)
-    if opt.show_help:
-        status += f" | {opt.display_prefix}help"
 
     await bot.change_presence(activity=discord.Game(name=status))
 
@@ -224,8 +217,6 @@ async def _ensure_activity_random():
 @tasks.loop(minutes=5)
 async def _ensure_activity_fixed():
     status = opt.statuses[0]
-    if opt.show_help:
-        status += f" | {opt.display_prefix}help"
 
     await bot.change_presence(activity=discord.Game(name=status))
 

requirements.txt

@@ -1,5 +1,6 @@
-discord.py==1.3.4
+discord.py
-ctyparser==2.0.0.post1
+ctyparser
-beautifulsoup4==4.9.1
+beautifulsoup4
-lxml==4.5.2
+lxml
-pytz==2020.1
+pytz
+ae7qparser

resources/callsign_info.py

@@ -1,5 +1,5 @@
 """
-Information about callsigns for the prefixes command in hamcog.
+Information about callsigns for the vanity prefixes command in hamcog.
 ---
 Copyright (C) 2019-2020 Abigail Gold, 0x5c
 
@@ -7,12 +7,49 @@ This file is part of discord-qrmbot and is released under the terms of
 the GNU General Public License, version 2.
 """
 
-from .callsigninfos import (us, ca)
-from common import CallsignInfoData
 
+us_calls_title = "Valid US Vanity Callsigns"
+us_calls_desc = ("#x# is the number of letters in the prefix and suffix of a callsign. "
+                 "E.g., WY4RC would be a 2x2 callsign, with prefix WY and suffix RC.")
+us_calls = {
+                "**Group A** (Extra Only)": ("**Any:** K, N, W (1x2)\n"
+                                             "    AA-AL, KA-KZ, NA-NZ, WA-WZ (2x1)\n"
+                                             "    AA-AL (2x2)\n"
+                                             "*Except*\n"
+                                             "**Alaska:** AL, KL, NL, WL (2x1)\n"
+                                             "**Caribbean:** KP, NP, WP (2x1)\n"
+                                             "**Pacific:** AH, KH, NH, WH (2x1)"),
+                "**Group B** (Advanced and Extra Only)": ("**Any:** KA-KZ, NA-NZ, WA-WZ (2x2)\n"
+                                                          "*Except*\n"
+                                                          "**Alaska:** AL (2x2)\n"
+                                                          "**Caribbean:** KP (2x2)\n"
+                                                          "**Pacific:** AH (2x2)"),
+                "**Group C** (Technician, General, Advanced, Extra Only)": ("**Any Region:** K, N, W (1x3)\n"
+                                                                            "*Except*\n"
+                                                                            "**Alaska:** KL, NL, WL (2x2)\n"
+                                                                            "**Caribbean:** NP, WP (2x2)\n"
+                                                                            "**Pacific:** KH, NH, WH (2x2)"),
+                "**Group D** (Any License Class)": ("**Any Region:** KA-KZ, WA-WZ (2x3)\n"
+                                                    "*Except*\n"
+                                                    "**Alaska:** KL, WL (2x3)\n"
+                                                    "**Caribbean:** KP, WP (2x3)\n"
+                                                    "**Pacific:** KH, WH (2x3)"),
+                "**Unavailable**": ("- KA2AA-KA9ZZ: US Army in Japan\n"
+                                    "- KC4AAA-KC4AAF: NSF in Antartica\n"
+                                    "- KC4USA-KC4USZ: US Navy in Antartica\n"
+                                    "- KG4AA-KG4ZZ: US Navy in Guantanamo Bay\n"
+                                    "- KL9KAA-KL9KHZ: US military in Korea\n"
+                                    "- KC6AA-KC6ZZ: Former US (Eastern and Western Caroline Islands), "
+                                    "now Federated States of Micronesia (V6) and Republic of Palau (T8)\n"
+                                    "- KX6AA-KX6ZZ: Former US (Marshall Islands), "
+                                    "now Republic of the Marshall Islands (V73)\n"
+                                    "- Any suffix SOS or QRA-QUZ\n"
+                                    "- Any 2x3 with X as the first suffix letter\n"
+                                    "- Any 2x3 with AF, KF, NF, or WF prefix and suffix EMA: FEMA\n"
+                                    "- Any 2x3 with AA-AL, NA-NZ, WC, WK, WM, WR, or WT prefix: \"Group X\"\n"
+                                    "- Any 2x1, 2x2, or 2x3 with KP, NP, WP prefix and 0, 6, 7, 8, 9 number\n"
+                                    "- Any 1x1 callsign: Special Event")
+           }
 
 # format: country: (title, description, text)
-options = {
+options = {"us": (us_calls_title, us_calls_desc, us_calls)}
-    "us": CallsignInfoData([us.title, us.desc, us.calls, us.emoji]),
-    "ca": CallsignInfoData([ca.title, ca.desc, ca.calls, ca.emoji]),
-}

resources/callsigninfos/__init__.py

@@ -1,3 +0,0 @@
-"""
-Callsign info for various countries
-"""

resources/callsigninfos/ca.py

@@ -1,47 +0,0 @@
-"""
-Information about callsigns for the CA prefixes command in hamcog.
----
-Copyright (C) 2019-2020 Abigail Gold, 0x5c
-
-This file is part of discord-qrmbot and is released under the terms of
-the GNU General Public License, version 2.
-"""
-
-
-title = "Canadian Callsign Rules"
-emoji = "🇨🇦"
-desc = ("Canadian operators are limited to callsigns with the prefixes of their address' province/territory. "
-        "Initially, operators can choose a callsign with a 3-letter suffix. "
-        "Later on, they can apply to change or for additional callsigns. "
-        "Operators can only hold one 2-letter suffix callsign, but many 3-letter suffix callsigns. "
-        "If the number of 2-letter suffix callsigns exceeds 80% of the total available, "
-        "operators can only choose a 2-letter suffix after holding a license for 5 years. "
-        "If the operator is a family member of a deceased operator, they are not bound by this restriction. "
-        "Data from [ISED Canada (RIC-9)](https://www.ic.gc.ca/eic/site/smt-gst.nsf/eng/sf02102.html).")
-calls = {
-    "Provinces": (
-        "**Nova Scotia:** VE1 and VA1\n"
-        "**Québec:** VE2 and VA2\n"
-        "**Ontario:** VE3 and VA3\n"
-        "**Manitoba:** VE4 and VA4\n"
-        "**Saskatchewan:** VE5 and VA5\n"
-        "**Alberta:** VE6 and VA6\n"
-        "**British Columbia:** VE7 and VA7\n"
-        "**New Brunswick:** VE9\n"
-        "**Newfoundland:** VO1\n"
-        "**Labrador:** VO2\n"
-        "**Prince Edward Island:** VY2\n"
-    ),
-    "Territories": (
-        "**Northwest Territories:** VE8\n"
-        "**Nunavut:** VY0\n"
-        "**Yukon:** VY1\n"
-    ),
-    "Other": (
-        "**International Waters:** VE0\n"
-        "**Government of Canada:** VY9\n"
-        "**Sable Island:** CY0\n"
-        "**St-Paul Island:** CY9\n"
-    ),
-    "Special Event": "Various prefixes in the ranges: CF-CK, CY-CZ, VA-VG, VO, VX-VY, XJ-XO"
-}

resources/callsigninfos/us.py

@@ -1,53 +0,0 @@
-"""
-Information about callsigns for the US prefixes command in hamcog.
----
-Copyright (C) 2019-2020 Abigail Gold, 0x5c
-
-This file is part of discord-qrmbot and is released under the terms of
-the GNU General Public License, version 2.
-"""
-
-
-title = "US Callsign Rules"
-emoji = "🇺🇸"
-desc = ("#x# is the number of letters in the prefix and suffix of a callsign. "
-        "E.g., WY4RC would be a 2x2 callsign, with prefix WY and suffix RC.")
-calls = {
-    "**Group A** (Extra Only)": ("**Any:** K, N, W (1x2)\n"
-                                 "    AA-AL, KA-KZ, NA-NZ, WA-WZ (2x1)\n"
-                                 "    AA-AL (2x2)\n"
-                                 "*Except*\n"
-                                 "**Alaska:** AL, KL, NL, WL (2x1)\n"
-                                 "**Caribbean:** KP, NP, WP (2x1)\n"
-                                 "**Pacific:** AH, KH, NH, WH (2x1)"),
-    "**Group B** (Advanced and Extra Only)": ("**Any:** KA-KZ, NA-NZ, WA-WZ (2x2)\n"
-                                              "*Except*\n"
-                                              "**Alaska:** AL (2x2)\n"
-                                              "**Caribbean:** KP (2x2)\n"
-                                              "**Pacific:** AH (2x2)"),
-    "**Group C** (Technician, General, Advanced, Extra Only)": ("**Any Region:** K, N, W (1x3)\n"
-                                                                "*Except*\n"
-                                                                "**Alaska:** KL, NL, WL (2x2)\n"
-                                                                "**Caribbean:** NP, WP (2x2)\n"
-                                                                "**Pacific:** KH, NH, WH (2x2)"),
-    "**Group D** (Any License Class)": ("**Any Region:** KA-KZ, WA-WZ (2x3)\n"
-                                        "*Except*\n"
-                                        "**Alaska:** KL, WL (2x3)\n"
-                                        "**Caribbean:** KP, WP (2x3)\n"
-                                        "**Pacific:** KH, WH (2x3)"),
-    "**Unavailable**": ("- KA2AA-KA9ZZ: US Army in Japan\n"
-                        "- KC4AAA-KC4AAF: NSF in Antartica\n"
-                        "- KC4USA-KC4USZ: US Navy in Antartica\n"
-                        "- KG4AA-KG4ZZ: US Navy in Guantanamo Bay\n"
-                        "- KL9KAA-KL9KHZ: US military in Korea\n"
-                        "- KC6AA-KC6ZZ: Former US (Eastern and Western Caroline Islands), "
-                        "now Federated States of Micronesia (V6) and Republic of Palau (T8)\n"
-                        "- KX6AA-KX6ZZ: Former US (Marshall Islands), "
-                        "now Republic of the Marshall Islands (V73)\n"
-                        "- Any suffix SOS or QRA-QUZ\n"
-                        "- Any 2x3 with X as the first suffix letter\n"
-                        "- Any 2x3 with AF, KF, NF, or WF prefix and suffix EMA: FEMA\n"
-                        "- Any 2x3 with AA-AL, NA-NZ, WC, WK, WM, WR, or WT prefix: \"Group X\"\n"
-                        "- Any 2x1, 2x2, or 2x3 with KP, NP, WP prefix and 0, 6, 7, 8, 9 number\n"
-                        "- Any 1x1 callsign: Special Event")
-}

resources/img/maps/meta.json

@@ -1,10 +1,6 @@
 {
-    "arrl": ["arrl-rac.png", "ARRL Sections", "ARRL Sections", "", "[EI8IC](https://www.mapability.com/ei8ic/maps/maps.php)", "🇺🇸"],
+    "arrl": ["arrl-rac.png", "ARRL Sections", "ARRL Sections", "", "", "🇺🇸"],
-    "rac": ["arrl-rac.png", "RAC Sections", "RAC Sections", "", "[EI8IC](https://www.mapability.com/ei8ic/maps/maps.php)", "🇨🇦"],
+    "rac": ["arrl-rac.png", "RAC Sections", "RAC Sections", "", "", "🇨🇦"],
     "cn": ["cn.png", "China's Prefixes", "Map of prefix regions in China", "", "CRAC", "🇨🇳"],
-    "us": ["us.png", "USA's Prefixes", "Map of prefix regions in the USA", "", "*[ARRL WAS Map](https://www.arrl.org/was-forms)*  [[PDF]](http://www.arrl.org/files/file/Awards%20Application%20Forms/WASmap_Color.pdf)", "🇺🇸"],
+    "us": ["us.png", "USA's Prefixes", "Map of prefix regions in the USA", "", "*[ARRL WAS Map](https://www.arrl.org/was-forms)*  [[PDF]](http://www.arrl.org/files/file/Awards%20Application%20Forms/WASmap_Color.pdf)", "🇺🇸"]
-    "ca": ["ca.png", "Canada's Prefixes", "Map of the prefix regions in Canada", "", "[Denelson83 (Wikimedia Commons)](https://commons.wikimedia.org/wiki/File:Amateur_radio_prefixes_in_Canada.svg)", "🇨🇦"],
-    "ituz": ["itu-zones.png", "ITU Zones", "ITU Zones", "", "[EI8IC](https://www.mapability.com/ei8ic/maps/maps.php)", "🇺🇳"],
-    "itur": ["itu-regions.png", "ITU Regions", "ITU Regions", "These are also used by the IARU for their regions.", "[EI8IC](https://www.mapability.com/ei8ic/maps/maps.php)", "🇺🇳"],
-    "cq": ["cq-zones.png", "CQ Zones", "CQ Zones", "These are used for the CQWW contest.", "[EI8IC](https://www.mapability.com/ei8ic/maps/maps.php)", "🌐"]
 }

templates/data/options.py

@@ -15,10 +15,7 @@ Settings and options for the bot.
 
 # The prefix for the bot (str). Define a list of stings for multiple prefixes.
 # ie: `["?", "!", "pls "]`
-prefix = ["? ", "?"]
+prefix = "?"
-
-# The prefix to use for display purposes (ex: status message).
-display_prefix = "?"
 
 # Whether the bot should print full stacktraces for normal exceptions: `True`,
 # or be nice and only print small messages: `False` (the default).
@@ -30,7 +27,7 @@ debug = False
 owners_uids = (200102491231092736,)
 
 # The extensions to load when running the bot.
-exts = ["ae7q", "base", "fun", "grid", "ham", "image", "lookup", "morse", "qrz", "study", "weather", "dbconv"]
+exts = ["ae7q", "base", "fun", "grid", "ham", "image", "lookup", "morse", "qrz", "study", "weather"]
 
 # Either "time", "random", or "fixed" (first item in statuses)
 status_mode = "fixed"
@@ -49,9 +46,6 @@ time_statuses = [("with lids on 3.840", (00, 00), (6, 00)),
                  ("with lids on 7.200", (18, 00), (20, 00)),
                  ("with lids on 3.840", (20, 00), (23, 59))]
 
-# append " | {display_prefix}help" to the Discord playing status
-show_help = False
-
 # Emoji IDs and keywords for emoji reactions
 # Use the format {emoji_id (int): ("tuple", "of", "lowercase", "keywords")}
 msg_reacts = {}