Compare commits
97
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9da9fe7ef | ||
|
|
b5ea709c3a | ||
|
|
9980c49764 | ||
|
|
8d02e28271 | ||
|
|
3a5add3c60 | ||
|
|
dd1c304522 | ||
|
|
619ae92d03 | ||
|
|
431e9c0b35 | ||
|
|
27f90bbaef | ||
|
|
c98bb5888c | ||
|
|
c38632ca21 | ||
|
|
75fc59ed5e | ||
|
|
8d2f2f7dba | ||
|
|
ab88652cdb | ||
|
|
b0e3162123 | ||
|
|
8c1eb8d11f | ||
|
|
40d220e2bb | ||
|
|
4e8032823d | ||
|
|
678fcd37e1 | ||
|
|
7530c59a94 | ||
|
|
6abab5c4e5 | ||
|
|
088de263cc | ||
|
|
ffc78a8814 | ||
|
|
3e88d62577 | ||
|
|
392044c658 | ||
|
|
9442a294f3 | ||
|
|
d149caafea | ||
|
|
000cb9b257 | ||
|
|
3fb65a7b0a | ||
|
|
66e7159022 | ||
|
|
5803c336c0 | ||
|
|
80c4f053bc | ||
|
|
289b752678 | ||
|
|
181b1da879 | ||
|
|
dcea911564 | ||
|
|
81e2885e8d | ||
|
|
14f2e13772 | ||
|
|
fa3284b9e3 | ||
|
|
a5ef579767 | ||
|
|
9c588a18af | ||
|
|
ff68e7df1c | ||
|
|
5b1b4cfecb | ||
|
|
626cca8b81 | ||
|
|
e7bd608017 | ||
|
|
a5f0fb71e0 | ||
|
|
a0f160c801 | ||
|
|
19baf84c80 | ||
|
|
133ff79b94 | ||
|
|
647af0353d | ||
|
|
63e3b3edb2 | ||
|
|
ad58f3a9cb | ||
|
|
c013c85f80 | ||
|
|
f86225849c | ||
|
|
a8def8fd69 | ||
|
|
e5adfdb16f | ||
|
|
ee19f32be9 | ||
|
|
8ff53d9a13 | ||
|
|
9609837b1d | ||
|
|
8cf66351dd | ||
|
|
a4c02b2f77 | ||
|
|
8d8af9ab35 | ||
|
|
f70a7989ae | ||
|
|
fb909c009a | ||
|
|
bdefa035ff | ||
|
|
85eb52d2e1 | ||
|
|
7d1b2f7cac | ||
|
|
c5c79015a9 | ||
|
|
7b335efbe6 | ||
|
|
e686cf88e5 | ||
|
|
117dea48c4 | ||
|
|
62e4417ce8 | ||
|
|
672df41f19 | ||
|
|
328f3fea78 | ||
|
|
18751bc85c | ||
|
|
e243b40be7 | ||
|
|
7a91cd37ec | ||
|
|
efadcb30c7 | ||
|
|
5668e4be7e | ||
|
|
1a8c5616ef | ||
|
|
43c1a5c6cd | ||
|
|
c278bae498 | ||
|
|
8b831fb6aa | ||
|
|
e7cfe8bd4c | ||
|
|
2640ebdad1 | ||
|
|
c5c242de21 | ||
|
|
0710db0654 | ||
|
|
369ea0dd55 | ||
|
|
077119acdd | ||
|
|
ac8d1bc681 | ||
|
|
df8cb3dd49 | ||
|
|
25833364d7 | ||
|
|
d73b671257 | ||
|
|
f6e827fba5 | ||
|
|
2991f81e04 | ||
|
|
b1c0b7013d | ||
|
|
22ea29e8ea | ||
|
|
f9d6227db1 |
@@ -1,6 +1,10 @@
|
|||||||
name: build_develop
|
name: build_develop
|
||||||
|
|
||||||
on: [push]
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '*'
|
||||||
|
- '!main'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -18,7 +22,9 @@ jobs:
|
|||||||
registry: gitea.cheezers.org
|
registry: gitea.cheezers.org
|
||||||
username: imcompiling
|
username: imcompiling
|
||||||
password: ${{ secrets.PASSWORD }}
|
password: ${{ secrets.PASSWORD }}
|
||||||
|
- name: set env
|
||||||
|
run: echo "GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
|
||||||
- name: Build Docker Image
|
- name: Build Docker Image
|
||||||
run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:develop .
|
run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_BRANCH}} .
|
||||||
- name: Push Docker Image
|
- name: Push Docker Image
|
||||||
run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:develop
|
run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_BRANCH}}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: build_release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags: ["v[0-9].[0-9].[0-9]"]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Install Docker
|
||||||
|
uses: https://github.com/papodaca/install-docker-action@v1
|
||||||
|
- name: Log into container registry
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
registry: gitea.cheezers.org
|
||||||
|
username: imcompiling
|
||||||
|
password: ${{ secrets.PASSWORD }}
|
||||||
|
- name: Set env
|
||||||
|
run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
|
||||||
|
- name: Build Docker Image
|
||||||
|
run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_TAG}} .
|
||||||
|
- name: Push Tagged Image
|
||||||
|
run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_TAG}}
|
||||||
+1
-1
@@ -139,4 +139,4 @@ TODO.txt
|
|||||||
sql_tester.py
|
sql_tester.py
|
||||||
conf
|
conf
|
||||||
outputs
|
outputs
|
||||||
dakiny.db
|
database
|
||||||
+8
-3
@@ -1,4 +1,4 @@
|
|||||||
FROM python:3.8.10-slim
|
FROM python:3.10.6-slim
|
||||||
|
|
||||||
# install dependencies for mysqlclient
|
# install dependencies for mysqlclient
|
||||||
# RUN apt-get update && apt-get -y upgrade && apt-get -y install python3-dev default-libmysqlclient-dev build-essential
|
# RUN apt-get update && apt-get -y upgrade && apt-get -y install python3-dev default-libmysqlclient-dev build-essential
|
||||||
@@ -7,11 +7,16 @@ RUN pip install --upgrade pip
|
|||||||
|
|
||||||
WORKDIR /home
|
WORKDIR /home
|
||||||
|
|
||||||
COPY cogs cogs/
|
|
||||||
COPY dakiny_bot.py dakiny_bot.py
|
|
||||||
COPY requirements.txt requirements.txt
|
COPY requirements.txt requirements.txt
|
||||||
|
|
||||||
COPY config.py config.py
|
COPY config.py config.py
|
||||||
|
COPY dakiny_bot.py dakiny_bot.py
|
||||||
|
COPY utils.py utils.py
|
||||||
|
|
||||||
|
COPY bot_messages bot_messages/
|
||||||
COPY classes classes/
|
COPY classes classes/
|
||||||
|
COPY cogs cogs/
|
||||||
|
COPY database_setup database_setup/
|
||||||
|
|
||||||
RUN pip install -r requirements.txt
|
RUN pip install -r requirements.txt
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
```fix
|
```fix
|
||||||
The Dakiny's admin team election
|
Dakiny's Clan Council election
|
||||||
```
|
```
|
||||||
Dakiny is an organization built by and for its members. We are a community of people who come together to support each other in the creation of this magical and unique experience. To sustain what we've created here, and to grow and involve into the future, we vote in our leadership every 3 months to provide an opportunity for new clan members to represent their faction of Dakiny in the Clan Council.
|
Dakiny is an organization built by and for its members. We are a community of people who come together to support each other in the creation of this magical and unique experience. To sustain what we've created here, and to grow and involve into the future, we vote in our leadership every 3 months to provide an opportunity for new clan members to represent their faction of Dakiny in the Clan Council.
|
||||||
|
|
||||||
@@ -14,10 +14,14 @@ Each quarter, a channel is created here on Discord for clan members to cast thei
|
|||||||
**Only clan members can vote and all clan members are granted exactly one equally weighted vote.** If you vote twice for different people, your vote will be annulled.
|
**Only clan members can vote and all clan members are granted exactly one equally weighted vote.** If you vote twice for different people, your vote will be annulled.
|
||||||
|
|
||||||
All clan members are permitted to run for a seat on the Clan Council as long as they:
|
All clan members are permitted to run for a seat on the Clan Council as long as they:
|
||||||
**i) **have been in the clan for enough time to have participated in at least one election;
|
|
||||||
**ii)** have no warnings under their name
|
**i)** have been in the clan for at least 13 weeks (enough time to have participated in at least one election);
|
||||||
and
|
|
||||||
**iii)** have been active (hosted 1 clan event or participate in 1 clan event) in the clan in the past 12 weeks before current election.
|
**ii)** have no warnings under their name in the last 6 months and
|
||||||
|
|
||||||
|
**iii)** have been active in the clan for the past 13 weeks prior to the first day of elections. To be considered active in that timeframe, one must fulfill the following criteria: hosted/participated in at least three clan events, each one in a different week;
|
||||||
|
|
||||||
|
**iv)** are not running under aliases that hide their true identity.
|
||||||
|
|
||||||
Candidates are permitted to vote for themselves. Once a candidate reaches 3 votes from clan members, they have earned their seat, meaning no more votes can be cast for them.
|
Candidates are permitted to vote for themselves. Once a candidate reaches 3 votes from clan members, they have earned their seat, meaning no more votes can be cast for them.
|
||||||
|
|
||||||
@@ -34,16 +38,16 @@ The Clan Council will be denoted by the Discord ranks of <@&{clan_council_id}> a
|
|||||||
<:Rank_Owner:479008325137072155> Clan Leader
|
<:Rank_Owner:479008325137072155> Clan Leader
|
||||||
---message_break---
|
---message_break---
|
||||||
__Here's the timeline:__
|
__Here's the timeline:__
|
||||||
Election begins: {election_start_date}
|
Election begins: {election_start}
|
||||||
Term: {term_start_date} - {term_end_date}
|
Term: {term_start} - {term_end}
|
||||||
|
|
||||||
**{election_start_date}**: Post here to announce candidacy
|
**{election_start}**: Post here to announce candidacy
|
||||||
**{voting_start_date}**: Voting begins
|
**{voting_start}**: Voting begins
|
||||||
**{voting_end_date}**: Votes are tallied and winners are announced
|
**{voting_end}**: Votes are tallied and winners are announced
|
||||||
**{highcouncil_election_date}**: The new Clan Council votes who among them shall receive the two High Council positions of: Clan Leader and Discord Server Manager.
|
**{highcouncil_election}**: The new Clan Council votes who among them shall receive the two High Council positions of: Clan Leader and Discord Server Manager.
|
||||||
**{term_start_date}**: The new Clan Council is officially inaugurated and a drop party (or a giveaway event) begins to commemorate the new leadership.
|
**{term_start}**: The new Clan Council is officially inaugurated and a drop party (or a giveaway event) begins to commemorate the new leadership.
|
||||||
|
|
||||||
This process will begin again next quarter on {next_election_start_date} with the inauguration scheduled for {term_end_date}.
|
This process will begin again next quarter on {next_election_start} with the inauguration scheduled for {term_end}.
|
||||||
---message_break---
|
---message_break---
|
||||||
**You may now announce your candidacy for a seat on the Dakiny Clan Council!
|
**You may now announce your candidacy for a seat on the Dakiny Clan Council!
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -8,6 +8,6 @@ From {highcouncil_election_announce} to {highcouncil_election_start}, you will b
|
|||||||
Discord Server Manager
|
Discord Server Manager
|
||||||
|
|
||||||
Each member of the CCE can cast one for each category by using the emotes: <:Rank_Owner:479008325137072155> for Clan Leader and <:Rank_Deputy:479008295319896064> for Discord Server Manager.
|
Each member of the CCE can cast one for each category by using the emotes: <:Rank_Owner:479008325137072155> for Clan Leader and <:Rank_Deputy:479008295319896064> for Discord Server Manager.
|
||||||
If needed, the icon 🤷 can be used to abstain to vote in any or both categories and it should be apply to all candidates of that category.
|
If needed, the icon 🤷 can be used to abstain to vote in any or both categories and it should be applied to all candidates of that category.
|
||||||
|
|
||||||
Votes can be cast until the {highcouncil_election_end}, so we can announce and have everyone set up to start the term by {term_start}.
|
Votes can be cast until {highcouncil_election_end}, so we can announce and have everyone set up to start the term by {term_start}.
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
====================
|
====================
|
||||||
<@&{clan_member_id}>, it's time to vote for clan council.
|
<@&{clan_member_id}>, it's time to vote for clan council.
|
||||||
|
|
||||||
React with <{voting_emote_id}> to vote.
|
Press the Vote button to vote!
|
||||||
Voting ends next {voting_end_day}, {voting_end_date}.
|
Voting ends next {voting_end_day}, {voting_end}.
|
||||||
Results will then be announced.
|
Results will then be announced.
|
||||||
|
|
||||||
After a candidate receives 3 votes, their spot is secured in the new council, but you can still vote for them to show your support.
|
After a candidate receives 3 votes, their spot is secured in the new council, but you can still vote for them to show your support.
|
||||||
|
|||||||
+205
-66
@@ -2,15 +2,23 @@
|
|||||||
Contains the election cycle class
|
Contains the election cycle class
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import collections
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
import nextcord
|
import nextcord
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select, true
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from classes.nominate_views import NominateView
|
||||||
|
from classes.voting_views import VoteView
|
||||||
from config import DakinyConfig
|
from config import DakinyConfig
|
||||||
from database.sql_data_classes import ElectionInformation, engine
|
from database_setup.sql_data_classes import (
|
||||||
from utils import get_datetime
|
CouncilMembers,
|
||||||
|
ElectionInformation,
|
||||||
|
Votes,
|
||||||
|
engine,
|
||||||
|
)
|
||||||
|
from utils import build_votes_str, get_datetime, get_election_cycle_name
|
||||||
|
|
||||||
|
|
||||||
class ElectionCycle:
|
class ElectionCycle:
|
||||||
@@ -21,25 +29,31 @@ class ElectionCycle:
|
|||||||
|
|
||||||
def __init__(self, cycle: int, config: DakinyConfig, guild: nextcord.Guild) -> None:
|
def __init__(self, cycle: int, config: DakinyConfig, guild: nextcord.Guild) -> None:
|
||||||
"""
|
"""
|
||||||
Generates all dates relevant to the election cycle from input election start, term start and end dates.
|
Generates all dates relevant to the election cycle determined by the config and cycle.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
election_start (datetime): Date the election cycle starts.
|
cycle (int): Which election cycle this cycle is.
|
||||||
term_start (datetime): Date the term being elected starts.
|
config (DakinyConfig): The entire config object.
|
||||||
term_end (datetime): Date the term being elected ends.
|
guild (nextcord.Guild): The guild that this election is running in.
|
||||||
bot: the discord bot instance
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
self.config: DakinyConfig = config
|
self.config: DakinyConfig = config
|
||||||
self.cycle = cycle
|
self.cycle = cycle
|
||||||
self.elecion_cycle = self.config.election_cycles[self.cycle]
|
self.election_cycle = self.config.election_cycles[self.cycle]
|
||||||
self.election_start: datetime = get_datetime(self.elecion_cycle.election_start)
|
self.election_start: datetime = get_datetime(self.election_cycle.election_start)
|
||||||
self.term_start: datetime = get_datetime(self.elecion_cycle.term_start)
|
self.term_start: datetime = get_datetime(self.election_cycle.term_start)
|
||||||
self.term_end: datetime = get_datetime(self.elecion_cycle.term_end)
|
self.term_end: datetime = get_datetime(self.election_cycle.term_end)
|
||||||
self.voting_start: datetime = get_datetime(self.elecion_cycle.voting_start)
|
self.voting_start: datetime = get_datetime(self.election_cycle.voting_start)
|
||||||
self.voting_end: datetime = get_datetime(self.elecion_cycle.voting_end)
|
self.voting_end: datetime = get_datetime(self.election_cycle.voting_end)
|
||||||
self.highcouncil_election_announce: datetime = self.voting_end + timedelta(days=1)
|
self.highcouncil_election_announce: datetime = get_datetime(
|
||||||
self.highcouncil_election_start: datetime = self.highcouncil_election_announce + timedelta(days=3)
|
self.election_cycle.highcouncil_election_announce
|
||||||
self.highcouncil_election_end: datetime = self.term_start - timedelta(days=1)
|
)
|
||||||
|
self.highcouncil_election_start: datetime = get_datetime(
|
||||||
|
self.election_cycle.highcouncil_election_start
|
||||||
|
)
|
||||||
|
self.highcouncil_election_end: datetime = get_datetime(
|
||||||
|
self.election_cycle.highcouncil_election_end
|
||||||
|
)
|
||||||
self.guild: nextcord.Guild = guild
|
self.guild: nextcord.Guild = guild
|
||||||
self.election_over: bool = False
|
self.election_over: bool = False
|
||||||
|
|
||||||
@@ -52,21 +66,27 @@ class ElectionCycle:
|
|||||||
long.
|
long.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
with open("bot_messages/election_announcement.txt", mode="r", encoding="utf8") as file:
|
with open(
|
||||||
|
"bot_messages/election_announcement.txt", mode="r", encoding="utf8"
|
||||||
|
) as file:
|
||||||
message = file.read()
|
message = file.read()
|
||||||
|
|
||||||
next_election = get_datetime(self.config.election_cycles[(self.cycle + 1) % 4].election_start)
|
next_election = get_datetime(
|
||||||
|
self.config.election_cycles[
|
||||||
|
(self.cycle + 1) % len(self.config.election_cycles)
|
||||||
|
].election_start
|
||||||
|
)
|
||||||
|
|
||||||
message = message.format(
|
message = message.format(
|
||||||
clan_council_id=self.config.params.clan_council_role_id,
|
clan_council_id=self.config.params.clan_council_role_id,
|
||||||
high_council_id=self.config.params.high_council_role_id,
|
high_council_id=self.config.params.high_council_role_id,
|
||||||
election_start_date=self.election_start.strftime("%B %d"),
|
election_start=self.election_start.strftime("%B %d"),
|
||||||
term_start_date=self.term_start.strftime("%B %d"),
|
term_start=self.term_start.strftime("%B %d"),
|
||||||
term_end_date=self.term_end.strftime("%B %d"),
|
term_end=self.term_end.strftime("%B %d"),
|
||||||
voting_start_date=self.voting_start.strftime("%B %d"),
|
voting_start=self.voting_start.strftime("%B %d"),
|
||||||
voting_end_date=self.voting_end.strftime("%B %d"),
|
voting_end=self.voting_end.strftime("%B %d"),
|
||||||
highcouncil_election_date=self.highcouncil_election_start.strftime("%B %d"),
|
highcouncil_election=self.highcouncil_election_start.strftime("%B %d"),
|
||||||
next_election_start_date=next_election.strftime("%B %d"),
|
next_election_start=next_election.strftime("%B %d"),
|
||||||
)
|
)
|
||||||
|
|
||||||
return message.split("---message_break---")
|
return message.split("---message_break---")
|
||||||
@@ -79,15 +99,23 @@ class ElectionCycle:
|
|||||||
str: Message to send.
|
str: Message to send.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
with open("bot_messages/highcouncil_election.txt", mode="r", encoding="utf8") as file:
|
with open(
|
||||||
|
"bot_messages/highcouncil_election.txt", mode="r", encoding="utf8"
|
||||||
|
) as file:
|
||||||
message = file.read()
|
message = file.read()
|
||||||
|
|
||||||
return message.format(
|
return message.format(
|
||||||
clan_council_elect_role_id=self.config.params.clan_council_elect_role_id,
|
clan_council_elect_role_id=self.config.params.clan_council_elect_role_id,
|
||||||
highcouncil_election_announce=self.highcouncil_election_announce.strftime("%B %d"),
|
highcouncil_election_announce=self.highcouncil_election_announce.strftime(
|
||||||
highcouncil_election_start=self.highcouncil_election_start.strftime("%B %d"),
|
"%B %d"
|
||||||
highcouncil_election_end=self.highcouncil_election_end.strftime("%B %d"),
|
),
|
||||||
term_start_date=self.term_start.strftime("%B %d"),
|
highcouncil_election_start=self.highcouncil_election_start.strftime(
|
||||||
|
"%B %d"
|
||||||
|
),
|
||||||
|
highcouncil_election_end=self.highcouncil_election_end.strftime(
|
||||||
|
"%B %d"
|
||||||
|
),
|
||||||
|
term_start=self.term_start.strftime("%B %d"),
|
||||||
)
|
)
|
||||||
|
|
||||||
def build_highcouncil_vote_start(self) -> str:
|
def build_highcouncil_vote_start(self) -> str:
|
||||||
@@ -98,12 +126,14 @@ class ElectionCycle:
|
|||||||
str: Message to send.
|
str: Message to send.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
with open("bot_messages/highcouncil_vote.txt", mode="r", encoding="utf8") as file:
|
with open(
|
||||||
|
"bot_messages/highcouncil_vote.txt", mode="r", encoding="utf8"
|
||||||
|
) as file:
|
||||||
message = file.read()
|
message = file.read()
|
||||||
|
|
||||||
return message.format(
|
return message.format(
|
||||||
clan_council_elect_role_id=self.config.params.clan_council_elect_role_id,
|
clan_council_elect_role_id=self.config.params.clan_council_elect_role_id,
|
||||||
term_start_date=self.term_start.strftime("%B %d"),
|
term_start=self.term_start.strftime("%B %d"),
|
||||||
)
|
)
|
||||||
|
|
||||||
def build_vote_start(self) -> str:
|
def build_vote_start(self) -> str:
|
||||||
@@ -116,12 +146,13 @@ class ElectionCycle:
|
|||||||
|
|
||||||
with open("bot_messages/vote_start.txt", mode="r", encoding="utf8") as file:
|
with open("bot_messages/vote_start.txt", mode="r", encoding="utf8") as file:
|
||||||
message = file.read()
|
message = file.read()
|
||||||
vote_end: datetime = get_datetime(self.config.election_cycles[self.cycle].voting_end)
|
vote_end: datetime = get_datetime(
|
||||||
|
self.config.election_cycles[self.cycle].voting_end
|
||||||
|
)
|
||||||
|
|
||||||
return message.format(
|
return message.format(
|
||||||
clan_member_id=self.config.params.clan_member_role_id,
|
clan_member_id=self.config.params.clan_member_role_id,
|
||||||
voting_emote_id=self.config.params.voting_emote_id,
|
voting_end=vote_end.strftime("%B %d"),
|
||||||
voting_end_date=vote_end.strftime("%B %d"),
|
|
||||||
voting_end_day=vote_end.strftime("%A"),
|
voting_end_day=vote_end.strftime("%A"),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -135,7 +166,13 @@ class ElectionCycle:
|
|||||||
if today.date() == self.election_start.date():
|
if today.date() == self.election_start.date():
|
||||||
await self.election_start_action()
|
await self.election_start_action()
|
||||||
elif today.date() == self.voting_start.date():
|
elif today.date() == self.voting_start.date():
|
||||||
await self.voting_end_action()
|
await self.voting_start_action()
|
||||||
|
elif (
|
||||||
|
(self.voting_end - timedelta(3)).date()
|
||||||
|
<= today.date()
|
||||||
|
< self.voting_end.date()
|
||||||
|
):
|
||||||
|
await self.election_reminder()
|
||||||
elif today.date() == self.voting_end.date():
|
elif today.date() == self.voting_end.date():
|
||||||
await self.voting_end_action()
|
await self.voting_end_action()
|
||||||
elif today.date() == self.highcouncil_election_start.date():
|
elif today.date() == self.highcouncil_election_start.date():
|
||||||
@@ -148,13 +185,21 @@ class ElectionCycle:
|
|||||||
Performs required actions for when the election cycle starts.
|
Performs required actions for when the election cycle starts.
|
||||||
"""
|
"""
|
||||||
# create new channel for election
|
# create new channel for election
|
||||||
category: nextcord.CategoryChannel = self.guild.get_channel(self.config.params.active_category_id)
|
parent: nextcord.TextChannel = self.guild.get_channel(
|
||||||
quarter_name: str = self.get_election_cycle_name()
|
self.config.params.voting_parent_id
|
||||||
|
)
|
||||||
|
quarter_name: str = get_election_cycle_name(self.config)
|
||||||
|
|
||||||
|
thread_msg: nextcord.Message = await parent.send(content=quarter_name)
|
||||||
|
|
||||||
# create new entry into database.
|
# create new entry into database.
|
||||||
election_channel: nextcord.TextChannel = await category.create_text_channel(quarter_name)
|
thread: nextcord.Thread = await parent.create_thread(
|
||||||
|
name=quarter_name, message=thread_msg
|
||||||
|
)
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
new_cycle = ElectionInformation(ElectionCycle=quarter_name, ElectionChannel=election_channel.id)
|
new_cycle = ElectionInformation(
|
||||||
|
ElectionCycle=quarter_name, ThreadId=thread.id
|
||||||
|
)
|
||||||
session.add(new_cycle)
|
session.add(new_cycle)
|
||||||
session.commit()
|
session.commit()
|
||||||
|
|
||||||
@@ -162,30 +207,83 @@ class ElectionCycle:
|
|||||||
# election start message is returned as an array of string because it is too long. send each string
|
# election start message is returned as an array of string because it is too long. send each string
|
||||||
# individually.
|
# individually.
|
||||||
messages = self.build_election_announcement()
|
messages = self.build_election_announcement()
|
||||||
for message in messages:
|
for index, message in enumerate(messages):
|
||||||
await election_channel.send(message)
|
# if last item, add the nominate button
|
||||||
|
if index + 1 == len(messages):
|
||||||
|
await thread.send(message, view=NominateView(self.config, self.guild))
|
||||||
|
else:
|
||||||
|
await thread.send(message)
|
||||||
|
|
||||||
async def voting_start_action(self) -> None:
|
async def voting_start_action(self) -> None:
|
||||||
"""
|
"""
|
||||||
Sends message informing members that voting has started.
|
Sends message informing members that voting has started.
|
||||||
Removes write permission from the general clan member role.
|
Removes write permission from the general clan member role.
|
||||||
Adds the voting emote to all messages not sent by the vote. (This is temporary until voting is managed.)
|
|
||||||
"""
|
"""
|
||||||
message = self.build_vote_start()
|
message = self.build_vote_start()
|
||||||
clan_member_role: nextcord.Role = self.guild.get_role(self.config.params.clan_member_role_id)
|
election_thread: nextcord.Thread = self.guild.get_thread(
|
||||||
election_channel: nextcord.TextChannel = self.guild.get_channel(self.get_election_info().ElectionChannel)
|
self.get_election_info().ThreadId
|
||||||
await election_channel.send(message)
|
)
|
||||||
await election_channel.set_permissions(clan_member_role, send_messages=False)
|
await election_thread.send(message)
|
||||||
|
vote_msg = await election_thread.send(
|
||||||
|
build_votes_str(self.config), view=VoteView(self.config, self.guild)
|
||||||
|
)
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(ElectionInformation).where(
|
||||||
|
ElectionInformation.ElectionCycle
|
||||||
|
== get_election_cycle_name(self.config)
|
||||||
|
)
|
||||||
|
info = session.scalar(stmt)
|
||||||
|
info.CouncilVoteMsgId = vote_msg.id
|
||||||
|
session.commit()
|
||||||
|
|
||||||
async def voting_end_action(self) -> None:
|
async def voting_end_action(self) -> None:
|
||||||
"""
|
"""
|
||||||
Performs required actions for when voting time has ended.
|
Performs required actions for when voting time has ended.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
message = self.build_highcouncil_election_announce()
|
message = self.build_highcouncil_election_announce()
|
||||||
council_elect_role: nextcord.Role = self.guild.get_role(self.config.params.clan_council_elect_role_id)
|
council_elect_role: nextcord.Role = self.guild.get_role(
|
||||||
election_channel: nextcord.TextChannel = self.guild.get_channel(self.get_election_info().ElectionChannel)
|
self.config.params.clan_council_elect_role_id
|
||||||
await election_channel.send(message)
|
)
|
||||||
await election_channel.set_permissions(council_elect_role, send_messages=True)
|
election_thread: nextcord.Thread = self.guild.get_thread(
|
||||||
|
self.get_election_info().ThreadId
|
||||||
|
)
|
||||||
|
|
||||||
|
# remove vote button from vote message
|
||||||
|
election_name = get_election_cycle_name(self.config)
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(ElectionInformation.CouncilVoteMsgId).where(
|
||||||
|
ElectionInformation.ElectionCycle == election_name
|
||||||
|
)
|
||||||
|
vote_msg_id = session.scalar(stmt)
|
||||||
|
vote_msg: nextcord.Message = await election_thread.fetch_message(vote_msg_id)
|
||||||
|
await vote_msg.edit(view=None)
|
||||||
|
|
||||||
|
# add the highcouncil role to everyone with 3 or more votes. set elected to true in database
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(Votes.VotedForId).where(Votes.ElectionCycle == election_name)
|
||||||
|
vote_count = collections.Counter(session.scalars(stmt))
|
||||||
|
|
||||||
|
for user_id, votes in vote_count.items():
|
||||||
|
if votes >= 3:
|
||||||
|
stmt = (
|
||||||
|
select(CouncilMembers)
|
||||||
|
.where(CouncilMembers.ElectionCycle == election_name)
|
||||||
|
.where(CouncilMembers.MemberId == user_id)
|
||||||
|
)
|
||||||
|
council_member = session.scalar(stmt)
|
||||||
|
council_member.Elected = True
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
member: nextcord.Member = self.guild.get_member(user_id)
|
||||||
|
|
||||||
|
await member.add_roles(
|
||||||
|
council_elect_role,
|
||||||
|
reason=f"{member.display_name} has won a nomination and become a Council Elect.",
|
||||||
|
)
|
||||||
|
|
||||||
|
await election_thread.send(message)
|
||||||
|
|
||||||
async def highcouncil_election_start_action(self) -> None:
|
async def highcouncil_election_start_action(self) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -193,29 +291,55 @@ class ElectionCycle:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
message = self.build_highcouncil_vote_start()
|
message = self.build_highcouncil_vote_start()
|
||||||
election_channel: nextcord.TextChannel = self.guild.get_channel(self.get_election_info().ElectionChannel)
|
election_thread: nextcord.Thread = self.guild.get_thread(
|
||||||
await election_channel.send(message)
|
self.get_election_info().ThreadId
|
||||||
|
)
|
||||||
|
await election_thread.send(message)
|
||||||
|
|
||||||
async def term_start_action(self) -> None:
|
async def term_start_action(self) -> None:
|
||||||
"""
|
"""
|
||||||
Moves the election channel into the archive category.
|
Marks the election as over.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
self.election_over = True
|
self.election_over = True
|
||||||
election_channel: nextcord.TextChannel = self.guild.get_channel(self.get_election_info().ElectionChannel)
|
|
||||||
archive: nextcord.CategoryChannel = self.guild.get_channel(self.config.params.archive_channel_group_id)
|
|
||||||
|
|
||||||
await election_channel.move(beginning=True, category=archive)
|
elect_role: nextcord.Role = self.guild.get_role(
|
||||||
|
self.config.params.clan_council_elect_role_id
|
||||||
|
)
|
||||||
|
council_role: nextcord.Role = self.guild.get_role(
|
||||||
|
self.config.params.clan_council_role_id
|
||||||
|
)
|
||||||
|
|
||||||
def get_election_cycle_name(self) -> str:
|
# role management
|
||||||
"""
|
with Session(engine) as session:
|
||||||
Builds the unique name of the current election cycle
|
stmt = (
|
||||||
|
select(CouncilMembers.MemberId)
|
||||||
|
.where(
|
||||||
|
CouncilMembers.ElectionCycle == get_election_cycle_name(self.config)
|
||||||
|
)
|
||||||
|
.where(CouncilMembers.Elected == true())
|
||||||
|
)
|
||||||
|
|
||||||
Returns:
|
for member_id in session.scalars(stmt):
|
||||||
str: the name of the election cycle
|
member = self.guild.get_member(member_id)
|
||||||
"""
|
await member.remove_roles(
|
||||||
|
elect_role,
|
||||||
|
reason=f"{member.display_name} no longer needs the elect role.",
|
||||||
|
)
|
||||||
|
await member.add_roles(
|
||||||
|
council_role,
|
||||||
|
reason=f"{member.display_name} has been elected to council.",
|
||||||
|
)
|
||||||
|
|
||||||
return f"{self.election_start.year} {self.elecion_cycle.name} election"
|
election_thread: nextcord.Thread = self.guild.get_thread(
|
||||||
|
self.get_election_info().ThreadId
|
||||||
|
)
|
||||||
|
|
||||||
|
await election_thread.send(
|
||||||
|
"This election cycle is now over. Thank you everyone for participating!"
|
||||||
|
)
|
||||||
|
|
||||||
|
await election_thread.edit(archived=True, locked=True)
|
||||||
|
|
||||||
def get_election_info(self) -> ElectionInformation:
|
def get_election_info(self) -> ElectionInformation:
|
||||||
"""
|
"""
|
||||||
@@ -227,6 +351,21 @@ class ElectionCycle:
|
|||||||
|
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
stmt = select(ElectionInformation).where(
|
stmt = select(ElectionInformation).where(
|
||||||
ElectionInformation.ElectionCycle == self.get_election_cycle_name()
|
ElectionInformation.ElectionCycle
|
||||||
|
== get_election_cycle_name(self.config)
|
||||||
)
|
)
|
||||||
return session.scalar(stmt)
|
return session.scalar(stmt)
|
||||||
|
|
||||||
|
async def election_reminder(self) -> None:
|
||||||
|
"""
|
||||||
|
Sends a message to general chat reminder clan about election.
|
||||||
|
"""
|
||||||
|
|
||||||
|
general: nextcord.TextChannel = self.guild.get_channel(
|
||||||
|
self.config.params.general_channel_id
|
||||||
|
)
|
||||||
|
|
||||||
|
message = f"Reminder to <@&{self.config.params.clan_member_role_id}>! Clan elections are happening! Head over "
|
||||||
|
message += f"to <#{self.get_election_info().ThreadId}> to cast your vote!"
|
||||||
|
|
||||||
|
await general.send(content=message)
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
"""
|
||||||
|
Contains various views to be used in the nomination process.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import nextcord
|
||||||
|
from nextcord.interactions import Interaction
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from config import DakinyConfig
|
||||||
|
from database_setup.sql_data_classes import CouncilMembers, engine
|
||||||
|
from utils import get_election_cycle_name
|
||||||
|
|
||||||
|
NOMINEE_SPLITTER = "========================================\n\n"
|
||||||
|
|
||||||
|
|
||||||
|
class NominateModal(nextcord.ui.Modal):
|
||||||
|
"""
|
||||||
|
Modal for nominating oneself. User writes a speech and then the callback sends the speech into the correct channel.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
config: DakinyConfig,
|
||||||
|
usr_id: int,
|
||||||
|
usr_nominated: bool,
|
||||||
|
speech_content: str,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
"Nomination",
|
||||||
|
timeout=5 * 60, # 5 minutes
|
||||||
|
)
|
||||||
|
self.usr_id: int = usr_id
|
||||||
|
self.config: DakinyConfig = config
|
||||||
|
self.usr_nominated = usr_nominated
|
||||||
|
|
||||||
|
self.speech = nextcord.ui.TextInput(
|
||||||
|
label="Nomination Speech",
|
||||||
|
style=nextcord.TextInputStyle.paragraph,
|
||||||
|
placeholder="Please write your speech here.",
|
||||||
|
required=True,
|
||||||
|
max_length=1500,
|
||||||
|
default_value=speech_content,
|
||||||
|
)
|
||||||
|
self.add_item(self.speech)
|
||||||
|
|
||||||
|
async def callback(self, interaction: Interaction) -> None:
|
||||||
|
"""
|
||||||
|
Sends the nomination speech into the voting channel and enters the user into the voting database.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
interaction (Interaction): Interaction with user.
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
speech = decorate_nomination(interaction.user.id, self.speech.value)
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
if not self.usr_nominated:
|
||||||
|
msg = await interaction.channel.send(speech)
|
||||||
|
|
||||||
|
council_member = CouncilMembers(
|
||||||
|
ElectionCycle=get_election_cycle_name(self.config),
|
||||||
|
MemberId=interaction.user.id,
|
||||||
|
SpeechMsgId=msg.id,
|
||||||
|
)
|
||||||
|
session.add(council_member)
|
||||||
|
session.commit()
|
||||||
|
else:
|
||||||
|
# user already nominated, just need to update the election speech
|
||||||
|
cycle = get_election_cycle_name(self.config)
|
||||||
|
stmt = (
|
||||||
|
select(CouncilMembers)
|
||||||
|
.where(CouncilMembers.ElectionCycle == cycle)
|
||||||
|
.where(CouncilMembers.MemberId == self.usr_id)
|
||||||
|
)
|
||||||
|
obj = session.scalar(stmt)
|
||||||
|
|
||||||
|
msg: nextcord.Message = await interaction.channel.fetch_message(
|
||||||
|
obj.SpeechMsgId
|
||||||
|
)
|
||||||
|
await msg.edit(
|
||||||
|
content=decorate_nomination(interaction.user.id, self.speech.value)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class NominateView(nextcord.ui.View):
|
||||||
|
"""
|
||||||
|
The button to press to start your nomination.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, config: DakinyConfig, guild: nextcord.Guild):
|
||||||
|
super().__init__(timeout=None)
|
||||||
|
self.config: DakinyConfig = config
|
||||||
|
self.guild: nextcord.Guild = guild
|
||||||
|
|
||||||
|
@nextcord.ui.button(
|
||||||
|
label="Nominate Yourself",
|
||||||
|
style=nextcord.ButtonStyle.primary,
|
||||||
|
custom_id="nominate",
|
||||||
|
)
|
||||||
|
async def nominate(
|
||||||
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
|
) -> None:
|
||||||
|
"""
|
||||||
|
Gathers previous information about the user if they have already nominated themselves, then launches
|
||||||
|
the nomination modal to get their speech.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
button (nextcord.ui.Button): Unused. idk why its needed in the decorator
|
||||||
|
interaction (nextcord.Interaction): Interaction of user who pressed the button
|
||||||
|
"""
|
||||||
|
|
||||||
|
# enforce members only
|
||||||
|
if (
|
||||||
|
self.guild.get_role(self.config.params.clan_member_role_id)
|
||||||
|
not in interaction.user.roles
|
||||||
|
):
|
||||||
|
await interaction.response.send_message(
|
||||||
|
f"You must have the <@&{self.config.params.clan_member_role_id}> role to vote.",
|
||||||
|
ephemeral=True,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
cycle = get_election_cycle_name(self.config)
|
||||||
|
usr_nominated = False
|
||||||
|
speech_content = ""
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = (
|
||||||
|
select(CouncilMembers)
|
||||||
|
.where(CouncilMembers.ElectionCycle == cycle)
|
||||||
|
.where(CouncilMembers.MemberId == interaction.user.id)
|
||||||
|
)
|
||||||
|
obj = session.scalar(stmt)
|
||||||
|
if obj is not None:
|
||||||
|
usr_nominated = True
|
||||||
|
msg = await interaction.channel.fetch_message(obj.SpeechMsgId)
|
||||||
|
speech_content = msg.content.split(NOMINEE_SPLITTER)[1]
|
||||||
|
|
||||||
|
await interaction.response.send_modal(
|
||||||
|
NominateModal(
|
||||||
|
self.config, interaction.user.id, usr_nominated, speech_content
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def decorate_nomination(user_id: int, speech: str) -> str:
|
||||||
|
"""
|
||||||
|
Decorates a nomination speech so that it sits within multiple speeches better.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
user_id (int): ID of user sending the speech
|
||||||
|
speech (str): Speech from the user
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: Decorated speech
|
||||||
|
"""
|
||||||
|
msg = f"**Clan Council Nominee: <@{user_id}>**\n"
|
||||||
|
msg += NOMINEE_SPLITTER
|
||||||
|
msg += speech
|
||||||
|
|
||||||
|
return msg
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
"""
|
||||||
|
Contains various views to be used while voting. Controls the logic when performing the vote.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
import nextcord
|
||||||
|
from nextcord import SelectOption
|
||||||
|
from nextcord.interactions import Interaction
|
||||||
|
from sqlalchemy import exc, select, update
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from config import DakinyConfig
|
||||||
|
from database_setup.sql_data_classes import (
|
||||||
|
CouncilMembers,
|
||||||
|
ElectionInformation,
|
||||||
|
Votes,
|
||||||
|
engine,
|
||||||
|
)
|
||||||
|
from utils import build_votes_str, get_election_cycle_name
|
||||||
|
|
||||||
|
|
||||||
|
class VoteSelect(nextcord.ui.StringSelect):
|
||||||
|
def __init__(self, options: List["SelectOption"], config: DakinyConfig) -> None:
|
||||||
|
super().__init__(
|
||||||
|
placeholder="Choose 1",
|
||||||
|
min_values=1,
|
||||||
|
max_values=1,
|
||||||
|
options=options,
|
||||||
|
)
|
||||||
|
self.config = config
|
||||||
|
|
||||||
|
async def callback(self, interaction: Interaction):
|
||||||
|
election_name = get_election_cycle_name(self.config)
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(ElectionInformation.CouncilVoteMsgId).where(
|
||||||
|
ElectionInformation.ElectionCycle == election_name
|
||||||
|
)
|
||||||
|
vote_msg_id = session.scalar(stmt)
|
||||||
|
|
||||||
|
if self.values[0] == "Abstain":
|
||||||
|
voted_for = None
|
||||||
|
else:
|
||||||
|
voted_for = int(self.values[0])
|
||||||
|
|
||||||
|
new_vote = Votes(
|
||||||
|
ElectionCycle=election_name,
|
||||||
|
VoterId=interaction.user.id,
|
||||||
|
VotedForId=voted_for,
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
session.add(new_vote)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
except exc.IntegrityError:
|
||||||
|
session.rollback()
|
||||||
|
stmt = (
|
||||||
|
update(Votes)
|
||||||
|
.where(Votes.ElectionCycle == election_name)
|
||||||
|
.where(Votes.VoterId == interaction.user.id)
|
||||||
|
.values(VotedForId=voted_for)
|
||||||
|
)
|
||||||
|
session.execute(stmt)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
vote_message_str = build_votes_str(self.config)
|
||||||
|
vote_msg: nextcord.Message = await interaction.channel.fetch_message(
|
||||||
|
vote_msg_id
|
||||||
|
)
|
||||||
|
await vote_msg.edit(content=vote_message_str)
|
||||||
|
|
||||||
|
if voted_for is not None:
|
||||||
|
msg = f"You have voted for <@{voted_for}>"
|
||||||
|
else:
|
||||||
|
msg = "You have abstained from voting."
|
||||||
|
|
||||||
|
await interaction.edit(content=msg, view=None)
|
||||||
|
|
||||||
|
|
||||||
|
class VoteView(nextcord.ui.View):
|
||||||
|
"""
|
||||||
|
The button to press to start your nomination.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, config: DakinyConfig, guild: nextcord.Guild):
|
||||||
|
super().__init__(timeout=None)
|
||||||
|
self.config = config
|
||||||
|
self.guild = guild
|
||||||
|
|
||||||
|
@nextcord.ui.button(
|
||||||
|
label="Vote", style=nextcord.ButtonStyle.primary, custom_id="vote"
|
||||||
|
)
|
||||||
|
async def vote(
|
||||||
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
|
) -> None:
|
||||||
|
"""
|
||||||
|
Enforces only members vote. Gets election cycle, creates voting options (checking if user has voted already),
|
||||||
|
then sends the voting view.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
button (nextcord.ui.Button): Unused. idk why its needed in the decorator
|
||||||
|
interaction (nextcord.Interaction): Interaction of user who pressed the button
|
||||||
|
"""
|
||||||
|
|
||||||
|
# enforce members only
|
||||||
|
if (
|
||||||
|
self.guild.get_role(self.config.params.clan_member_role_id)
|
||||||
|
not in interaction.user.roles
|
||||||
|
):
|
||||||
|
await interaction.response.send_message(
|
||||||
|
f"You must have the <@&{self.config.params.clan_member_role_id}> role to vote.",
|
||||||
|
ephemeral=True,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
election: str = get_election_cycle_name(self.config)
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = (
|
||||||
|
select(Votes.VotedForId)
|
||||||
|
.where(Votes.ElectionCycle == election)
|
||||||
|
.where(Votes.VoterId == interaction.user.id)
|
||||||
|
)
|
||||||
|
voted_for = session.scalar(stmt)
|
||||||
|
|
||||||
|
stmt = select(CouncilMembers.MemberId).where(
|
||||||
|
CouncilMembers.ElectionCycle == election
|
||||||
|
)
|
||||||
|
|
||||||
|
options = [
|
||||||
|
SelectOption(
|
||||||
|
label=f"{self.guild.get_member(nominee).display_name} ☑️"
|
||||||
|
if voted_for == nominee
|
||||||
|
else f"{self.guild.get_member(nominee).display_name}",
|
||||||
|
value=str(nominee),
|
||||||
|
)
|
||||||
|
for nominee in session.scalars(stmt)
|
||||||
|
]
|
||||||
|
options.append(
|
||||||
|
SelectOption(
|
||||||
|
label="Abstain ☑️" if voted_for is None else "Abstain",
|
||||||
|
value="Abstain",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
view = nextcord.ui.View()
|
||||||
|
view.add_item(VoteSelect(options=options, config=self.config))
|
||||||
|
|
||||||
|
await interaction.response.send_message(
|
||||||
|
content="Please vote for a clan member!",
|
||||||
|
view=view,
|
||||||
|
ephemeral=True,
|
||||||
|
)
|
||||||
@@ -5,7 +5,9 @@ Cog loader. Adds all command cogs to the bot.
|
|||||||
from nextcord.ext import commands
|
from nextcord.ext import commands
|
||||||
|
|
||||||
from cogs.commands.request import RequestCog
|
from cogs.commands.request import RequestCog
|
||||||
|
from cogs.commands.set import setCog
|
||||||
from cogs.commands.test import TestCog
|
from cogs.commands.test import TestCog
|
||||||
|
from cogs.commands.view import ViewCog
|
||||||
|
|
||||||
|
|
||||||
# This function will be called when this extension is loaded.
|
# This function will be called when this extension is loaded.
|
||||||
@@ -14,5 +16,8 @@ def setup(bot: commands.Bot):
|
|||||||
"""
|
"""
|
||||||
Adds all command classes to bot.
|
Adds all command classes to bot.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
bot.add_cog(RequestCog(bot))
|
bot.add_cog(RequestCog(bot))
|
||||||
bot.add_cog(TestCog(bot))
|
bot.add_cog(TestCog(bot))
|
||||||
|
bot.add_cog(setCog())
|
||||||
|
bot.add_cog(ViewCog())
|
||||||
|
|||||||
@@ -99,5 +99,5 @@ class UsernameRequest(nextcord.ui.View):
|
|||||||
button (nextcord.ui.Button): Unused.
|
button (nextcord.ui.Button): Unused.
|
||||||
interaction (nextcord.Interaction): The interaction of the user clicking the button.
|
interaction (nextcord.Interaction): The interaction of the user clicking the button.
|
||||||
"""
|
"""
|
||||||
content = interaction.message.content + f"\nDenied by <@{interaction.user.id}.>"
|
content = interaction.message.content + f"\nDenied by <@{interaction.user.id}>."
|
||||||
await interaction.response.edit_message(content=content, view=None)
|
await interaction.response.edit_message(content=content, view=None)
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
"""
|
||||||
|
Contains commands and views for set commands.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
import nextcord
|
||||||
|
from nextcord.ext import commands
|
||||||
|
from sqlalchemy import delete, select
|
||||||
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from dakiny_bot import birthday_list
|
||||||
|
from database_setup.sql_data_classes import UserBirthday, engine
|
||||||
|
|
||||||
|
|
||||||
|
class setCog(commands.Cog, name="Set Commands"):
|
||||||
|
"""
|
||||||
|
Class holds set commands.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
"""
|
||||||
|
Default constructor for SetCog class. Does nothing.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@nextcord.slash_command()
|
||||||
|
async def set(self, interaction: nextcord.Interaction):
|
||||||
|
"""
|
||||||
|
Parent slash command for set. Never called.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@set.subcommand(description="Sets your birth month and day for the Birthday Fun. Use 0/0 to remove yourself.")
|
||||||
|
async def birthday(
|
||||||
|
self,
|
||||||
|
interaction: nextcord.Interaction,
|
||||||
|
month: int = nextcord.SlashOption(required=True, min_value=0, max_value=12, description="Your birth month."),
|
||||||
|
day: int = nextcord.SlashOption(required=True, min_value=0, max_value=31, description="Your birth day."),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Sets a user's birthday in the database. Removes on input 0/0. If birthday is today, adds to the birthday_list.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
interaction (nextcord.Interaction): Interaction that invoked the command.
|
||||||
|
month (int, optional): The month a user was born. Is SlashOption.
|
||||||
|
day (int, optional): The day a user was born. Is SlashOption.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Must be deferred, apparently datetime takes a little bit on invalid dates.
|
||||||
|
await interaction.response.defer(ephemeral=True)
|
||||||
|
|
||||||
|
if month == 0 and day == 0:
|
||||||
|
stmt = delete(UserBirthday).where(UserBirthday.UserId == interaction.user.id)
|
||||||
|
with Session(engine) as session:
|
||||||
|
session.execute(stmt)
|
||||||
|
session.commit()
|
||||||
|
await interaction.followup.send("Removed birthday.", ephemeral=True)
|
||||||
|
return
|
||||||
|
|
||||||
|
# check if valid day
|
||||||
|
today = datetime.today()
|
||||||
|
try:
|
||||||
|
birthday = datetime(today.year, month, day)
|
||||||
|
except ValueError:
|
||||||
|
await interaction.followup.send(f"Invalid date: {month}/{day}.", ephemeral=True)
|
||||||
|
return
|
||||||
|
|
||||||
|
# If the birthday is today, add to birthday_list
|
||||||
|
if today.date() == birthday.date():
|
||||||
|
birthday_list.append(interaction.user.id)
|
||||||
|
|
||||||
|
new_birthday = UserBirthday(UserId=interaction.user.id, Birthday=f"{month}/{day}")
|
||||||
|
with Session(engine) as session:
|
||||||
|
try:
|
||||||
|
session.add(new_birthday)
|
||||||
|
session.commit()
|
||||||
|
except IntegrityError:
|
||||||
|
# User already has birthday, change it instead.
|
||||||
|
session.rollback()
|
||||||
|
stmt = select(UserBirthday).where(UserBirthday.UserId == interaction.user.id)
|
||||||
|
new_birthday = session.scalar(stmt)
|
||||||
|
new_birthday.Birthday = f"{month}/{day}"
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
await interaction.followup.send(f"Birthday set to {month}/{day}.", ephemeral=True)
|
||||||
+78
-20
@@ -3,9 +3,22 @@ Commands for testing.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import nextcord
|
import nextcord
|
||||||
from nextcord.ext import commands
|
from nextcord.ext import application_checks, commands
|
||||||
|
|
||||||
from classes.election_cycle import ElectionCycle
|
from classes.election_cycle import ElectionCycle
|
||||||
|
from config import DakinyConfig
|
||||||
|
from utils import get_current_cycle
|
||||||
|
|
||||||
|
|
||||||
|
def is_me():
|
||||||
|
"""
|
||||||
|
predicate that makes sure only I can run the test commands.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def predicate(interaction: nextcord.Interaction):
|
||||||
|
return interaction.user.id == 206602713511886849
|
||||||
|
|
||||||
|
return application_checks.check(predicate)
|
||||||
|
|
||||||
|
|
||||||
class TestCog(commands.Cog, name="Test commands."):
|
class TestCog(commands.Cog, name="Test commands."):
|
||||||
@@ -26,23 +39,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
@test.subcommand()
|
@test.subcommand()
|
||||||
async def msg_builder(self, interaction: nextcord.Interaction):
|
@is_me()
|
||||||
"""
|
|
||||||
Tests the message builder.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
interaction (nextcord.Interaction): Interaction that invoked the command.
|
|
||||||
"""
|
|
||||||
|
|
||||||
cycle = ElectionCycle(0, self.bot)
|
|
||||||
|
|
||||||
message = cycle.build_election_announcement()
|
|
||||||
|
|
||||||
# doesn't tell discord that the message was responded to. Is a test command so I don't really care atm.
|
|
||||||
for m in message:
|
|
||||||
await interaction.channel.send(content=m)
|
|
||||||
|
|
||||||
@test.subcommand()
|
|
||||||
async def election_start(self, interaction: nextcord.Interaction):
|
async def election_start(self, interaction: nextcord.Interaction):
|
||||||
"""
|
"""
|
||||||
idc
|
idc
|
||||||
@@ -51,10 +48,16 @@ class TestCog(commands.Cog, name="Test commands."):
|
|||||||
interaction (nextcord.Interaction): _description_
|
interaction (nextcord.Interaction): _description_
|
||||||
"""
|
"""
|
||||||
|
|
||||||
cycle = ElectionCycle(0, self.bot)
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
await cycle.election_start_action()
|
await cycle.election_start_action()
|
||||||
|
|
||||||
@test.subcommand()
|
@test.subcommand()
|
||||||
|
@is_me()
|
||||||
async def voting_start(self, interaction: nextcord.Interaction):
|
async def voting_start(self, interaction: nextcord.Interaction):
|
||||||
"""
|
"""
|
||||||
tests the voting start action
|
tests the voting start action
|
||||||
@@ -62,5 +65,60 @@ class TestCog(commands.Cog, name="Test commands."):
|
|||||||
Args:
|
Args:
|
||||||
interaction (nextcord.Interaction): _description_
|
interaction (nextcord.Interaction): _description_
|
||||||
"""
|
"""
|
||||||
cycle = ElectionCycle(0, self.bot)
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
await cycle.voting_start_action()
|
await cycle.voting_start_action()
|
||||||
|
|
||||||
|
@test.subcommand()
|
||||||
|
@is_me()
|
||||||
|
async def voting_end(self, interaction: nextcord.Interaction):
|
||||||
|
"""
|
||||||
|
tests the voting start action
|
||||||
|
|
||||||
|
Args:
|
||||||
|
interaction (nextcord.Interaction): _description_
|
||||||
|
"""
|
||||||
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
|
await cycle.voting_end_action()
|
||||||
|
|
||||||
|
@test.subcommand()
|
||||||
|
@is_me()
|
||||||
|
async def election_reminder(self, interaction: nextcord.Interaction):
|
||||||
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
|
await cycle.election_reminder()
|
||||||
|
|
||||||
|
@test.subcommand()
|
||||||
|
@is_me()
|
||||||
|
async def daily(self, interaction: nextcord.Interaction):
|
||||||
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
|
await cycle.check_date()
|
||||||
|
|
||||||
|
@test.subcommand()
|
||||||
|
@is_me()
|
||||||
|
async def term_start(self, interaction: nextcord.Interaction):
|
||||||
|
config: DakinyConfig = self.bot.config
|
||||||
|
cycle = ElectionCycle(
|
||||||
|
get_current_cycle(config),
|
||||||
|
config,
|
||||||
|
self.bot.get_guild(config.params.guild_id),
|
||||||
|
)
|
||||||
|
await cycle.term_start_action()
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
"""
|
||||||
|
Commands for viewing information in the database.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import nextcord
|
||||||
|
from nextcord.ext import commands
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from database_setup.sql_data_classes import ElectionInformation, Votes, engine
|
||||||
|
|
||||||
|
|
||||||
|
class ViewCog(commands.Cog, name="View Commands"):
|
||||||
|
"""
|
||||||
|
Holds the view commands.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
"""
|
||||||
|
Default constructor for ViewCog class. Does nothing.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@nextcord.slash_command()
|
||||||
|
async def view(self, interaction: nextcord.Interaction):
|
||||||
|
"""
|
||||||
|
Parent slash command for set. Never called.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@view.subcommand(
|
||||||
|
description="Shows all voters and who they voted for in a given election."
|
||||||
|
)
|
||||||
|
async def votes(
|
||||||
|
self,
|
||||||
|
interaction: nextcord.Interaction,
|
||||||
|
election_name: str = nextcord.SlashOption(
|
||||||
|
required=True, description="The election you want to view votes for."
|
||||||
|
),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Takes in an election name and sends a response message to the user with a list of people who voted in that
|
||||||
|
election and who they voted for. Notes those tho abstained. Tells a user if the election is invalid. Uses
|
||||||
|
autocompletion to assist with getting elections.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
interaction (nextcord.Interaction): User's interaction with the command.
|
||||||
|
election_name (str): Is SlashOption. The name of the election to view votes for.
|
||||||
|
"""
|
||||||
|
|
||||||
|
stmt = select(Votes).where(Votes.ElectionCycle == election_name)
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
# Check if election exists.
|
||||||
|
if session.scalar(stmt) is None:
|
||||||
|
await interaction.response.send_message(
|
||||||
|
f"Invalid election: {election_name}.", ephemeral=True
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
votes = session.scalars(stmt)
|
||||||
|
content = ""
|
||||||
|
for vote in votes:
|
||||||
|
content += (
|
||||||
|
f"<@{vote.VoterId}> voted for <@{vote.VotedForId}>.\n"
|
||||||
|
if vote.VotedForId is not None
|
||||||
|
else f"<@{vote.VoterId}> abstained from voted.\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
await interaction.response.send_message(content=content, ephemeral=True)
|
||||||
|
|
||||||
|
@votes.on_autocomplete("election_name")
|
||||||
|
async def election_autocomplete(
|
||||||
|
self, interaction: nextcord.Interaction, election_name: str
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Collects all elections that start with the election string.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
interaction (nextcord.Interaction): Interaction with command.
|
||||||
|
election_name (str): String to run autocomplete on.
|
||||||
|
"""
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(ElectionInformation.ElectionCycle)
|
||||||
|
elections = session.scalars(stmt)
|
||||||
|
|
||||||
|
# if empty compare string
|
||||||
|
if not election_name:
|
||||||
|
await interaction.response.send_autocomplete(elections)
|
||||||
|
return
|
||||||
|
|
||||||
|
autofilled_elections: "list[str]" = [
|
||||||
|
election
|
||||||
|
for election in elections
|
||||||
|
if election.lower().startswith(election_name.lower())
|
||||||
|
]
|
||||||
|
await interaction.response.send_autocomplete(autofilled_elections[:25])
|
||||||
+72
-21
@@ -2,14 +2,20 @@
|
|||||||
Defines the daily loop that runs the Dakiny bot functions.
|
Defines the daily loop that runs the Dakiny bot functions.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import random
|
||||||
from datetime import datetime, time
|
from datetime import datetime, time
|
||||||
|
|
||||||
|
import nextcord
|
||||||
from nextcord.ext import commands, tasks
|
from nextcord.ext import commands, tasks
|
||||||
from pytz import timezone
|
from pytz import timezone
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from classes.election_cycle import ElectionCycle
|
from classes.election_cycle import ElectionCycle
|
||||||
from config import DakinyConfig
|
from config import DakinyConfig
|
||||||
from utils import get_datetime
|
from dakiny_bot import birthday_list
|
||||||
|
from database_setup.sql_data_classes import UserBirthday, engine
|
||||||
|
from utils import get_current_cycle
|
||||||
|
|
||||||
|
|
||||||
class DailyLoop(commands.Cog, name="Daily Loop"):
|
class DailyLoop(commands.Cog, name="Daily Loop"):
|
||||||
@@ -19,16 +25,11 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
|
|||||||
|
|
||||||
def __init__(self, bot: commands.Bot) -> None:
|
def __init__(self, bot: commands.Bot) -> None:
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.current_election = self.get_current_cycle()
|
self.current_election = None
|
||||||
|
self.update_birthdays()
|
||||||
|
|
||||||
@commands.Cog.listener()
|
# pylint doesn't recognize that daily_loop is subclassed from tasks.loop.
|
||||||
async def on_ready(self):
|
self.daily_loop.start() # pylint: disable=no-member
|
||||||
"""
|
|
||||||
Starts the loop when bot is ready.
|
|
||||||
"""
|
|
||||||
await self.bot.wait_until_ready()
|
|
||||||
# pylint doesn't recognize that periodic_update_guild_data is subclassed from tasks.loop.
|
|
||||||
await self.daily_loop.start() # pylint: disable=no-member
|
|
||||||
|
|
||||||
@tasks.loop(time=time(hour=0, tzinfo=timezone("GMT")))
|
@tasks.loop(time=time(hour=0, tzinfo=timezone("GMT")))
|
||||||
async def daily_loop(self):
|
async def daily_loop(self):
|
||||||
@@ -39,14 +40,34 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if self.current_election is None:
|
if self.current_election is None:
|
||||||
self.current_election = self.get_current_cycle()
|
self.current_election = self.get_election_cycle()
|
||||||
|
|
||||||
if self.current_election is not None:
|
if self.current_election is not None:
|
||||||
await self.current_election.check_date()
|
await self.current_election.check_date()
|
||||||
if self.current_election.election_over:
|
if self.current_election.election_over:
|
||||||
self.current_election = None
|
self.current_election = None
|
||||||
|
|
||||||
def get_current_cycle(self) -> ElectionCycle:
|
self.update_birthdays()
|
||||||
|
|
||||||
|
if 239547993106284544 in birthday_list:
|
||||||
|
# inform kandy that it is her "birthday"
|
||||||
|
kandy: nextcord.User = await self.bot.fetch_user(239547993106284544)
|
||||||
|
await kandy.send('Happy "Birthday"!')
|
||||||
|
|
||||||
|
await self.cakedays()
|
||||||
|
|
||||||
|
@daily_loop.before_loop
|
||||||
|
async def before_loop(self):
|
||||||
|
"""
|
||||||
|
Actions run before the loop starts. Want to wait for bot to be ready and get the current cycle.
|
||||||
|
"""
|
||||||
|
|
||||||
|
await self.bot.wait_until_ready()
|
||||||
|
|
||||||
|
# Bot needs to know guilds to get the current cycle.
|
||||||
|
self.current_election = self.get_election_cycle()
|
||||||
|
|
||||||
|
def get_election_cycle(self) -> ElectionCycle:
|
||||||
"""
|
"""
|
||||||
Creates an object for the current election cycle if one is active. An election is considered active
|
Creates an object for the current election cycle if one is active. An election is considered active
|
||||||
between the election start and the term start.
|
between the election start and the term start.
|
||||||
@@ -55,15 +76,45 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
|
|||||||
ElectionCycle: Current election cycle, None if there is no election happening.
|
ElectionCycle: Current election cycle, None if there is no election happening.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
today = datetime.today()
|
|
||||||
config: DakinyConfig = self.bot.config
|
config: DakinyConfig = self.bot.config
|
||||||
current_election = None
|
cycle = get_current_cycle(config)
|
||||||
|
|
||||||
for cycle, election in enumerate(config.election_cycles):
|
return ElectionCycle(cycle, config, self.bot.get_guild(config.params.guild_id))
|
||||||
if (
|
|
||||||
today.date() > get_datetime(election.election_start).date()
|
|
||||||
and today.date() < get_datetime(election.term_start).date()
|
|
||||||
):
|
|
||||||
current_election = ElectionCycle(cycle, config, self.bot.get_guild(config.params.guild_id))
|
|
||||||
|
|
||||||
return current_election
|
def update_birthdays(self) -> None:
|
||||||
|
"""
|
||||||
|
Goes through database to collect all birthdays that are today. Adds user's id to birthday list.
|
||||||
|
"""
|
||||||
|
birthday_list.clear()
|
||||||
|
|
||||||
|
# kandy's 1% chance
|
||||||
|
if random.randint(0, 99) == 0:
|
||||||
|
birthday_list.append(239547993106284544)
|
||||||
|
|
||||||
|
today = datetime.today()
|
||||||
|
birthday = f"{today.month}/{today.day}"
|
||||||
|
|
||||||
|
stmt = select(UserBirthday.UserId).where(UserBirthday.Birthday == birthday)
|
||||||
|
with Session(engine) as session:
|
||||||
|
to_add = session.scalars(stmt)
|
||||||
|
birthday_list.extend(to_add.all())
|
||||||
|
|
||||||
|
async def cakedays(self) -> None:
|
||||||
|
"""
|
||||||
|
Loops through the guild's humans checking for joined_at dates that match today's date. Sends a message
|
||||||
|
saying happy cakeday.
|
||||||
|
"""
|
||||||
|
|
||||||
|
today = datetime.today()
|
||||||
|
guild: nextcord.Guild = self.bot.get_guild(self.bot.config.params.guild_id)
|
||||||
|
announce_channel: nextcord.TextChannel = guild.get_channel(self.bot.config.params.general_channel_id)
|
||||||
|
|
||||||
|
cakedays: list[nextcord.Member] = [
|
||||||
|
human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
|
||||||
|
]
|
||||||
|
|
||||||
|
for member in cakedays:
|
||||||
|
years = today.year - member.joined_at.year
|
||||||
|
year_str = "years" if years > 1 else "year"
|
||||||
|
msg = f"Happy Cake day! <@{member.id}> joined the discord {years} {year_str} ago!"
|
||||||
|
await announce_channel.send(msg)
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
"""
|
||||||
|
Defines cog for on message listener.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import nextcord
|
||||||
|
from nextcord.ext import commands
|
||||||
|
|
||||||
|
from dakiny_bot import birthday_list
|
||||||
|
|
||||||
|
|
||||||
|
class SubmissionListener(commands.Cog, name="Message Listener"):
|
||||||
|
"""Sets up message listener."""
|
||||||
|
|
||||||
|
def __init__(self, bot: commands.Bot):
|
||||||
|
self.bot = bot
|
||||||
|
|
||||||
|
@commands.Cog.listener()
|
||||||
|
async def on_message(self, message: nextcord.Message):
|
||||||
|
"""Listener for message creation. Adds score and attachments to submission."""
|
||||||
|
# don't want to process any messages from bot.
|
||||||
|
if message.author.id == self.bot.user.id:
|
||||||
|
return
|
||||||
|
|
||||||
|
await birthday_action(message)
|
||||||
|
|
||||||
|
|
||||||
|
# This function will be called when this extension is loaded.
|
||||||
|
# It is necessary to add these functions to the bot.
|
||||||
|
def setup(bot: commands.Bot):
|
||||||
|
"""Adds function to bot"""
|
||||||
|
bot.add_cog(SubmissionListener(bot))
|
||||||
|
|
||||||
|
|
||||||
|
async def birthday_action(message: nextcord.Message) -> None:
|
||||||
|
"""
|
||||||
|
Checks a message's auther and mentions to see if they are in the birthday list.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
message (nextcord.Message): The message to check for a birthday person.
|
||||||
|
"""
|
||||||
|
|
||||||
|
if message.author.id in birthday_list or bool(set(message.raw_mentions) & set(birthday_list)):
|
||||||
|
await message.add_reaction("🎂")
|
||||||
@@ -10,18 +10,17 @@ class Params:
|
|||||||
Class defines the various configuration parameters.
|
Class defines the various configuration parameters.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
active_category_id: int
|
admin_channel_id: int # might want to rename this...
|
||||||
admin_channel_id: int
|
announcement_category_id: int
|
||||||
annoucement_category_id: int
|
|
||||||
archive_channel_group_id: int
|
|
||||||
clan_council_elect_role_id: int
|
clan_council_elect_role_id: int
|
||||||
clan_council_role_id: int
|
clan_council_role_id: int
|
||||||
clan_info_channel_id: int
|
clan_info_channel_id: int
|
||||||
clan_member_role_id: int
|
clan_member_role_id: int
|
||||||
discord_token: str
|
discord_token: str
|
||||||
|
general_channel_id: int
|
||||||
guild_id: int
|
guild_id: int
|
||||||
high_council_role_id: int
|
high_council_role_id: int
|
||||||
voting_emote_id: str
|
voting_parent_id: int
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -31,6 +30,9 @@ class ElectionCycle:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
election_start: str
|
election_start: str
|
||||||
|
highcouncil_election_announce: str
|
||||||
|
highcouncil_election_end: str
|
||||||
|
highcouncil_election_start: str
|
||||||
name: str
|
name: str
|
||||||
term_end: str
|
term_end: str
|
||||||
term_start: str
|
term_start: str
|
||||||
|
|||||||
+19
-2
@@ -1,3 +1,4 @@
|
|||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@@ -6,12 +7,24 @@ import nextcord
|
|||||||
from hydra.core.config_store import ConfigStore
|
from hydra.core.config_store import ConfigStore
|
||||||
from nextcord.ext import commands
|
from nextcord.ext import commands
|
||||||
|
|
||||||
import database.create_database as create_database
|
import database_setup.create_database as create_database
|
||||||
|
from classes.nominate_views import NominateView
|
||||||
|
from classes.voting_views import VoteView
|
||||||
from config import DakinyConfig
|
from config import DakinyConfig
|
||||||
|
|
||||||
cs = ConfigStore.instance()
|
cs = ConfigStore.instance()
|
||||||
cs.store(name="dakiny_config", node=DakinyConfig)
|
cs.store(name="dakiny_config", node=DakinyConfig)
|
||||||
|
|
||||||
|
birthday_list: list[int] = []
|
||||||
|
|
||||||
|
logger = logging.getLogger("nextcord")
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
|
||||||
|
handler.setFormatter(
|
||||||
|
logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s")
|
||||||
|
)
|
||||||
|
logger.addHandler(handler)
|
||||||
|
|
||||||
|
|
||||||
@hydra.main(config_path="conf", config_name="config")
|
@hydra.main(config_path="conf", config_name="config")
|
||||||
def main(cfg: DakinyConfig):
|
def main(cfg: DakinyConfig):
|
||||||
@@ -40,6 +53,8 @@ def main(cfg: DakinyConfig):
|
|||||||
"""When Discord is connected"""
|
"""When Discord is connected"""
|
||||||
assert bot.user is not None
|
assert bot.user is not None
|
||||||
create_database # pylint: disable=pointless-statement
|
create_database # pylint: disable=pointless-statement
|
||||||
|
bot.add_view(NominateView(cfg, bot.get_guild(cfg.params.guild_id)))
|
||||||
|
bot.add_view(VoteView(cfg, bot.get_guild(cfg.params.guild_id)))
|
||||||
print(f"{bot.user.name} has connected to Discord!")
|
print(f"{bot.user.name} has connected to Discord!")
|
||||||
|
|
||||||
# Run Discord bot
|
# Run Discord bot
|
||||||
@@ -48,4 +63,6 @@ def main(cfg: DakinyConfig):
|
|||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
sys.argv.append("hydra.job.chdir=False")
|
sys.argv.append("hydra.job.chdir=False")
|
||||||
main()
|
sys.argv.append("hydra/job_logging=none")
|
||||||
|
sys.argv.append("hydra/hydra_logging=none")
|
||||||
|
main() # pylint: disable=no-value-for-parameter
|
||||||
|
|||||||
@@ -5,11 +5,11 @@ Small script to create the database if it doesn't already exist.
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
from os.path import exists
|
from os.path import exists
|
||||||
|
|
||||||
if not exists("dakiny.db"):
|
if not exists("database/dakiny.db"):
|
||||||
with sqlite3.connect("dakiny.db") as con:
|
with sqlite3.connect("database/dakiny.db") as con:
|
||||||
cur = con.cursor()
|
cur = con.cursor()
|
||||||
|
|
||||||
with open("database/database.sql", mode="r", encoding="utf-8") as file:
|
with open("database_setup/database.sql", mode="r", encoding="utf-8") as file:
|
||||||
database_script = file.read()
|
database_script = file.read()
|
||||||
cur.executescript(database_script)
|
cur.executescript(database_script)
|
||||||
con.commit()
|
con.commit()
|
||||||
@@ -1,15 +1,14 @@
|
|||||||
-- CREATE DATABASE dakiny;
|
|
||||||
-- use dakiny;
|
|
||||||
|
|
||||||
CREATE TABLE ElectionInformation(
|
CREATE TABLE ElectionInformation(
|
||||||
ElectionCycle varchar(30) not null unique,
|
ElectionCycle varchar(30) not null unique,
|
||||||
ElectionChannel bigint unsigned not null,
|
ThreadId bigint unsigned not null,
|
||||||
|
CouncilVoteMsgId bigint unsigned,
|
||||||
PRIMARY KEY (ElectionCycle)
|
PRIMARY KEY (ElectionCycle)
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE CouncilMembers(
|
CREATE TABLE CouncilMembers(
|
||||||
ElectionCycle varchar(30) not null unique,
|
ElectionCycle varchar(30) not null,
|
||||||
MemberId bigint unsigned not null,
|
MemberId bigint unsigned not null,
|
||||||
|
SpeechMsgId bigint unsigned not null,
|
||||||
Elected boolean DEFAULT false,
|
Elected boolean DEFAULT false,
|
||||||
HighCouncilElect boolean DEFAULT false,
|
HighCouncilElect boolean DEFAULT false,
|
||||||
DiscordManager boolean DEFAULT false,
|
DiscordManager boolean DEFAULT false,
|
||||||
@@ -19,9 +18,15 @@ CREATE TABLE CouncilMembers(
|
|||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE Votes(
|
CREATE TABLE Votes(
|
||||||
ElectionCycle varchar(30) not null unique,
|
ElectionCycle varchar(30) not null,
|
||||||
VoterId bigint unsigned not null,
|
VoterId bigint unsigned not null,
|
||||||
VotedForId bigint unsigned not null,
|
VotedForId bigint unsigned,
|
||||||
FOREIGN KEY (ElectionCycle) REFERENCES ElectionInformation(ElectionCycle),
|
FOREIGN KEY (ElectionCycle) REFERENCES ElectionInformation(ElectionCycle),
|
||||||
PRIMARY KEY (ElectionCycle, VoterId)
|
PRIMARY KEY (ElectionCycle, VoterId)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE UserBirthday (
|
||||||
|
UserId bigint unsigned not null,
|
||||||
|
Birthday varchar(5) not null,
|
||||||
|
PRIMARY KEY (UserId)
|
||||||
);
|
);
|
||||||
@@ -5,7 +5,7 @@ from sqlalchemy import create_engine
|
|||||||
from sqlalchemy.ext.automap import automap_base
|
from sqlalchemy.ext.automap import automap_base
|
||||||
|
|
||||||
# connect with sql alchemy and autoload schema
|
# connect with sql alchemy and autoload schema
|
||||||
URL = "sqlite+pysqlite:///dakiny.db"
|
URL = "sqlite+pysqlite:///database/dakiny.db"
|
||||||
engine = create_engine(URL)
|
engine = create_engine(URL)
|
||||||
Base = automap_base()
|
Base = automap_base()
|
||||||
Base.prepare(autoload_with=engine)
|
Base.prepare(autoload_with=engine)
|
||||||
@@ -14,3 +14,4 @@ Base.prepare(autoload_with=engine)
|
|||||||
ElectionInformation = Base.classes.ElectionInformation
|
ElectionInformation = Base.classes.ElectionInformation
|
||||||
CouncilMembers = Base.classes.CouncilMembers
|
CouncilMembers = Base.classes.CouncilMembers
|
||||||
Votes = Base.classes.Votes
|
Votes = Base.classes.Votes
|
||||||
|
UserBirthday = Base.classes.UserBirthday
|
||||||
@@ -4,6 +4,12 @@ File contains util functions.
|
|||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from config import DakinyConfig
|
||||||
|
from database_setup.sql_data_classes import CouncilMembers, Votes, engine
|
||||||
|
|
||||||
|
|
||||||
def get_datetime(day: str) -> datetime:
|
def get_datetime(day: str) -> datetime:
|
||||||
"""
|
"""
|
||||||
@@ -24,3 +30,74 @@ def get_datetime(day: str) -> datetime:
|
|||||||
year += 1
|
year += 1
|
||||||
|
|
||||||
return datetime(year, month, day)
|
return datetime(year, month, day)
|
||||||
|
|
||||||
|
|
||||||
|
def get_election_cycle_name(config: DakinyConfig) -> str:
|
||||||
|
"""
|
||||||
|
Builds the unique name of the current election cycle
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: the name of the election cycle
|
||||||
|
"""
|
||||||
|
cycle = get_current_cycle(config)
|
||||||
|
current_cycle = config.election_cycles[cycle]
|
||||||
|
|
||||||
|
return f"vote-{get_datetime(current_cycle.election_start).year}-{current_cycle.name}"
|
||||||
|
|
||||||
|
|
||||||
|
def get_current_cycle(config: DakinyConfig) -> int:
|
||||||
|
"""
|
||||||
|
Returns index for active election. An election is considered active between the election start and the term start.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config (DakinyConfig): Config object to use
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
int: cycle index for active election. -1 for no active cycle
|
||||||
|
"""
|
||||||
|
|
||||||
|
today = datetime.today()
|
||||||
|
|
||||||
|
for cycle, election in enumerate(config.election_cycles):
|
||||||
|
if (
|
||||||
|
today.date() >= get_datetime(election.election_start).date()
|
||||||
|
and today.date() <= get_datetime(election.term_start).date()
|
||||||
|
):
|
||||||
|
return cycle
|
||||||
|
|
||||||
|
return -1
|
||||||
|
|
||||||
|
|
||||||
|
def build_votes_str(config: DakinyConfig) -> str:
|
||||||
|
"""
|
||||||
|
Creates a string that contains all nominees and their votes to be sent as a discord message.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config (DakinyConfig): Daking config object
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: String that contains all nominees and their votes.
|
||||||
|
"""
|
||||||
|
|
||||||
|
votes: dict[int, int] = {}
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
stmt = select(CouncilMembers).where(CouncilMembers.ElectionCycle == get_election_cycle_name(config))
|
||||||
|
|
||||||
|
for nominee in session.scalars(stmt):
|
||||||
|
votes[nominee.MemberId] = 0
|
||||||
|
|
||||||
|
stmt = select(Votes).where(Votes.ElectionCycle == get_election_cycle_name(config))
|
||||||
|
|
||||||
|
for vote in session.scalars(stmt):
|
||||||
|
if vote.VotedForId is not None:
|
||||||
|
votes[vote.VotedForId] += 1
|
||||||
|
|
||||||
|
votes_str: str = "===================="
|
||||||
|
for user_id, num_votes in votes.items():
|
||||||
|
votes_str += f"\n<@{user_id}>: "
|
||||||
|
|
||||||
|
for num in range(num_votes):
|
||||||
|
votes_str += "☑️"
|
||||||
|
|
||||||
|
return votes_str
|
||||||
|
|||||||
Reference in New Issue
Block a user