convert slack_notify to generic notify

jontsai · jontsai · commit 226c33ad9fb8 · 2025-09-11T09:45:06.000Z
diff --git a/apps/accounts/events.py b/apps/accounts/events.py
@@ -5,7 +5,7 @@
 
 # HTK Imports
 from htk.utils import htk_setting
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 
 
 def failed_recaptcha_on_login(user, request=None):
@@ -26,12 +26,12 @@ def failed_recaptcha_on_login(user, request=None):
         user.username,
         user.email,
     )
-    slack_notify(slack_message, level='warning')
+    notify(slack_message, level='warning', use_messages=False)
 
 
 def failed_recaptcha_on_account_register(request=None):
     message = 'Failed reCAPTCHA. Suspicious account registration detected.'
 
     rollbar.report_message(message, request=request)
 
-    slack_notify(message, level='warning')
+    notify(message, level='warning', use_messages=False)
diff --git a/apps/accounts/models.py b/apps/accounts/models.py
@@ -561,7 +561,7 @@ def activate(
                     sender=email_sender,
                 )
 
-            slack_notify(
+            notify(
                 '*%s* has activated their account on %s'
                 % (
                     user.email,
diff --git a/apps/invitations/models.py b/apps/invitations/models.py
@@ -12,7 +12,7 @@
 from htk.utils.cache_descriptors import CachedAttribute
 from htk.utils.datetime_utils import relative_time
 from htk.utils.enums import get_enum_symbolic_name
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 
 
 # isort: off
@@ -96,7 +96,7 @@ def connect_user(self, user):
                 self.get_relative_time(),
             )
         )
-        slack_notify(msg)
+        notify(msg, use_messages=False)
 
     def complete(self, user=None):
         """Completes the invitation lifecycle
@@ -127,4 +127,4 @@ def complete(self, user=None):
                 self.get_relative_time(),
             )
         )
-        slack_notify(msg)
+        notify(msg, use_messages=False)
diff --git a/apps/invitations/services.py b/apps/invitations/services.py
@@ -4,7 +4,7 @@
 from htk.apps.sites.utils import get_site_name
 from htk.services import HtkBaseService
 from htk.utils import htk_setting
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 
 
 # isort: off
@@ -46,7 +46,7 @@ def process_user_created(self, user):
                             invitation.get_relative_time(),
                         )
                     )
-                    slack_notify(msg)
+                    notify(msg, use_messages=False)
 
     def process_user_email_confirmation(self, user_email):
         """Invoked when `user_email` is confirmed
diff --git a/apps/organizations/apps.py b/apps/organizations/apps.py
@@ -13,7 +13,7 @@
     htk_setting,
     resolve_model_dynamically,
 )
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 
 
 # isort: off
@@ -38,7 +38,7 @@ def organization_invitation_created_or_updated(
         msg_builder = INVITATION_ACCEPTANCE_MESSAGE_BUILDERS[msg_builder_key]
         msg = msg_builder()
 
-        slack_notify(msg)
+        notify(msg, use_messages=False)
 
 
 class HtkOrganizationAppConfig(HtkAppConfig):
diff --git a/apps/prelaunch/models/base.py b/apps/prelaunch/models/base.py
@@ -3,7 +3,6 @@
 
 # Third Party (PyPI) Imports
 import rollbar
-from baws.utils.urls import get_full_url
 
 # Django Imports
 from django.contrib.sites.models import Site
@@ -15,11 +14,9 @@
     prelaunch_email,
 )
 from htk.utils import htk_setting
-from htk.utils.notifications import (
-    notify,
-    slack_notify,
-)
+from htk.utils.notifications import notify
 from htk.utils.request import get_current_request
+from htk.utils.urls import build_full_url
 
 
 # isort: off
@@ -141,7 +138,7 @@ def notification_message(self):
         return message
 
     def send_notifications(self):
-        slack_notify(self.notification_message)
+        notify(self.notification_message, use_messages=False)
 
         try:
             prelaunch_email(self)
@@ -162,7 +159,8 @@ def grant_early_access(self):
         notify(
             'Early access has been enabled for {} <{}>'.format(
                 self.full_name, self.email
-            )
+            ),
+            use_messages=False,
         )
         try:
             early_access_email(self)
@@ -179,7 +177,7 @@ def revoke_early_access(self):
     def early_access_url(self):
         if self.early_access:
             early_access_url = '{}?early_access_code={}'.format(
-                get_full_url('/'),
+                build_full_url('/'),
                 self.early_access_code,
             )
         else:
diff --git a/decorators/celery_.py b/decorators/celery_.py
@@ -4,14 +4,15 @@
 
 # Third Party (PyPI) Imports
 import rollbar
-from celery import shared_task
 
 # HTK Imports
 from htk.cachekeys import TaskCooldown
 from htk.utils import htk_setting
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 from htk.utils.timer import HtkTimer
 
+from celery import shared_task
+
 
 class safe_timed_task(object):
     def __init__(
@@ -69,7 +70,7 @@ def wrapped(*args, **kwargs):
                     msg = 'Processing *{}*... (`{}`)'.format(
                         self.task_name, gethostname()
                     )
-                    slack_notify(msg, custom_channel=custom_channel)
+                    notify(msg, custom_channel=custom_channel)
 
                 timer = HtkTimer()
                 timer.start()
@@ -98,7 +99,7 @@ def wrapped(*args, **kwargs):
                     msg = '{}Finished processing *{}* in *{}* seconds (`{}`)'.format(
                         skipped_msg, self.task_name, duration, gethostname()
                     )
-                    slack_notify(msg, custom_channel=custom_channel)
+                    notify(msg, custom_channel=custom_channel)
             except Exception:
                 result = None
                 extra_data = {
diff --git a/lib/github/tasks.py b/lib/github/tasks.py
@@ -5,7 +5,7 @@
     MORNING_HOURS_END,
 )
 from htk.tasks import BaseTask
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 from htk.utils.text.transformers import get_symbols
 
 
@@ -15,55 +15,78 @@
 class GitHubReminderTask(BaseTask):
     def __init__(self):
         from htk.lib.github.cachekeys import GitHubReminderCooldown
-        super(GitHubReminderTask, self).__init__(cooldown_class=GitHubReminderCooldown)
+
+        super(GitHubReminderTask, self).__init__(
+            cooldown_class=GitHubReminderCooldown
+        )
 
     def has_cooldown(self, user):
         _has_cooldown = super(GitHubReminderTask, self).has_cooldown(user)
-        #_has_cooldown = False
+        # _has_cooldown = False
         return _has_cooldown
 
     def get_users(self):
         import htk.apps.accounts.filters as _filters
-        from htk.apps.accounts.utils.lookup import get_users_with_attribute_value
-        users = get_users_with_attribute_value('github_reminders', True, as_bool=True)
-        users = _filters.users_currently_at_local_time(users, BUSINESS_HOURS_START, MORNING_HOURS_END, isoweekdays=ISOWEEKDAY_WEEKDAYS)
+        from htk.apps.accounts.utils.lookup import (
+            get_users_with_attribute_value,
+        )
+
+        users = get_users_with_attribute_value(
+            'github_reminders', True, as_bool=True
+        )
+        users = _filters.users_currently_at_local_time(
+            users,
+            BUSINESS_HOURS_START,
+            MORNING_HOURS_END,
+            isoweekdays=ISOWEEKDAY_WEEKDAYS,
+        )
 
         return users
 
     def execute(self, user):
-        slack_notify('Processing GitHub Reminders for {}'.format(user.username))
+        notify(
+            'Processing GitHub Reminders for {}'.format(user.username),
+            use_messages=False,
+        )
 
         now = user.profile.get_local_time()
 
         valid_chars = 'A-Za-z0-9_\-/'
         github_organizations = get_symbols(
             user.profile.get_attribute('github_organizations') or '',
-            valid_chars=valid_chars
+            valid_chars=valid_chars,
         )
         github_repositories = get_symbols(
             user.profile.get_attribute('github_repositories') or '',
-            valid_chars=valid_chars
+            valid_chars=valid_chars,
         )
 
         self.send_github_reminders(
             user,
             organizations=github_organizations,
-            repositories=github_repositories
+            repositories=github_repositories,
         )
 
-    def send_github_reminders(self, user, organizations=None, repositories=None):
+    def send_github_reminders(
+        self, user, organizations=None, repositories=None
+    ):
         github_access_token = user.profile.get_attribute('github_access_token')
         slack_webhook_url = user.profile.get_attribute('slack_webhook_url')
-        slack_channel = user.profile.get_attribute('github_reminders_slack_channel')
-        mention_here = user.profile.get_attribute('github_reminders_slack_mention_here')
+        slack_channel = user.profile.get_attribute(
+            'github_reminders_slack_channel'
+        )
+        mention_here = user.profile.get_attribute(
+            'github_reminders_slack_mention_here'
+        )
 
         from htk.lib.github.bots import GitHubReminderSlackBot
+
         bot = GitHubReminderSlackBot(
             slack_webhook_url,
             slack_channel,
             github_access_token,
             organizations=organizations,
             repositories=repositories,
-            mention_here=mention_here
+            mention_here=mention_here,
         )
         bot.remind_pull_requests()
diff --git a/lib/shopify_lib/archivers.py b/lib/shopify_lib/archivers.py
@@ -9,7 +9,7 @@
 # HTK Imports
 from htk.utils import htk_setting
 from htk.utils.cache_descriptors import CachedAttribute
-from htk.utils.notifications import slack_notify
+from htk.utils.notifications import notify
 
 
 # isort: off
@@ -133,7 +133,7 @@ def archive_item_type(self, item_type):
         msg = 'Archiving %ss...' % item_type
         print(msg)
 
-        slack_notify(msg)
+        notify(msg, use_messages=False)
 
         num_archived = 0
         iterator = self._get_iterator_for_item_type(item_type)
@@ -154,7 +154,7 @@ def archive_item_type(self, item_type):
             item_type,
             duration,
         )
-        slack_notify(msg)
+        notify(msg, use_messages=False)
 
     def archive_item(self, item_type, item):
         """Archives a single Shopify.Resource `item` into some database using `archiver`"""
diff --git a/utils/notifications.py b/utils/notifications.py
@@ -18,6 +18,7 @@ def notify(
     use_messages=True,
     use_slack=None,
     use_google=None,
+    custom_channel=None,
 ):
     """Wrapper for simultaneously sending a message via:
 
@@ -52,13 +53,13 @@ def notify(
         use_slack = htk_setting('HTK_SLACK_NOTIFICATIONS_ENABLED')
 
     if use_slack:
-        slack_notify(message, level=level)
+        slack_notify(message, level=level, custom_channel=custom_channel)
 
     if use_google is None:
         use_google = htk_setting('HTK_GOOGLE_CHAT_NOTIFICATIONS_ENABLED')
 
     if use_google:
-        google_chat_notify(message, level=level)
+        google_chat_notify(message, level=level, custom_channel=custom_channel)
 
 
 def slack_notify(message, level=None, custom_channel=None):
diff --git a/utils/urls.py b/utils/urls.py
@@ -5,10 +5,15 @@
 import requests
 
 # Django Imports
+from django.conf import settings
 from django.urls import reverse
 
 # HTK Imports
 from htk.utils import htk_setting
+from htk.utils.request import get_current_request
+
+
+# isort: off
 
 
 def reverse_with_query_params(
@@ -92,6 +97,9 @@ def build_updated_url_with_query_params(raw_url, query_params):
 
 
 def build_full_url(partial_url, request=None, use_secure=True):
+    if request is None:
+        request = get_current_request()
+
     protocol = 'https' if use_secure else 'http'
     request_domain = request.get_host() if request else None
     domain = request_domain or htk_setting('HTK_DEFAULT_DOMAIN')

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ def activate(`
`561`	`561`	`sender=email_sender,`
`562`	`562`	`)`
`563`	`563`
`564`		`- slack_notify(`
	`564`	`+ notify(`
`565`	`565`	`'%s has activated their account on %s'`
`566`	`566`	`% (`
`567`	`567`	`user.email,`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`from htk.utils.cache_descriptors import CachedAttribute`
`13`	`13`	`from htk.utils.datetime_utils import relative_time`
`14`	`14`	`from htk.utils.enums import get_enum_symbolic_name`
`15`		`-from htk.utils.notifications import slack_notify`
	`15`	`+from htk.utils.notifications import notify`
`16`	`16`
`17`	`17`
`18`	`18`	`# isort: off`
`@@ -96,7 +96,7 @@ def connect_user(self, user):`
`96`	`96`	`self.get_relative_time(),`
`97`	`97`	`)`
`98`	`98`	`)`
`99`		`- slack_notify(msg)`
	`99`	`+ notify(msg, use_messages=False)`
`100`	`100`
`101`	`101`	`def complete(self, user=None):`
`102`	`102`	`"""Completes the invitation lifecycle`
`@@ -127,4 +127,4 @@ def complete(self, user=None):`
`127`	`127`	`self.get_relative_time(),`
`128`	`128`	`)`
`129`	`129`	`)`
`130`		`- slack_notify(msg)`
	`130`	`+ notify(msg, use_messages=False)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from htk.apps.sites.utils import get_site_name`
`5`	`5`	`from htk.services import HtkBaseService`
`6`	`6`	`from htk.utils import htk_setting`
`7`		`-from htk.utils.notifications import slack_notify`
	`7`	`+from htk.utils.notifications import notify`
`8`	`8`
`9`	`9`
`10`	`10`	`# isort: off`
`@@ -46,7 +46,7 @@ def process_user_created(self, user):`
`46`	`46`	`invitation.get_relative_time(),`
`47`	`47`	`)`
`48`	`48`	`)`
`49`		`- slack_notify(msg)`
	`49`	`+ notify(msg, use_messages=False)`
`50`	`50`
`51`	`51`	`def process_user_email_confirmation(self, user_email):`
`52`	`52`	"""Invoked when `user_email` is confirmed