Merge pull request #471 from miaowware/rel-2.9.1

rel 2.9.1

.github/workflows/release.yml

@@ -12,6 +12,8 @@ jobs:
   release:
     name: Create Release
     runs-on: ubuntu-20.04
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -46,12 +48,10 @@ jobs:
 
       - name: Publish Release
         id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: ncipollo/release-action@v1
         with:
-          tag_name: ${{ env.tag_version }}
-          release_name: ${{ env.tag_subject }}
+          tag: ${{ env.tag_version }}
+          name: ${{ env.tag_subject }}
           body: |
             ${{ env.tag_body }}
 

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 
+## [2.9.1] - 2023-01-29
+### Fixed
+- Issue where embeds would not work for users without avatars (#467).
+- Issue where embeds would show the wrong timezone.
+- Several issues with `?call` caused by issues in a library (#466).
+
+
 ## [2.9.0] - 2023-01-13
 ### Changed
 - Migrated to Pycord.
@@ -239,7 +246,8 @@ 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.9.0...HEAD
+[Unreleased]: https://github.com/miaowware/qrm2/compare/v2.9.1...HEAD
+[2.9.1]: https://github.com/miaowware/qrm2/releases/tag/v2.9.1
 [2.9.0]: https://github.com/miaowware/qrm2/releases/tag/v2.9.0
 [2.8.0]: https://github.com/miaowware/qrm2/releases/tag/v2.8.0
 [2.7.6]: https://github.com/miaowware/qrm2/releases/tag/v2.7.6

README.md

@@ -38,7 +38,7 @@ All issues and requests related to resources (including maps, band charts, data)
 
 ## Copyright
 
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 This program is released under the terms of the *Québec Free and Open-Source Licence – Strong Reciprocity (LiLiQ-R+)*, version 1.1.  
 See [`LICENCE`](LICENCE) for full license text (Français / English).

common.py

@@ -1,7 +1,7 @@
 """
 Common tools for the bot.
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """
@@ -12,7 +12,7 @@ import enum
 import json
 import re
 import traceback
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from types import SimpleNamespace
 from typing import Union
@@ -165,9 +165,9 @@ class GlobalChannelConverter(commands.IDConverter):
 
 def embed_factory(ctx: commands.Context) -> discord.Embed:
     """Creates an embed with neutral colour and standard footer."""
-    embed = discord.Embed(timestamp=datetime.utcnow(), colour=colours.neutral)
+    embed = discord.Embed(timestamp=datetime.now(timezone.utc), colour=colours.neutral)
     if ctx.author:
-        embed.set_footer(text=str(ctx.author), icon_url=str(ctx.author.avatar.url))
+        embed.set_footer(text=str(ctx.author), icon_url=str(ctx.author.display_avatar))
     return embed
 
 

exts/ae7q.py

@@ -1,7 +1,7 @@
 """
 ae7q extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/base.py

@@ -1,7 +1,7 @@
 """
 Base extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/callsign.py

@@ -2,7 +2,7 @@
 Callsign Lookup extension for qrm
 ---
 Copyright (C) 2019-2020 classabbyamp, 0x5c  (as qrz.py)
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """
@@ -12,7 +12,6 @@ from typing import Dict
 
 import aiohttp
 from callsignlookuptools import QrzAsyncClient, CallsignLookupError, CallsignData
-from callsignlookuptools.common.dataclasses import Trustee
 
 from discord.ext import commands
 
@@ -74,7 +73,7 @@ class QRZCog(commands.Cog):
             embed.title = f"QRZ Data for {data.callsign}"
             embed.colour = cmn.colours.good
             embed.url = data.url
-            if data.image is not None and data.image.url is not None:
+            if data.image is not None:
                 embed.set_thumbnail(url=data.image.url)
 
             for title, val in qrz_process_info(data).items():
@@ -101,9 +100,9 @@ def qrz_process_info(data: CallsignData) -> Dict:
     qsl = dict()
     if data.qsl is not None:
         qsl = {
-            "eQSL?": data.qsl.eqsl.name.title(),
-            "Paper QSL?": data.qsl.mail.name.title(),
-            "LotW?": data.qsl.lotw.name.title(),
+            "eQSL?": data.qsl.eqsl,
+            "Paper QSL?": data.qsl,
+            "LotW?": data.qsl.lotw,
             "QSL Info": data.qsl.info,
         }
 
@@ -120,7 +119,7 @@ def qrz_process_info(data: CallsignData) -> Dict:
         "Aliases": ", ".join(data.aliases) if data.aliases else None,
         "Previous Callsign": data.prev_call,
         "License Class": data.lic_class,
-        "Trustee": data.trustee if data.trustee is not None and data.trustee != Trustee(None, None) else None,
+        "Trustee": data.trustee,
         "Born": data.born,
     } | qsl
 

exts/codes.py

@@ -2,7 +2,7 @@
 Codes extension for qrm
 ---
 Copyright (C) 2019-2021 classabbyamp, 0x5c  (as ham.py)
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/contests.py

@@ -1,7 +1,7 @@
 """
 Contest Calendar extension for qrm
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/dbconv.py

@@ -1,7 +1,7 @@
 """
 Conversion extension for qrm
 ---
-Copyright (C) 2020-2021 classabbyamp, 0x5c
+Copyright (C) 2020-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/dxcc.py

@@ -2,7 +2,7 @@
 DXCC Prefix Lookup extension for qrm
 ---
 Copyright (C) 2019-2020 classabbyamp, 0x5c  (as lookup.py)
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/fun.py

@@ -1,7 +1,7 @@
 """
 Fun extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/grid.py

@@ -1,7 +1,7 @@
 """
 Grid extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/image.py

@@ -1,7 +1,7 @@
 """
 Image extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/land_weather.py

@@ -2,7 +2,7 @@
 Land Weather extension for qrm
 ---
 Copyright (C) 2019-2020 classabbyamp, 0x5c  (as weather.py)
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/morse.py

@@ -1,7 +1,7 @@
 """
 Morse Code extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/prefixes.py

@@ -1,7 +1,7 @@
 """
 Prefixes Lookup extension for qrm
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/propagation.py

@@ -1,7 +1,7 @@
 """
 Propagation extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/study.py

@@ -1,7 +1,7 @@
 """
 Study extension for qrm
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/tex.py

@@ -1,7 +1,7 @@
 """
 TeX extension for qrm
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

exts/time.py

@@ -1,7 +1,7 @@
 """
 Time extension for qrm
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

info.py

@@ -1,7 +1,7 @@
 """
 Static info about the bot.
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """
@@ -12,7 +12,7 @@ description = """A bot with various useful ham radio-related functions, written
 license = "Québec Free and Open-Source Licence – Strong Reciprocity (LiLiQ-R+), version 1.1"
 contributing = """Check out the [source on GitHub](https://github.com/miaowware/qrm2). Contributions are welcome!
 
-               All issues and requests related to resources (including maps, band charts, data) should be added \
-               in [miaowware/qrm-resources](https://github.com/miaowware/qrm-resources)."""
-release = "2.9.0"
+All issues and requests related to resources (including maps, band charts, data) should be added \
+in [miaowware/qrm-resources](https://github.com/miaowware/qrm-resources)."""
+release = "2.9.1"
 bot_server = "https://discord.gg/Ntbg3J4"

main.py

@@ -2,7 +2,7 @@
 """
 qrm, a bot for Discord
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

requirements.txt

@@ -2,7 +2,7 @@ py-cord~=2.3.2
 aiohttp[speedups]
 ctyparser~=2.0
 gridtools~=1.0
-callsignlookuptools[async]~=1.0
+callsignlookuptools[async]~=1.1
 beautifulsoup4
 pytz
 cairosvg

resource_schemas.py

@@ -1,7 +1,7 @@
 """
 Resource schemas generator for qrm2.
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

resources/callsign_info.py

@@ -1,7 +1,7 @@
 """
 Information about callsigns for the prefixes command in hamcog.
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

resources/callsigninfos/ca.py

@@ -1,7 +1,7 @@
 """
 Information about callsigns for the CA prefixes command in hamcog.
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

resources/callsigninfos/us.py

@@ -1,7 +1,7 @@
 """
 Information about callsigns for the US prefixes command in hamcog.
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

resources/study.py

@@ -1,7 +1,7 @@
 """
 A listing of hamstudy command resources
 ---
-Copyright (C) 2019-2021 classabbyamp, 0x5c
+Copyright (C) 2019-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

utils/connector.py

@@ -1,7 +1,7 @@
 """
 Wrapper to handle aiohttp connector creation.
 ---
-Copyright (C) 2020-2021 classabbyamp, 0x5c
+Copyright (C) 2020-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

utils/resources_manager.py

@@ -1,7 +1,7 @@
 """
 Resources manager for qrm2.
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """

utils/resources_models.py

@@ -1,7 +1,7 @@
 """
 Resource index models for qrm2.
 ---
-Copyright (C) 2021 classabbyamp, 0x5c
+Copyright (C) 2021-2023 classabbyamp, 0x5c
 
 SPDX-License-Identifier: LiLiQ-Rplus-1.1
 """