Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24ffb02869 | ||
|
|
cb3eb4b09b | ||
|
|
c39e2c137b | ||
|
|
eedaf1c71f | ||
|
|
70e4a84db3 | ||
|
|
443b92dfd3 | ||
|
|
094a22f5e7 |
@@ -20,7 +20,4 @@ COPY database_setup database_setup/
|
||||
|
||||
RUN pip install -r requirements.txt
|
||||
|
||||
# Expose to outside of container
|
||||
EXPOSE 5000
|
||||
|
||||
CMD ["python3", "-u", "./main.py"]
|
||||
@@ -1,5 +1,9 @@
|
||||
# Dakiny Bot
|
||||
|
||||
Bot assumes that it always did the step before it. If the step before an action didn't happen, behavior is undefined.
|
||||
Dakiny clan's own discord bot!
|
||||
|
||||
|
||||
### Assumptions
|
||||
- For Elections: Bot assumes that it always did the step before it. If the step before an action didn't happen, behavior is undefined.
|
||||
Object creation in the middle of a cycle is only there for restarting the bot. All relevant information should already
|
||||
exist in the database.
|
||||
@@ -6,7 +6,7 @@ import collections
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import nextcord
|
||||
from sqlalchemy import select, true
|
||||
from sqlalchemy import select, true, update
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from classes.nominate_highcouncil_views import NominateHighCouncilView
|
||||
@@ -388,15 +388,32 @@ class ElectionCycle:
|
||||
stmt = select(Votes.VotedForId).where(Votes.ElectionCycle == cl_election)
|
||||
cl_votes = collections.Counter(session.scalars(stmt))
|
||||
|
||||
election_cycle = get_election_cycle_name(self.config)
|
||||
try:
|
||||
dm_winner = max(dm_votes, key=dm_votes.get)
|
||||
stmt = (
|
||||
update(CouncilMembers)
|
||||
.where(CouncilMembers.ElectionCycle == election_cycle)
|
||||
.where(CouncilMembers.MemberId == dm_winner)
|
||||
.values(DiscordManager=True)
|
||||
)
|
||||
session.execute(stmt)
|
||||
except ValueError:
|
||||
dm_winner = "No winner"
|
||||
try:
|
||||
cl_winner = max(cl_votes, key=cl_votes.get)
|
||||
stmt = (
|
||||
update(CouncilMembers)
|
||||
.where(CouncilMembers.ElectionCycle == election_cycle)
|
||||
.where(CouncilMembers.MemberId == cl_winner)
|
||||
.values(ClanLeader=True)
|
||||
)
|
||||
session.execute(stmt)
|
||||
except ValueError:
|
||||
cl_winner = "No winner"
|
||||
|
||||
session.commit()
|
||||
|
||||
election_thread: nextcord.Thread = self.guild.get_thread(
|
||||
self.get_election_info().ThreadId
|
||||
)
|
||||
@@ -409,7 +426,9 @@ class ElectionCycle:
|
||||
vote_msg: nextcord.Message = await election_thread.fetch_message(vote_msg_id)
|
||||
await vote_msg.edit(view=None)
|
||||
|
||||
highcouncil_msg: str = f"Congratulations for our high council members!\n Clan Leader: <@{cl_winner}>\n"
|
||||
highcouncil_msg: str = (
|
||||
f"Congratulations for our high council members!\n Clan Leader: <@{cl_winner}>\n"
|
||||
)
|
||||
highcouncil_msg += f"Discord Manager: <@{dm_winner}>"
|
||||
await election_thread.send(highcouncil_msg)
|
||||
|
||||
|
||||
@@ -33,9 +33,8 @@ class ClanMessages(commands.Cog, name="Clan Messages"):
|
||||
"""
|
||||
Triggers when the bot is in ready state. Adds the webhook listener to FastAPI and serves.
|
||||
"""
|
||||
await self.update_messages()
|
||||
app.add_api_route("/messages/", self.update_messages, methods=["POST"])
|
||||
config = uvicorn.Config(app=app, port=5000, log_level="info")
|
||||
config = uvicorn.Config(app=app, host="0.0.0.0", port=5000, log_level="info")
|
||||
server = uvicorn.Server(config)
|
||||
await server.serve()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user