From b50d8b3ffd48b4c4999bd55dc4573b69208d0270 Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:11:58 -0500 Subject: [PATCH 1/2] Replace Icon Icons --- techsupport_bot/commands/duck.py | 9 +++++---- techsupport_bot/commands/google.py | 3 ++- techsupport_bot/commands/hug.py | 3 ++- techsupport_bot/commands/ipinfo.py | 4 ++-- techsupport_bot/commands/iss.py | 2 +- techsupport_bot/commands/poll.py | 5 +---- techsupport_bot/commands/protect.py | 5 ++--- techsupport_bot/commands/relay.py | 2 +- techsupport_bot/commands/roll.py | 2 +- techsupport_bot/commands/rules.py | 3 +-- techsupport_bot/commands/urban.py | 4 +++- techsupport_bot/commands/weather.py | 3 +-- techsupport_bot/commands/wolfram.py | 2 +- techsupport_bot/ui/appnotice.py | 2 +- 14 files changed, 24 insertions(+), 25 deletions(-) diff --git a/techsupport_bot/commands/duck.py b/techsupport_bot/commands/duck.py index 1f7cdfe23..ca141834e 100644 --- a/techsupport_bot/commands/duck.py +++ b/techsupport_bot/commands/duck.py @@ -102,14 +102,15 @@ class DuckHunt(cogs.LoopCog): """ DUCK_PIC_URL: str = ( - "https://cdn.icon-icons.com/icons2/1446/PNG/512/22276duck_98782.png" + "https://www.iconarchive.com/download/i107380/google/" + + "noto-emoji-animals-nature/22276-duck.512.png" ) BEFRIEND_URL: str = ( - "https://cdn.icon-icons.com/icons2/603/PNG/512/" - + "heart_love_valentines_relationship_dating_date_icon-icons.com_55985.png" + "https://upload.wikimedia.org/wikipedia/commons/thumb/" + + "f/fb/Noto_Emoji_v2.034_2665.svg/512px-Noto_Emoji_v2.034_2665.svg.png" ) KILL_URL: str = ( - "https://cdn.icon-icons.com/icons2/1919/PNG/512/huntingtarget_122049.png" + "https://www.iconarchive.com/download/i97188/iconsmind/outline/Target.512.png" ) ON_START: bool = False CHANNELS_KEY: str = "hunt_channels" diff --git a/techsupport_bot/commands/google.py b/techsupport_bot/commands/google.py index 75db5faca..79ffb2e00 100644 --- a/techsupport_bot/commands/google.py +++ b/techsupport_bot/commands/google.py @@ -58,7 +58,8 @@ class Googler(cogs.BaseCog): "https://www.googleapis.com/youtube/v3/search?part=id&maxResults=10" ) ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/673/PNG/512/Google_icon-icons.com_60497.png" + "https://upload.wikimedia.org/wikipedia/commons/thumb/c/" + + "c1/Google_%22G%22_logo.svg/768px-Google_%22G%22_logo.svg.png" ) async def get_items( diff --git a/techsupport_bot/commands/hug.py b/techsupport_bot/commands/hug.py index eb7542c73..2c6f6df57 100644 --- a/techsupport_bot/commands/hug.py +++ b/techsupport_bot/commands/hug.py @@ -57,7 +57,8 @@ class Hugger(cogs.BaseCog): "{user_giving_hug} went to hug {user_to_hug} but missed and ran into the wall instead", ] ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/1648/PNG/512/10022huggingface_110042.png" + "https://upload.wikimedia.org/wikipedia/commons/thumb/a/" + + "a5/Noto_Emoji_Oreo_1f917.svg/768px-Noto_Emoji_Oreo_1f917.svg.png" ) @auxiliary.with_typing diff --git a/techsupport_bot/commands/ipinfo.py b/techsupport_bot/commands/ipinfo.py index 2f147aa82..3c702706c 100644 --- a/techsupport_bot/commands/ipinfo.py +++ b/techsupport_bot/commands/ipinfo.py @@ -31,8 +31,8 @@ class IPInfo(cogs.BaseCog): API_URL: str = "https://ipinfo.io" IP_ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/1858/PNG/512/" - "iconfinder-dedicatedipaddress-4263513_117864.png" + "https://www.iconarchive.com/download/i43033/oxygen-icons.org" + "/oxygen/Categories-applications-internet.256.png" ) @commands.command( diff --git a/techsupport_bot/commands/iss.py b/techsupport_bot/commands/iss.py index e79f1ef3c..b2f6b3462 100644 --- a/techsupport_bot/commands/iss.py +++ b/techsupport_bot/commands/iss.py @@ -90,7 +90,7 @@ async def iss(self: Self, ctx: commands.Context) -> None: value="https://spotthestation.nasa.gov/tracking_map.cfm", ) embed.set_thumbnail( - url="https://cdn.icon-icons.com/icons2/1389/PNG/512/internationalspacestation_96150.png" + url="https://www.iconarchive.com/download/i106861/goodstuff-no-nonsense/free-space/international-space-station.512.png" ) embed.color = discord.Color.darker_gray() diff --git a/techsupport_bot/commands/poll.py b/techsupport_bot/commands/poll.py index 49f06d4d9..be2cfb8a9 100644 --- a/techsupport_bot/commands/poll.py +++ b/techsupport_bot/commands/poll.py @@ -85,10 +85,7 @@ async def validate_data( if not strawpoll: if not image_url or not isinstance(image_url, str): - request_body.image_url = ( - "https://cdn.icon-icons.com/icons2" - "/259/PNG/128/ic_poll_128_28553.png" - ) + request_body.image_url = "https://www.iconarchive.com/download/i6231/custom-icon-design/pretty-office-6/polls.256.png" if not timeout or not isinstance(timeout, int): request_body.timeout = 60 diff --git a/techsupport_bot/commands/protect.py b/techsupport_bot/commands/protect.py index 0a9515ec9..65bcdb4e1 100644 --- a/techsupport_bot/commands/protect.py +++ b/techsupport_bot/commands/protect.py @@ -155,11 +155,10 @@ class Protector(cogs.MatchCog): """ ALERT_ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/2063/PNG/512/" - + "alert_danger_warning_notification_icon_124692.png" + "https://www.iconarchive.com/download/i76061/martz90/circle-addon2/warning.512.png" ) CLIPBOARD_ICON_URL: str = ( - "https://icon-icons.com/icons2/203/PNG/128/diagram-30_24487.png" + "https://www.iconarchive.com/download/i107916/google/noto-emoji-objects/62930-clipboard.512.png" ) CHARS_PER_NEWLINE: int = 80 diff --git a/techsupport_bot/commands/relay.py b/techsupport_bot/commands/relay.py index dc79bcc52..36f213392 100644 --- a/techsupport_bot/commands/relay.py +++ b/techsupport_bot/commands/relay.py @@ -450,7 +450,7 @@ def generate_sent_message_embed( Returns: discord.Embed: The embed prepared and ready to send """ - ICON_URL = "https://cdn.icon-icons.com/icons2/1508/PNG/512/ircchat_104581.png" + ICON_URL = "https://www.iconarchive.com/download/i94994/mahm0udwally/all-flat/Chat.256.png" embed = discord.Embed() embed.set_author( diff --git a/techsupport_bot/commands/roll.py b/techsupport_bot/commands/roll.py index bdab039ed..6435403d0 100644 --- a/techsupport_bot/commands/roll.py +++ b/techsupport_bot/commands/roll.py @@ -31,7 +31,7 @@ class Roller(cogs.BaseCog): """ ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/1465/PNG/512/678gamedice_100992.png" + "https://www.iconarchive.com/download/i43702/iconcubic/dnd-dice/d20.128.png" ) @auxiliary.with_typing diff --git a/techsupport_bot/commands/rules.py b/techsupport_bot/commands/rules.py index 6fff45a28..246644faa 100644 --- a/techsupport_bot/commands/rules.py +++ b/techsupport_bot/commands/rules.py @@ -34,8 +34,7 @@ class Rules(cogs.BaseCog): """ RULE_ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/907/PNG" - "/512/balance-scale-of-justice_icon-icons.com_70554.png" + "https://www.iconarchive.com/download/i96945/iconsmind/outline/Scale.512.png" ) @commands.group(name="rule") diff --git a/techsupport_bot/commands/urban.py b/techsupport_bot/commands/urban.py index 6f54edd46..c1d44e762 100644 --- a/techsupport_bot/commands/urban.py +++ b/techsupport_bot/commands/urban.py @@ -44,7 +44,9 @@ class UrbanDictionary(cogs.BaseCog): BASE_URL: str = "http://api.urbandictionary.com/v0/define?term=" SEE_MORE_URL: str = "https://www.urbandictionary.com/define.php?term=" - ICON_URL: str = "https://cdn.icon-icons.com/icons2/114/PNG/512/dictionary_19159.png" + ICON_URL: str = ( + "https://www.iconarchive.com/download/i79897/dtafalonso/ios7-desktop/Dictionary.256.png" + ) @auxiliary.with_typing @commands.command( diff --git a/techsupport_bot/commands/weather.py b/techsupport_bot/commands/weather.py index 93baf2407..337e26406 100644 --- a/techsupport_bot/commands/weather.py +++ b/techsupport_bot/commands/weather.py @@ -137,8 +137,7 @@ def generate_embed(self: Self, response: munch.Munch) -> discord.Embed | None: embed.add_field(name="Humidity", value=f"{int(response.main.humidity)} %") embed.set_thumbnail( url=( - "https://cdn.icon-icons.com/icons2/8/PNG/256/cloudyweather_cloud_" - "inpart_day_wind_thunder_sunny_rain_darkness_nublad_1459.png" + "https://www.iconarchive.com/download/i76758/pixelkit/flat-jewels/Weather.512.png" ) ) embed.color = discord.Color.blurple() diff --git a/techsupport_bot/commands/wolfram.py b/techsupport_bot/commands/wolfram.py index 08c9dddca..63d2cd232 100644 --- a/techsupport_bot/commands/wolfram.py +++ b/techsupport_bot/commands/wolfram.py @@ -43,7 +43,7 @@ class Wolfram(cogs.BaseCog): API_URL: str = "http://api.wolframalpha.com/v1/result?appid={}&i={}" ICON_URL: str = ( - "https://cdn.icon-icons.com/icons2/2107/PNG/512/file_type_wolfram_icon_130071.png" + "https://images.seeklogo.com/logo-png/42/1/mathematica-logo-png_seeklogo-428539.png" ) @auxiliary.with_typing diff --git a/techsupport_bot/ui/appnotice.py b/techsupport_bot/ui/appnotice.py index d35bb34bb..fa08df827 100644 --- a/techsupport_bot/ui/appnotice.py +++ b/techsupport_bot/ui/appnotice.py @@ -15,7 +15,7 @@ class AppNotice(discord.ui.View): """ ICON: str = ( - "https://icon-icons.com/downloadimage.php?id=14692&root=80/PNG/256/&file=help_15418.png" + "https://www.iconarchive.com/download/i43645/treetog/junior/help.256.png" ) async def send(self: Self, channel: discord.abc.Messageable, message: str) -> None: From fc4ec387b5f37f86b8107e4bdef816d9817560d3 Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:18:37 -0500 Subject: [PATCH 2/2] Fix formatting --- techsupport_bot/commands/iss.py | 5 ++++- techsupport_bot/commands/poll.py | 5 ++++- techsupport_bot/commands/protect.py | 3 ++- techsupport_bot/commands/weather.py | 3 ++- techsupport_bot/tests/config_for_tests.py | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/techsupport_bot/commands/iss.py b/techsupport_bot/commands/iss.py index b2f6b3462..043e02f44 100644 --- a/techsupport_bot/commands/iss.py +++ b/techsupport_bot/commands/iss.py @@ -90,7 +90,10 @@ async def iss(self: Self, ctx: commands.Context) -> None: value="https://spotthestation.nasa.gov/tracking_map.cfm", ) embed.set_thumbnail( - url="https://www.iconarchive.com/download/i106861/goodstuff-no-nonsense/free-space/international-space-station.512.png" + url=( + "https://www.iconarchive.com/download/i106861/goodstuff-no-nonsense/" + "free-space/international-space-station.512.png" + ) ) embed.color = discord.Color.darker_gray() diff --git a/techsupport_bot/commands/poll.py b/techsupport_bot/commands/poll.py index be2cfb8a9..27b1c381b 100644 --- a/techsupport_bot/commands/poll.py +++ b/techsupport_bot/commands/poll.py @@ -85,7 +85,10 @@ async def validate_data( if not strawpoll: if not image_url or not isinstance(image_url, str): - request_body.image_url = "https://www.iconarchive.com/download/i6231/custom-icon-design/pretty-office-6/polls.256.png" + request_body.image_url = ( + "https://www.iconarchive.com/download/i6231/" + "custom-icon-design/pretty-office-6/polls.256.png" + ) if not timeout or not isinstance(timeout, int): request_body.timeout = 60 diff --git a/techsupport_bot/commands/protect.py b/techsupport_bot/commands/protect.py index 65bcdb4e1..2a4953927 100644 --- a/techsupport_bot/commands/protect.py +++ b/techsupport_bot/commands/protect.py @@ -158,7 +158,8 @@ class Protector(cogs.MatchCog): "https://www.iconarchive.com/download/i76061/martz90/circle-addon2/warning.512.png" ) CLIPBOARD_ICON_URL: str = ( - "https://www.iconarchive.com/download/i107916/google/noto-emoji-objects/62930-clipboard.512.png" + "https://www.iconarchive.com/download/i107916/" + "google/noto-emoji-objects/62930-clipboard.512.png" ) CHARS_PER_NEWLINE: int = 80 diff --git a/techsupport_bot/commands/weather.py b/techsupport_bot/commands/weather.py index 337e26406..fbfa310bd 100644 --- a/techsupport_bot/commands/weather.py +++ b/techsupport_bot/commands/weather.py @@ -137,7 +137,8 @@ def generate_embed(self: Self, response: munch.Munch) -> discord.Embed | None: embed.add_field(name="Humidity", value=f"{int(response.main.humidity)} %") embed.set_thumbnail( url=( - "https://www.iconarchive.com/download/i76758/pixelkit/flat-jewels/Weather.512.png" + "https://www.iconarchive.com/download/i76758" + "/pixelkit/flat-jewels/Weather.512.png" ) ) embed.color = discord.Color.blurple() diff --git a/techsupport_bot/tests/config_for_tests.py b/techsupport_bot/tests/config_for_tests.py index 601dabd8e..c4f7ed48b 100644 --- a/techsupport_bot/tests/config_for_tests.py +++ b/techsupport_bot/tests/config_for_tests.py @@ -40,7 +40,7 @@ def rand_history( draw: ( Callable[[SearchStrategy[int, int]], int] | Callable[[SearchStrategy[str]], str] - ) + ), ) -> list[MockMessage]: """This is a custom strategy to generate a random message history This history, returned as an array, will be 1 to 50 messages of random content