Automatic webhook creation and deletion, Resolves #42

webapp/titanembeds/blueprints/admin/admin.py

@@ -135,6 +135,7 @@ def administrate_guild(guild_id):
         "name": db_guild.name,
         "unauth_users": db_guild.unauth_users,
         "visitor_view": db_guild.visitor_view,
+        "webhook_messages": db_guild.webhook_messages,
         "chat_links": db_guild.chat_links,
         "bracket_links": db_guild.bracket_links,
         "mentions_limit": db_guild.mentions_limit,
@@ -149,6 +150,7 @@ def update_administrate_guild(guild_id):
     db_guild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
     db_guild.unauth_users = request.form.get("unauth_users", db_guild.unauth_users) in ["true", True]
     db_guild.visitor_view = request.form.get("visitor_view", db_guild.visitor_view) in ["true", True]
+    db_guild.webhook_messages = request.form.get("webhook_messages", db_guild.webhook_messages) in ["true", True]
     db_guild.chat_links = request.form.get("chat_links", db_guild.chat_links) in ["true", True]
     db_guild.bracket_links = request.form.get("bracket_links", db_guild.bracket_links) in ["true", True]
     db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
@@ -161,6 +163,8 @@ def update_administrate_guild(guild_id):
         id=db_guild.id,
         guild_id=db_guild.guild_id,
         unauth_users=db_guild.unauth_users,
+        visitor_view=db_guild.visitor_view,
+        webhook_messages=db_guild.webhook_messages,
         chat_links=db_guild.chat_links,
         bracket_links=db_guild.bracket_links,
         mentions_limit=db_guild.mentions_limit,

webapp/titanembeds/blueprints/api/api.py

@@ -2,7 +2,7 @@ from titanembeds.database import db, Guilds, UnauthenticatedUsers, Unauthenticat
 from titanembeds.decorators import valid_session_required, discord_users_only
 from titanembeds.utils import check_guild_existance, guild_accepts_visitors, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key
 from titanembeds.oauth import user_has_permission, generate_avatar_url, check_user_can_administrate_guild
-from titanembeds.userbookkeeping import user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels
+from titanembeds.userbookkeeping import user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels, guild_webhooks_enabled
 from flask import Blueprint, abort, jsonify, session, request, url_for
 from flask_socketio import emit
 from sqlalchemy import and_
@@ -50,7 +50,7 @@ def format_post_content(guild_id, channel_id, message, dbUser):
         mention = "<@" + match[2: len(match) - 1] + ">"
         message = message.replace(match, mention, 1)
     
-    if not get_channel_webhook_url(guild_id, channel_id):
+    if not guild_webhooks_enabled(guild_id):
         if (session['unauthenticated']):
             message = u"**[{}#{}]** {}".format(session['username'], session['user_id'], message)
         else:
@@ -137,15 +137,23 @@ def get_guild_emojis(guild_id):
 
 # Returns webhook url if exists and can post w/webhooks, otherwise None
 def get_channel_webhook_url(guild_id, channel_id):
+    if not guild_webhooks_enabled(guild_id):
+        return None
     dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
     guild_webhooks = json.loads(dbguild.webhooks)
+    name = "[Titan] "
+    if user_unauthenticated():
+        name = name + session["username"] + "#" + str(session["user_id"])
+    else:
+        name = name + session["username"] + "#" + str(session["discriminator"])
     for webhook in guild_webhooks:
-        if channel_id == webhook["channel_id"] and (webhook["name"].lower().startswith("titan") or webhook["name"].lower().startswith("[titan]")):
+        if channel_id == webhook["channel_id"] and webhook["name"] == name:
             return {
                 "id": webhook["id"],
                 "token": webhook["token"]
             }
-    return None
+    webhook = discord_api.create_webhook(channel_id, name)
+    return webhook["content"]
 
 @api.route("/fetch", methods=["GET"])
 @valid_session_required(api=True)

webapp/titanembeds/blueprints/gateway/gateway.py

@@ -1,10 +1,11 @@
-from titanembeds.utils import socketio, guild_accepts_visitors, get_client_ipaddr
-from titanembeds.userbookkeeping import check_user_in_guild, get_guild_channels, update_user_status
-from titanembeds.database import db, GuildMembers, get_guild_member
+from titanembeds.utils import socketio, guild_accepts_visitors, get_client_ipaddr, discord_api
+from titanembeds.userbookkeeping import check_user_in_guild, get_guild_channels, update_user_status, guild_webhooks_enabled
+from titanembeds.database import db, GuildMembers, get_guild_member, Guilds
 from flask_socketio import Namespace, emit, disconnect, join_room, leave_room
 import functools
 from flask import request, session
 import time
+import json
 
 class Gateway(Namespace):
     def on_connect(self):
@@ -48,6 +49,17 @@ class Gateway(Namespace):
         else:
             msg = {"unauthenticated": False, "id": session["user_id"]}
         emit("embed_user_disconnect", msg, room="GUILD_"+guild_id)
+        if guild_webhooks_enabled(guild_id): # Delete webhooks
+            dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
+            guild_webhooks = json.loads(dbguild.webhooks)
+            name = "[Titan] "
+            if session["unauthenticated"]:
+                name = name + session["username"] + "#" + str(session["user_id"])
+            else:
+                name = name + session["username"] + "#" + str(session["discriminator"])
+            for webhook in guild_webhooks:
+                if webhook["name"] == name:
+                    discord_api.delete_webhook(webhook["id"], webhook["token"])
     
     def on_heartbeat(self, data):
         guild_id = data["guild_id"]

webapp/titanembeds/blueprints/user/user.py

@@ -181,6 +181,7 @@ def administrate_guild(guild_id):
         "name": db_guild.name,
         "unauth_users": db_guild.unauth_users,
         "visitor_view": db_guild.visitor_view,
+        "webhook_messages": db_guild.webhook_messages,
         "chat_links": db_guild.chat_links,
         "bracket_links": db_guild.bracket_links,
         "mentions_limit": db_guild.mentions_limit,
@@ -199,6 +200,7 @@ def update_administrate_guild(guild_id):
         abort(400)
     db_guild.unauth_users = request.form.get("unauth_users", db_guild.unauth_users) in ["true", True]
     db_guild.visitor_view = request.form.get("visitor_view", db_guild.visitor_view) in ["true", True]
+    db_guild.webhook_messages = request.form.get("webhook_messages", db_guild.webhook_messages) in ["true", True]
     db_guild.chat_links = request.form.get("chat_links", db_guild.chat_links) in ["true", True]
     db_guild.bracket_links = request.form.get("bracket_links", db_guild.bracket_links) in ["true", True]
     db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
@@ -212,6 +214,8 @@ def update_administrate_guild(guild_id):
         id=db_guild.id,
         guild_id=db_guild.guild_id,
         unauth_users=db_guild.unauth_users,
+        visitor_view=db_guild.visitor_view,
+        webhook_messages=db_guild.webhook_messages,
         chat_links=db_guild.chat_links,
         bracket_links=db_guild.bracket_links,
         mentions_limit=db_guild.mentions_limit,