Rewrite TG integration, support for other webhooks

kaehmy/admin.py

@@ -1,10 +1,9 @@
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 
-from kaehmy.models import Application, Comment, CustomRole, PresetRole, TelegramChannel
+from kaehmy.models import Application, Comment, CustomRole, PresetRole
 
 admin.site.register(Application)
 admin.site.register(Comment)
 admin.site.register(CustomRole)
 admin.site.register(PresetRole, TranslationAdmin)
-admin.site.register(TelegramChannel)

kaehmy/migrations/0006_delete_telegramchannel.py

@@ -0,0 +1,16 @@
+# Generated by Django 2.2.26 on 2022-01-12 20:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kaehmy', '0005_auto_20190312_1458'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='TelegramChannel',
+        ),
+    ]

kaehmy/models.py

@@ -148,18 +148,3 @@ class Application(CommentParent):
 
     def has_any_board_role(self):
         return self.preset_roles.filter(is_board=True).exists() or self.custom_roles.filter(is_board=True)
-
-
-# Telegram channel entry for Kaehmys
-class TelegramChannel(models.Model):
-    """Model containing the channel id of a Telegram chat"""
-
-    class Meta:
-        verbose_name = _('Telegram channel')
-        verbose_name_plural = _('Telegram channels')
-
-    name = models.CharField(max_length=255)
-    channel_id = models.CharField(max_length=255, unique=True)
-
-    def __str__(self):
-        return 'Telegram channel: "{}"'.format(self.name)

kaehmy/tgbot.py

@@ -1,38 +0,0 @@
-'''
-A telegram bot api for whatever purposes.
-TODO: kaehmy app is definitely not correct place for this
-'''
-import logging
-import requests
-from django.conf import settings
-from kaehmy.models import TelegramChannel
-
-
-class TelegramBot:
-    '''
-    A telegram bot api for whatever purposes
-    Currently only able to broadcast stuff to all registered
-    channels using broadcast method.
-    '''
-
-    def __init__(self, api_token=None):
-
-        self.api_token = api_token or settings.TELEGRAM_BOT_TOKEN
-        self.send_message_url = "https://api.telegram.org/bot{}/sendMessage".format(self.api_token)
-
-    def broadcast(self, message):
-        channels_ids = TelegramChannel.objects.values_list("channel_id", flat=True)
-        for id_ in channels_ids:
-            self.send_message(id_, message)
-
-    def send_message(self, channel_id, message):
-        '''
-        Send message to a chat with given channel_id
-        '''
-        data = {
-            'chat_id': channel_id,
-            'text': message,
-            'parse_mode': 'Markdown'
-        }
-        resp = requests.post(self.send_message_url, json=data)
-        logging.debug(resp.content)

kaehmy/views.py

@@ -13,10 +13,11 @@ from dealer.git import git
 from sikweb.settings import URL
 
 from members.views.utils import *
-from kaehmy.models import Application, CustomRole, PresetRole, TelegramChannel
+from kaehmy.models import Application, CustomRole, PresetRole
 from kaehmy.forms import ApplicationForm, CommentForm
 from kaehmy.tables import ExportTable
 from webapp.utils import send_email
+from webapp.webhook import processHooks
 
 
 @ensure_csrf_cookie
@@ -135,17 +136,7 @@ def submit(request, *args, **kwargs):
         send_email(email, subject, body)
         logging.debug('Sent kaehmy email to recipient <{}>'.format(email))
 
-        CHAT_IDS = [channel.channel_id for channel in TelegramChannel.objects.all()]
-        for chat_id in CHAT_IDS:
-            tg_string = 'https://api.telegram.org/bot{}/sendMessage?chat_id={}&text={}'.format(
-                settings.TELEGRAM_BOT_TOKEN,
-                chat_id,
-                'Uusi New kaehmy! {} -> {}'.format(name, url)
-            )
-            response = requests.get(tg_string).json()
-            logging.debug('Telegram API response:\n{}'.format(response))
-        logging.debug('Sent kaehmy announcement to {} channels.'.format(len(CHAT_IDS)))
-
+        processHooks(message=f'Uusi New kaehmy! {name} -> {url}', eventType="kaehmy")
     else:
         context = {
             'error': form.errors