Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b6dde62

Browse files
committedDec 9, 2019
Remove all socket stuff
1 parent 81f1f73 commit b6dde62

File tree

2 files changed

+21
-59
lines changed

2 files changed

+21
-59
lines changed
 

‎bot.py

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,19 @@
55
from datetime import datetime
66
from functools import partial
77
from threading import Thread
8-
98
import discord
10-
import eventlet
119
from bson.json_util import dumps
1210
from discord.ext import commands
1311
from dotenv import load_dotenv
1412
from flask import Flask, jsonify, session, request
1513
from flask_session import Session
16-
from flask_socketio import SocketIO
1714
from requests_oauthlib import OAuth2Session
1815

1916
from utils import loadAllCogs, loadAllExtensions, SetupLogger, RedisClient, Mongo, APIServer, ServerSettings, getLogger, \
2017
UserProfiles, BotAdmins, getSystemLogChannel
2118

2219
# get asyncio loop
2320
loop = asyncio.get_event_loop()
24-
eventlet.monkey_patch(thread=False)
2521

2622
# create flask app
2723
app = Flask(__name__)
@@ -38,8 +34,6 @@
3834
app.config["SESSION_REDIS"] = RedisClient().getRedisClient()
3935
app.config['SECRET_KEY'] = OAUTH2_CLIENT_SECRET
4036
sess = Session()
41-
socketio = SocketIO(app, cors_allowed_origins="*",
42-
engineio_logger=True) # message_queue=f"redis://{os.getenv('REDIS_HOST')}:{os.getenv('REDIS_PORT')}/1")
4337

4438
API_VERSION = os.getenv('API_VERSION')
4539

@@ -52,7 +46,6 @@
5246

5347
# Create a new 'bot' with prefix
5448
bot = commands.Bot(command_prefix=PREFIX, description="PyBot", case_insensitive=True, owner_id=213247101314924545)
55-
bot.socketio = socketio
5649
bot.remove_command('help')
5750
bot.remove_listener(func=bot.on_message)
5851

@@ -80,10 +73,7 @@ async def on_ready():
8073
loadAllExtensions(bot)
8174

8275
# Start the flask api
83-
# partial_run = partial(app.run, debug=True, host=os.getenv("API_HOST"), port=os.getenv("API_PORT"), use_reloader=False)
84-
# APIServer(partial_run).start()
85-
86-
partial_run = partial(socketio.run, app=app, debug=True, host=os.getenv("API_HOST"), port=os.getenv("API_PORT"),
76+
partial_run = partial(app.run, debug=True, host=os.getenv("API_HOST"), port=os.getenv("API_PORT"),
8777
use_reloader=False)
8878
APIServer(partial_run).start()
8979

@@ -798,38 +788,9 @@ def make_session(token=None, state=None, scope=None):
798788
token_updater=token_updater)
799789

800790

801-
# def socket_worker():
802-
# if bot.is_ready():
803-
# payload = {
804-
# "users": len(bot.users),
805-
# "servers": len(bot.guilds)
806-
# }
807-
# socketio.emit("data", payload)
808-
# socketio.sleep(5)
809-
# socket_worker()
810-
811-
bot.update_user_count = lambda: socketio.emit("user count", {"users": len(bot.users)})
812-
813-
814-
@socketio.on('connect')
815-
def connected():
816-
getLogger().debug("[SocketIO] Client Connected")
817-
socketio.emit("user count", {"users": len(bot.users)})
818-
socketio.emit("server count", {"servers": len(bot.guilds)})
819-
820-
821-
# @socketio.on("start")
822-
# def start_worker():
823-
# getLogger().debug("[SocketIO] Started Worker")
824-
# socketio.start_background_task(target=socket_worker)
825-
826-
827791
if __name__ == "__main__":
828792
# setup the logger with colored logger and verbose logging
829793
SetupLogger(full_debug=False)
830794

831-
# load the .env file with token
832-
load_dotenv()
833-
834795
# login to discord
835796
bot.run(os.getenv("TOKEN"))

‎cogs/GuildEvents.py

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import discord
22
from datetime import datetime
3-
43
import utils
54
from utils import utc_to_epoch, ServerSettings
65
from discord.ext import commands
@@ -13,15 +12,13 @@ def __init__(self, bot):
1312

1413
@commands.Cog.listener()
1514
async def on_member_join(self, member):
16-
self.bot.socketio.emit("user count", {"users": len(self.bot.users)})
17-
1815
if not member.bot:
1916
UserProfiles(member)
2017

2118
server_settings = ServerSettings(member.guild).getServerDocument()
2219
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings["log_channel"] else None
2320
enabled = server_settings["events"]["guild_member_join"]
24-
if log_channel and enabled:
21+
if log_channel is not None and enabled:
2522
created_at_unix = utc_to_epoch(member.created_at)
2623
created_date = datetime.fromtimestamp(created_at_unix)
2724
embed = discord.Embed(title="User joined the server!", description=None, color=discord.Color.green(),
@@ -36,11 +33,15 @@ async def on_member_join(self, member):
3633

3734
@commands.Cog.listener()
3835
async def on_member_remove(self, member):
39-
self.bot.socketio.emit("user count", {"users": len(self.bot.users)})
4036

4137
if not member.bot:
4238
UserProfiles(member).reset()
43-
banned_users = await member.guild.bans()
39+
try:
40+
banned_users = await member.guild.bans()
41+
except:
42+
# TODO: add exceptions here and handle them
43+
return
44+
4445
is_banned = [x for x in banned_users if x.user.id == member.id]
4546
if is_banned:
4647
return
@@ -49,7 +50,7 @@ async def on_member_remove(self, member):
4950
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
5051
"log_channel"] else None
5152
enabled = server_settings["events"]["guild_member_leave"]
52-
if log_channel and enabled:
53+
if log_channel is not None and enabled:
5354
created_at_unix = utc_to_epoch(member.created_at)
5455
created_date = datetime.fromtimestamp(created_at_unix)
5556
joined_at_unix = utc_to_epoch(member.joined_at)
@@ -73,7 +74,7 @@ async def on_member_remove(self, member):
7374
# log_channel = self.bot.get_channel(server_settings["settings"]["log_channel"]) if server_settings["settings"][
7475
# "log_channel"] else None
7576
# enabled = server_settings["settings"]["events"]["guild_member_ban"]
76-
# if log_channel and enabled:
77+
# if log_channel is not None and enabled:
7778
# ban_reason = await guild.fetch_ban(user=member)
7879
# embed = discord.Embed(title="User was banned from the server!", description=None, color=discord.Color.red(), timestamp=datetime.utcnow())
7980
# embed.add_field(name=f"Username", value=f"{member.mention} ({member.id})", inline=False)
@@ -92,7 +93,7 @@ async def on_member_unban(self, guild: discord.Guild, member: discord.Member):
9293
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
9394
"log_channel"] else None
9495
enabled = server_settings["events"]["guild_member_unban"]
95-
if log_channel and enabled:
96+
if log_channel is not None and enabled:
9697
embed = discord.Embed(title="User was unbanned from the server!", description=None,
9798
color=discord.Color.green(),
9899
timestamp=datetime.utcnow())
@@ -108,7 +109,7 @@ async def on_member_unban(self, guild: discord.Guild, member: discord.Member):
108109
# server_settings = ServerSettings(before.guild).getServerDocument()
109110
# log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings["log_channel"] else None
110111
# enabled = server_settings["events"]["guild_member_update"]
111-
# if log_channel and enabled:
112+
# if log_channel is not None and enabled:
112113
# pass
113114

114115
@commands.Cog.listener()
@@ -119,7 +120,7 @@ async def on_message_delete(self, message: discord.Message):
119120
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
120121
"log_channel"] else None
121122
enabled = server_settings["events"]["guild_message_delete"]
122-
if log_channel and enabled:
123+
if log_channel is not None and enabled:
123124
embed = discord.Embed(title=f"Message deleted", description=None,
124125
color=discord.Color.red(),
125126
timestamp=datetime.utcnow())
@@ -139,7 +140,7 @@ async def on_message_edit(self, before: discord.Message, after: discord.Message)
139140
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
140141
"log_channel"] else None
141142
enabled = server_settings["events"]["guild_message_edit"]
142-
if log_channel and enabled:
143+
if log_channel is not None and enabled:
143144
embed = discord.Embed(title=f"Message edited", description=None,
144145
color=discord.Color.green(),
145146
timestamp=datetime.utcnow())
@@ -156,7 +157,7 @@ async def on_guild_channel_create(self, channel: discord.abc.GuildChannel):
156157
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
157158
"log_channel"] else None
158159
enabled = server_settings["events"]["guild_channel_create"]
159-
if log_channel and enabled:
160+
if log_channel is not None and enabled:
160161
await log_channel.send(f"Channel created: {channel.mention} [{channel.name}] ({channel.id})")
161162

162163
@commands.Cog.listener()
@@ -165,7 +166,7 @@ async def on_guild_channel_delete(self, channel: discord.abc.GuildChannel):
165166
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
166167
"log_channel"] else None
167168
enabled = server_settings["events"]["guild_channel_delete"]
168-
if log_channel and enabled:
169+
if log_channel is not None and enabled:
169170
await log_channel.send(f"Channel deleted: {channel.name} ({channel.id})")
170171

171172
@commands.Cog.listener()
@@ -175,7 +176,7 @@ async def on_guild_update(self, before: discord.Guild, after: discord.Guild):
175176
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
176177
"log_channel"] else None
177178
enabled = server_settings["events"]["guild_update"]
178-
if log_channel and enabled:
179+
if log_channel is not None and enabled:
179180
embed = discord.Embed(title=f"Guild Updated", description=None, color=discord.Color.green(),
180181
timestamp=datetime.utcnow())
181182
embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
@@ -194,7 +195,7 @@ async def on_guild_role_create(self, role: discord.Role):
194195
embed.add_field(name="Hoisted", value=f"{role.hoist}")
195196
embed.add_field(name="Mentionable", value=f"{role.mentionable}")
196197
embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
197-
if log_channel and enabled:
198+
if log_channel is not None and enabled:
198199
await log_channel.send(content=None, embed=embed)
199200

200201
@commands.Cog.listener()
@@ -208,7 +209,7 @@ async def on_guild_role_delete(self, role: discord.Role):
208209
embed.add_field(name="Role Name", value=f"{role.name}")
209210
embed.add_field(name="Role ID", value=f"{role.id}")
210211
embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
211-
if log_channel and enabled:
212+
if log_channel is not None and enabled:
212213
await log_channel.send(content=None, embed=embed)
213214

214215
@commands.Cog.listener()
@@ -218,7 +219,7 @@ async def on_guild_role_update(self, before: discord.Role, after: discord.Role):
218219
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
219220
"log_channel"] else None
220221
enabled = server_settings["events"]["guild_role_update"]
221-
if log_channel and enabled:
222+
if log_channel is not None and enabled:
222223
embed = discord.Embed(title=f"Role Updated", description=None, color=discord.Color.green(),
223224
timestamp=datetime.utcnow())
224225
embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
@@ -231,7 +232,7 @@ async def on_guild_emojis_update(self, guild: discord.Guild, before: discord.Emo
231232
log_channel = self.bot.get_channel(server_settings["log_channel"]) if server_settings[
232233
"log_channel"] else None
233234
enabled = server_settings["events"]["guild_role_update"]
234-
if log_channel and enabled:
235+
if log_channel is not None and enabled:
235236
# embed = discord.Embed(title=f"Emoji Updated", description=None, color=discord.Color.green(),
236237
# timestamp=datetime.utcnow())
237238
# embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)

0 commit comments

Comments
 (0)
Please sign in to comment.