diff --git a/.env_sample b/.env_sample
index eaf5bd3..0a151a4 100644
--- a/.env_sample
+++ b/.env_sample
@@ -12,7 +12,7 @@ BOT_NAME="heymojiBOT"
ERROR_CHANNEL=""
SPECIAL_EMOJI="trophy" # ๐
-LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI=5
+LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI=1000
ALLOWED_REACTION_LIST=["pray", "heart", "eye_shaking", "+1", "๊ธฐ๋", "๊ธฐ์จ", "kkkk", "trophy", "ํธ๋กํผ"]
ALLOWED_EMOJI_TYPES='[
{"emoji": "โค๏ธ", "emoji_names": ["heart"]},
diff --git a/README.md b/README.md
index 7356ce9..5e7cab4 100644
--- a/README.md
+++ b/README.md
@@ -75,24 +75,24 @@ DDD์ ๋ํ ์คํฐ๋๋ฅผ ์ํด ๊ตฌ์กฐ๋ฅผ ๋ณ๊ฒฝํ์ผ๋ฉฐ https://github.com/E
DB๋ `MySQL`์ ์ฌ์ฉํ๋ฉฐ ๋น๋๊ธฐ ์ฒ๋ฆฌ๋ฅผ ์ํด `aiomysql`๋ผ์ด๋ธ๋ฌ๋ฆฌ๋ฅผ ํจ๊ป ์ฌ์ฉํฉ๋๋ค.
๋ค๋ฅธ DB ์ฌ์ฉํ๋ ค๋ฉด `config` ์ค์ ์ด ์กฐ๊ธ ๋ฌ๋ผ์ง ์ ์์ต๋๋ค.
-| ์ด๋ฆ | ์ค๋ช
|
-|-----------------------------------|-------------------------------------|
-| ENV | ๋ฐฐํฌํ๊ฒฝ ์ ์ |
-| ALLOW_ORIGINS | CORS๋ฅผ ํ์ฉํ ORIGIN ๋ฆฌ์คํธ |
-| DB_HOST | DB ํธ์คํธ |
-| DB_PORT | DB ํฌํธ |
-| DATABASE | DB ์ด๋ฆ |
-| DB_USERNAME | DB ์ ์ ์ ์ ๋ค์ |
-| DB_PASSWORD | DB ํจ์ค์๋ |
-| SLACK_TOKEN | ์ฌ๋ ํ ํฐ |
-| BOT_NAME | ์ฌ๋๋ด ์ด๋ฆ |
-| ERROR_CHANNEL | ์ฌ๋ ์๋ฌ ๋ฆฌํฌํ
์ฑ๋ |
-| SPECIAL_EMOJI | ํน๋ณํ ์๋ฏธ๋ฅผ ๊ฐ์ง ์ด๋ชจ์ง |
-| LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI | ํ๋ฃจ์ ๋จ๊ธธ์ ์๋ SPECIAL_EMOJI ์ต๋ ๊ฐ์ |
-| ALLOWED_REACTION_LIST | ์นํ
๋ฆฌ์ก์
์ผ๋ก ํ์ฉ๋ ์ด๋ชจ์ง(reaction)๋ค์ ์ ์ํฉ๋๋ค. |
-| ALLOWED_EMOJI_TYPES | ํธ๋ค๋งํ ์ด๋ชจ์ง๋ค์ ์ ์ํฉ๋๋ค. |
-| RANK_URL | ๋ญํน ์นํ์ด์ง URK |
-| DEFAULT_AVATAR_URL | ๊ธฐ๋ณธ ํ๋กํ ์ด๋ฏธ์ง URL |
+| ์ด๋ฆ | ์ค๋ช
|
+|-----------------------------------|---------------------------------------|
+| ENV | ๋ฐฐํฌํ๊ฒฝ ์ ์ |
+| ALLOW_ORIGINS | CORS๋ฅผ ํ์ฉํ ORIGIN ๋ฆฌ์คํธ |
+| DB_HOST | DB ํธ์คํธ |
+| DB_PORT | DB ํฌํธ |
+| DATABASE | DB ์ด๋ฆ |
+| DB_USERNAME | DB ์ ์ ์ ์ ๋ค์ |
+| DB_PASSWORD | DB ํจ์ค์๋ |
+| SLACK_TOKEN | ์ฌ๋ ํ ํฐ |
+| BOT_NAME | ์ฌ๋๋ด ์ด๋ฆ |
+| ERROR_CHANNEL | ์ฌ๋ ์๋ฌ ๋ฆฌํฌํ
์ฑ๋ |
+| SPECIAL_EMOJI | ํน๋ณํ ์๋ฏธ๋ฅผ ๊ฐ์ง ์ด๋ชจ์ง |
+| LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI | ๋งค์ ๋ค๋ฅธ ๋ฉค๋ฒ์๊ฒ ์ค ์ ์๋ SPECIAL_EMOJI ์ ํ ๊ฐ์ |
+| ALLOWED_REACTION_LIST | ์นํ
๋ฆฌ์ก์
์ผ๋ก ํ์ฉ๋ ์ด๋ชจ์ง(reaction)๋ค์ ์ ์ํฉ๋๋ค. |
+| ALLOWED_EMOJI_TYPES | ํธ๋ค๋งํ ์ด๋ชจ์ง๋ค์ ์ ์ํฉ๋๋ค. |
+| RANK_URL | ๋ญํน ์นํ์ด์ง URK |
+| DEFAULT_AVATAR_URL | ๊ธฐ๋ณธ ํ๋กํ ์ด๋ฏธ์ง URL |
@@ -172,6 +172,7 @@ uvicorn app.main:app --port 8080
๐ ์ ์ ๋ณด์ด๊ธฐ
@EmojiBot --show_user --slack_id=์ฌ๋ID
```
+
### ๐ show_best_member ์์
@@ -199,6 +200,7 @@ if [ "$checker" == "0" ]; then
cd $SCRIPT_PATH && `uvicorn main:app --port 8080 &`
fi
```
+
# ๐ค Slack Bot ์ค์
diff --git a/app/domains/reactions/services.py b/app/domains/reactions/services.py
index 8b5f4a8..a07d44b 100644
--- a/app/domains/reactions/services.py
+++ b/app/domains/reactions/services.py
@@ -158,6 +158,11 @@ async def _decrease_reaction_count(cls, reaction: Reaction):
@classmethod
async def _can_increase_special_emoji(cls, reaction: Reaction) -> bool:
+ """
+ todo: ๋ฆฌํฉํ ๋ง ํ๋ฉด์ ์ผ๋ณ ์นด์ดํธ ๋ก์ง์ ์ ๊ฑฐ ํ์. ํ์ฌ ๋ก์ง์์ `LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI`๋
+ ๋งค์ ์ด๋ชจ์ง๋ฅผ ์ค ์ ์๋ ์นด์ดํธ ์ ํ์ด๋ผ๊ณ ๋ณด๋ฉด๋จ.
+ ํ์ฌ๋ ๊ตณ์ด ๋งค์ผ ์ค ์ ์๋ ์ด๋ชจ์ง ์ ํ์ด ์๋ฏธ์์ ๊ฒ ๊ฐ์์ ์ ์งํ๋ ๋ฐฉํฅ์ผ๋ก ์ ๋ฆฌ
+ """
count = await cls._repository().count_special_emoji_by_date_and_from_user(
from_user_id=reaction.from_user_id,
year=reaction.year,
diff --git a/conf/settings.py b/conf/settings.py
index dcc631b..c54ec63 100644
--- a/conf/settings.py
+++ b/conf/settings.py
@@ -26,7 +26,7 @@ class BaseConfig(BaseSettings):
BOT_NAME: str = Field(env="BOT_NAME", default="heymojiBOT")
SPECIAL_EMOJI: Optional[str] = Field(env="SPECIAL_EMOJI", default="trophy")
- LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI: int = Field(env="LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI", default=5)
+ LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI: int = Field(env="LIMIT_GIVE_COUNT_OF_SPECIAL_EMOJI", default=1000)
ALLOWED_REACTION_LIST: list = Field(
env="ALLOWED_REACTION_LIST",
default=["pray", "heart", "eye_shaking", "+1", "๊ธฐ๋", "๊ธฐ์จ", "kkkk", "trophy", "ํธ๋กํผ"]