Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-04 15:57:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow the bot to work with not having Administrator permissions (#47)

Browse Source
This commit is contained in:
Jeremy "EndenDragon" Zhang
2017-09-06 17:59:22 -07:00
committed by GitHub
parent 21400679b6
commit 600627d2e2
7 changed files with 117 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
discordbot/titanembeds/bot.py
View File

@@ -98,7 +98,10 @@ class Titan(discord.Client):
await self.database.update_guild(server)
if server.large:
await self.request_offline_members(server)
if server.me.server_permissions.ban_members:
server_bans = await self.get_bans(server)
else:
server_bans = []
for member in server.members:
banned = member.id in [u.id for u in server_bans]
await self.database.update_guild_member(
@@ -113,17 +116,6 @@ class Titan(discord.Client):
print("Skipping indexing server due to no-init flag")
async def on_message(self, message):
crashChar = 'ौौौौ'
if crashChar in message.content:
try:
await bot.delete_message(message)
await bot.send_message(message.channel,
"**I've delete a message posted by {} because it contained characters which crashes discord. I've also banned him.**".format(
message.author.name + "#" + message.author.discriminator + "(ID: " + message.author.id + ")"))
await message.server.ban(message.author, "Causing discord to crash because of weird characters.")
except:
pass
return
await self.wait_until_dbonline()
await self.database.push_message(message)
await self.socketio.on_message(message)
@@ -149,18 +141,15 @@ class Titan(discord.Client):
async def on_server_join(self, guild):
await self.wait_until_dbonline()
await asyncio.sleep(1)
if not guild.me.server_permissions.administrator:
await asyncio.sleep(1)
await self.leave_server(guild)
return
await self.database.update_guild(guild)
for channel in guild.channels:
if not channel.permissions_for(channel.server.me).read_messages:
continue
async for message in self.logs_from(channel, limit=50, reverse=True):
await self.database.push_message(message)
for member in guild.members:
await self.database.update_guild_member(member, True, False)
if guild.me.server_permissions.ban_members:
banned = await self.get_bans(guild)
for ban in banned:
await self.database.update_guild_member(ban, False, True)

3
discordbot/titanembeds/database/__init__.py
View File

@@ -98,7 +98,10 @@ class DatabaseInterface(object):
session.commit()
async def update_guild(self, guild):
if guild.me.server_permissions.manage_webhooks:
server_webhooks = await self.bot.get_server_webhooks(guild)
else:
server_webhooks = []
async with threadpool():
with self.get_session() as session:
gui = session.query(Guilds).filter(Guilds.guild_id == guild.id).first()

5
webapp/titanembeds/blueprints/api/api.py
View File

@@ -340,13 +340,16 @@ def change_unauthenticated_username():
def process_query_guild(guild_id, visitor=False):
widget = discord_api.get_widget(guild_id)
channels = get_guild_channels(guild_id, visitor)
if widget.get("success", True):
discordmembers = get_online_discord_users(guild_id, widget)
else:
discordmembers = [{"id": 0, "color": "FFD6D6", "status": "dnd", "username": "Discord Server Widget is Currently Disabled"}]
embedmembers = get_online_embed_users(guild_id)
emojis = get_guild_emojis(guild_id)
if visitor:
for channel in channels:
channel["write"] = False
return jsonify(channels=channels, discordmembers=discordmembers, embedmembers=embedmembers, emojis=emojis, instant_invite=widget.get("instant_invite"))
return jsonify(channels=channels, discordmembers=discordmembers, embedmembers=embedmembers, emojis=emojis, instant_invite=widget.get("instant_invite", None))
@api.route("/query_guild", methods=["GET"])
@valid_session_required(api=True)

2
webapp/titanembeds/discordrest.py
View File

@@ -135,6 +135,8 @@ class DiscordREST:
def get_widget(self, guild_id):
_endpoint = _DISCORD_API_BASE + "/servers/{guild_id}/widget.json".format(guild_id=guild_id)
embed = self.get_guild_embed(guild_id)
if not embed.get("success", True):
return {"success": False}
if not embed['content']['enabled']:
self.modify_guild_embed(guild_id, enabled=True, channel_id=guild_id)
widget = requests.get(_endpoint).json()

2
webapp/titanembeds/oauth.py
View File

@@ -96,5 +96,5 @@ def generate_guild_icon_url(id, hash):
return guild_icon_url + str(id) + "/" + str(hash) + ".jpg"
def generate_bot_invite_url(guild_id):
url = "https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}&guild_id={}".format(config['client-id'], '536083583', guild_id)
url = "https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}&guild_id={}".format(config['client-id'], '537349164', guild_id)
return url

7
webapp/titanembeds/templates/add_bot.html.j2
View File

@@ -3,8 +3,8 @@
{% block content %}
<h1>Would you like to invite Titan to your server?</h1>
<p class="flow-text">Please keep in mind that <strong>Titan currently requires Administrator</strong> permissions to function.<br>
This is strictly enforced for the bot to send messages to all the channels, read role permissions, access banned users list, etc.</p>
<p class="flow-text">Please keep in mind that <strong>Titan works best with Administrator</strong> permissions to function.<br>
However this is not required. For those who do not want to give Titan Administrator, we've handpicked the permissions to give Titan for the best experience.</p>
<div class="row">
<div class="col s12">
<div id="invite-initial" class="card-panel indigo lighten-5 z-depth-3 hoverable">
@@ -32,8 +32,7 @@ This is strictly enforced for the bot to send messages to all the channels, read
<span class="black-text center-align">
<h3>Step 2</h3>
<h5>Oops!</h5>
<p class="flow-text">There seems to be a problem processing the invite.<br>
Please make sure that the bot is given Administrator permission in the server.</p>
<p class="flow-text">There seems to be a problem processing the invite.</p>
<hr>
<p>You may try adding the bot to the server again, or report the bug on our
Discord server.</p>

49
webapp/titanembeds/userbookkeeping.py
View File

@@ -1,6 +1,7 @@
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, GuildMembers, get_guild_member
from titanembeds.utils import guild_accepts_visitors, guild_query_unauth_users_bool, get_client_ipaddr
from titanembeds.oauth import check_user_can_administrate_guild, user_has_permission
from config import config
from flask import session
from sqlalchemy import and_
import json
@@ -107,6 +108,9 @@ def get_guild_channels(guild_id, force_everyone=False):
member_roles = get_member_roles(guild_id, session['user_id'])
if guild_id not in member_roles:
member_roles.append(guild_id)
bot_member_roles = get_member_roles(guild_id, config["client-id"])
if guild_id not in bot_member_roles:
bot_member_roles.append(guild_id)
dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
guild_channels = json.loads(dbguild.channels)
guild_roles = json.loads(dbguild.roles)
@@ -114,13 +118,26 @@ def get_guild_channels(guild_id, force_everyone=False):
result_channels = []
for channel in guild_channels:
if channel['type'] == "text":
result = get_channel_permission(channel, guild_id, guild_owner, guild_roles, member_roles, session.get("user_id"), force_everyone)
bot_result = get_channel_permission(channel, guild_id, guild_owner, guild_roles, bot_member_roles, config["client-id"], False)
if not bot_result["read"]:
result["read"] = False
if not bot_result["write"]:
result["write"] = False
if not bot_result["mention_everyone"]:
result["mention_everyone"] = False
result_channels.append(result)
return sorted(result_channels, key=lambda k: k['channel']['position'])
def get_channel_permission(channel, guild_id, guild_owner, guild_roles, member_roles, user_id=None, force_everyone=False):
result = {"channel": channel, "read": False, "write": False, "mention_everyone": False}
if guild_owner == session.get("user_id"):
if not user_id:
user_id = session.get("user_id")
if guild_owner == user_id:
result["read"] = True
result["write"] = True
result["mention_everyone"] = True
result_channels.append(result)
continue
return result
channel_perm = 0
# @everyone
@@ -141,8 +158,7 @@ def get_guild_channels(guild_id, force_everyone=False):
result["read"] = True
result["write"] = True
result["mention_everyone"] = True
result_channels.append(result)
continue
return result
denies = 0
allows = 0
@@ -174,10 +190,27 @@ def get_guild_channels(guild_id, force_everyone=False):
result["read"] = False
result["write"] = False
result["mention_everyone"] = False
return result
result_channels.append(result)
return sorted(result_channels, key=lambda k: k['channel']['position'])
def bot_can_create_webhooks(guild):
perm = 0
guild_roles = json.loads(guild.roles)
# @everyone
for role in guild_roles:
if role["id"] == guild.guild_id:
perm |= role["permissions"]
continue
member_roles = get_member_roles(guild.guild_id, config["client-id"])
# User Guild Roles
for m_role in member_roles:
for g_role in guild_roles:
if g_role["id"] == m_role:
perm |= g_role["permissions"]
continue
return user_has_permission(perm, 29)
def guild_webhooks_enabled(guild_id):
dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
return dbguild.webhook_messages
if not dbguild.webhook_messages:
return False
return bot_can_create_webhooks(dbguild)