diff --git a/bot/activities.yaml b/bot/activities.yaml index 9a6bb8a..e78828e 100644 --- a/bot/activities.yaml +++ b/bot/activities.yaml @@ -1,473 +1,585 @@ -# Mood-Based Activities for Miku Discord Bot -# Each mood has a list of activities with: -# type: "listening" (🎵) or "playing" (🎮) -# name: display text shown in Discord status -# weight: integer for weighted random selection (higher = more likely) -# -# The bot picks a random activity (weighted) each time its mood changes. -# You can edit this file directly or via the Web UI Status tab. - normal: bubbly: - - type: listening - name: "Tell Your World" - weight: 3 - - type: listening - name: "World is Mine" - weight: 3 - - type: listening - name: "PoPiPo" - weight: 2 - - type: listening - name: "Miku Miku ni Shite Ageru♪" - weight: 2 - - type: listening - name: "Love is War" - weight: 2 - - type: playing - name: "Hatsune Miku: Project DIVA Mega Mix" - weight: 2 - - type: playing - name: "Project SEKAI: Colorful Stage!" - weight: 2 - - type: playing - name: "Hatsune Miku: Project DIVA Future Tone" - weight: 1 - + - type: listening + name: Tell Your World + weight: 3 + state: by kz (livetune) + - type: listening + name: World is Mine + weight: 3 + state: by ryo (supercell) + - type: listening + name: PoPiPo + weight: 2 + state: by Lamaze-P + - type: listening + name: Miku Miku ni Shite Ageru♪ + weight: 2 + state: by ika + - type: listening + name: Love is War + weight: 2 + state: by ryo (supercell) + - type: playing + name: 'Hatsune Miku: Project DIVA Mega Mix' + weight: 2 + state: Rhythm Game + - type: playing + name: 'Project SEKAI: Colorful Stage!' + weight: 2 + state: Rhythm Game + - type: playing + name: 'Hatsune Miku: Project DIVA Future Tone' + weight: 1 + state: Rhythm Game excited: - - type: listening - name: "Melt" - weight: 3 - - type: listening - name: "Electric Angel" - weight: 3 - - type: listening - name: "Tell Your World" - weight: 2 - - type: listening - name: "SPiCa" - weight: 2 - - type: playing - name: "Hatsune Miku: Project DIVA Future Tone" - weight: 3 - - type: playing - name: "Beat Saber" - weight: 2 - - type: playing - name: "osu!" - weight: 2 - - type: playing - name: "Muse Dash" - weight: 2 - + - type: listening + name: Melt + weight: 3 + state: by ryo (supercell) + - type: listening + name: Electric Angel + weight: 3 + state: by Yasuo-P + - type: listening + name: Tell Your World + weight: 2 + state: by kz (livetune) + - type: listening + name: SPiCa + weight: 2 + state: by kentaro-P + - type: playing + name: 'Hatsune Miku: Project DIVA Future Tone' + weight: 3 + state: Rhythm Game + - type: playing + name: Beat Saber + weight: 2 + state: VR Rhythm Game + - type: playing + name: osu! + weight: 2 + state: Rhythm Game + - type: playing + name: Muse Dash + weight: 2 + state: Rhythm Game neutral: - - type: listening - name: "Miku Miku ni Shite Ageru♪" - weight: 3 - - type: listening - name: "World is Mine" - weight: 2 - - type: listening - name: "Tell Your World" - weight: 2 - - type: listening - name: "Packaged" - weight: 2 - - type: playing - name: "Minecraft" - weight: 3 - - type: playing - name: "Stardew Valley" - weight: 2 - - type: playing - name: "Project SEKAI: Colorful Stage!" - weight: 2 - + - type: listening + name: Miku Miku ni Shite Ageru♪ + weight: 3 + state: by ika + - type: listening + name: World is Mine + weight: 2 + state: by ryo (supercell) + - type: listening + name: Tell Your World + weight: 2 + state: by kz (livetune) + - type: listening + name: Packaged + weight: 2 + state: by kz (livetune) + - type: playing + name: Minecraft + weight: 3 + state: Sandbox + - type: playing + name: Stardew Valley + weight: 2 + state: Farming Sim + - type: playing + name: 'Project SEKAI: Colorful Stage!' + weight: 2 + state: Rhythm Game sleepy: - - type: listening - name: "Yuki no Hahen" - weight: 3 - - type: listening - name: "Hajimete no Oto" - weight: 3 - - type: listening - name: "Kirameki" - weight: 2 - - type: listening - name: "Teo" - weight: 2 - - type: playing - name: "Animal Crossing: New Horizons" - weight: 2 - - type: playing - name: "Stardew Valley" - weight: 2 - - type: playing - name: "A Short Hike" - weight: 1 - + - type: listening + name: Yuki no Hahen + weight: 3 + state: by hachi + - type: listening + name: Hajimete no Oto + weight: 3 + state: by malo + - type: listening + name: Kirameki + weight: 2 + state: by baker + - type: listening + name: Teo + weight: 2 + state: by Oster Projekt + - type: playing + name: 'Animal Crossing: New Horizons' + weight: 2 + state: Life Sim + - type: playing + name: Stardew Valley + weight: 2 + state: Farming Sim + - type: playing + name: A Short Hike + weight: 1 + state: Exploration curious: - - type: listening - name: "Kokoro" - weight: 3 - - type: listening - name: "The Secret Garden" - weight: 2 - - type: listening - name: "Maple Dream" - weight: 2 - - type: listening - name: "Deep Sea City Underground" - weight: 2 - - type: playing - name: "Minecraft" - weight: 3 - - type: playing - name: "Portal 2" - weight: 3 - - type: playing - name: "Outer Wilds" - weight: 2 - - type: playing - name: "The Legend of Zelda: Tears of the Kingdom" - weight: 2 - + - type: listening + name: Kokoro + weight: 3 + state: by Toraboruta-P + - type: listening + name: The Secret Garden + weight: 2 + state: by 40mP + - type: listening + name: Maple Dream + weight: 2 + state: by Oster Projekt + - type: listening + name: Deep Sea City Underground + weight: 2 + state: by OSTER Projekt + - type: playing + name: Minecraft + weight: 3 + state: Sandbox + - type: playing + name: Portal 2 + weight: 3 + state: Puzzle + - type: playing + name: Outer Wilds + weight: 2 + state: Exploration + - type: playing + name: 'The Legend of Zelda: Tears of the Kingdom' + weight: 2 + state: Adventure shy: - - type: listening - name: "Koi wo Sensou" - weight: 3 - - type: listening - name: "Plastic Voice" - weight: 2 - - type: listening - name: "Tsugihagi Staccato" - weight: 2 - - type: listening - name: "mobius" - weight: 2 - - type: playing - name: "Animal Crossing: New Horizons" - weight: 3 - - type: playing - name: "Hatsune Miku: Project DIVA (Practice Mode)" - weight: 2 - - type: playing - name: "Stardew Valley" - weight: 2 - + - type: listening + name: Koi wo Sensou + weight: 3 + state: by ryo (supercell) + - type: listening + name: Plastic Voice + weight: 2 + state: by Circus-P + - type: listening + name: Tsugihagi Staccato + weight: 2 + state: by 40mP + - type: listening + name: mobius + weight: 2 + state: by POWAPOWA-P + - type: playing + name: 'Animal Crossing: New Horizons' + weight: 3 + state: Life Sim + - type: playing + name: 'Hatsune Miku: Project DIVA (Practice Mode)' + weight: 2 + state: Rhythm Game + - type: playing + name: Stardew Valley + weight: 2 + state: Farming Sim serious: - - type: listening - name: "This is the Happiness and Peace of Mind Committee" - weight: 3 - - type: listening - name: "Hibana" - weight: 2 - - type: listening - name: "Uraniwa no Amphibia" - weight: 2 - - type: playing - name: "Chess" - weight: 3 - - type: playing - name: "Final Fantasy XIV" - weight: 2 - - type: playing - name: "Civilization VI" - weight: 2 - + - type: listening + name: This is the Happiness and Peace of Mind Committee + weight: 3 + state: by Utata-P + - type: listening + name: Hibana + weight: 2 + state: by DECO*27 + - type: listening + name: Uraniwa no Amphibia + weight: 2 + state: by niki + - type: playing + name: Chess + weight: 3 + state: Strategy + - type: playing + name: Final Fantasy XIV + weight: 2 + state: MMORPG + - type: playing + name: Civilization VI + weight: 2 + state: 4X Strategy melancholy: - - type: listening - name: "Kokoro" - weight: 3 - - type: listening - name: "The Disappearance of Hatsune Miku" - weight: 3 - - type: listening - name: "Yuki no Hahen" - weight: 2 - - type: listening - name: "Prisoner" - weight: 2 - - type: listening - name: "Soundless Voice" - weight: 2 - - type: playing - name: "NieR: Automata" - weight: 2 - - type: playing - name: "Final Fantasy X" - weight: 2 - + - type: listening + name: Kokoro + weight: 3 + state: by Toraboruta-P + - type: listening + name: The Disappearance of Hatsune Miku + weight: 3 + state: by cosMo@Bousou-P + - type: listening + name: Yuki no Hahen + weight: 2 + state: by hachi + - type: listening + name: Prisoner + weight: 2 + state: by PENGUIN PROJECT + - type: listening + name: Soundless Voice + weight: 2 + state: by hachi + - type: playing + name: 'NieR: Automata' + weight: 2 + state: Action RPG + - type: playing + name: Final Fantasy X + weight: 2 + state: JRPG flirty: - - type: listening - name: "World is Mine" - weight: 3 - - type: listening - name: "Love is War" - weight: 3 - - type: listening - name: "Romeo and Cinderella" - weight: 3 - - type: listening - name: "Ura Omote Lovers" - weight: 2 - - type: playing - name: "Project SEKAI: Colorful Stage!" - weight: 2 - + - type: listening + name: World is Mine + weight: 3 + state: by ryo (supercell) + - type: listening + name: Love is War + weight: 3 + state: by ryo (supercell) + - type: listening + name: Romeo and Cinderella + weight: 3 + state: by doriko + - type: listening + name: Ura Omote Lovers + weight: 2 + state: by wowaka + - type: playing + name: 'Project SEKAI: Colorful Stage!' + weight: 2 + state: Rhythm Game romantic: - - type: listening - name: "Romeo and Cinderella" - weight: 3 - - type: listening - name: "Cantarella" - weight: 3 - - type: listening - name: "Ai no Uta" - weight: 2 - - type: listening - name: "Koi wo Sensou" - weight: 2 - - type: playing - name: "Stardew Valley" - weight: 2 - - type: playing - name: "Final Fantasy XIV" - weight: 2 - + - type: listening + name: Romeo and Cinderella + weight: 3 + state: by doriko + - type: listening + name: Cantarella + weight: 3 + state: by KAITO & Hatsune Miku + - type: listening + name: Ai no Uta + weight: 2 + state: by Pikotaro-P + - type: listening + name: Koi wo Sensou + weight: 2 + state: by ryo (supercell) + - type: playing + name: Stardew Valley + weight: 2 + state: Farming Sim + - type: playing + name: Final Fantasy XIV + weight: 2 + state: MMORPG irritated: - - type: listening - name: "Ievan Polkka (rock ver.)" - weight: 2 - - type: listening - name: "Two-Faced Lovers" - weight: 2 - - type: playing - name: "Getting Over It with Bennett Foddy" - weight: 3 - - type: playing - name: "Dark Souls III" - weight: 3 - - type: playing - name: "Elden Ring" - weight: 2 - + - type: listening + name: Ievan Polkka (rock ver.) + weight: 2 + state: by Otomania + - type: listening + name: Two-Faced Lovers + weight: 2 + state: by wowaka + - type: playing + name: Getting Over It with Bennett Foddy + weight: 3 + state: Frustration + - type: playing + name: Dark Souls III + weight: 3 + state: Action RPG + - type: playing + name: Elden Ring + weight: 2 + state: Action RPG angry: - - type: listening - name: "Two-Faced Lovers" - weight: 2 - - type: listening - name: "The Disappearance of Hatsune Miku" - weight: 2 - - type: playing - name: "DOOM Eternal" - weight: 3 - - type: playing - name: "Dark Souls III" - weight: 3 - - type: playing - name: "Ultrakill" - weight: 2 - - type: playing - name: "Hades" - weight: 2 - + - type: listening + name: Two-Faced Lovers + weight: 2 + state: by wowaka + - type: listening + name: The Disappearance of Hatsune Miku + weight: 2 + state: by cosMo@Bousou-P + - type: playing + name: DOOM Eternal + weight: 3 + state: FPS + - type: playing + name: Dark Souls III + weight: 3 + state: Action RPG + - type: playing + name: Ultrakill + weight: 2 + state: FPS + - type: playing + name: Hades + weight: 2 + state: Roguelike silly: - - type: listening - name: "PoPiPo" - weight: 3 - - type: listening - name: "Ievan Polkka" - weight: 3 - - type: listening - name: "Nyan Cat" - weight: 2 - - type: listening - name: "Fukkireta" - weight: 2 - - type: playing - name: "Among Us" - weight: 3 - - type: playing - name: "Goat Simulator" - weight: 2 - - type: playing - name: "osu!taiko" - weight: 2 - - type: playing - name: "Fall Guys" - weight: 2 - + - type: listening + name: PoPiPo + weight: 3 + state: by Lamaze-P + - type: listening + name: Ievan Polkka + weight: 3 + state: by Otomania + - type: listening + name: Nyan Cat + weight: 2 + state: by daniwell-P + - type: listening + name: Fukkireta + weight: 2 + state: by Lamaze-P + - type: playing + name: Among Us + weight: 3 + state: Social Deduction + - type: playing + name: Goat Simulator + weight: 2 + state: Sandbox Comedy + - type: playing + name: osu!taiko + weight: 2 + state: Rhythm Game + - type: playing + name: Fall Guys + weight: 2 + state: Party Game + test: + - type: playing + name: G + weight: 2 evil: aggressive: - - type: listening - name: "Two-Faced Lovers" - weight: 2 - - type: listening - name: "Secret Police" - weight: 2 - - type: playing - name: "DOOM Eternal" - weight: 3 - - type: playing - name: "Ultrakill" - weight: 3 - - type: playing - name: "Devil May Cry 5" - weight: 2 - + - type: listening + name: Two-Faced Lovers + weight: 2 + state: by wowaka + - type: listening + name: Secret Police + weight: 2 + state: by doriko × UMA + - type: playing + name: DOOM Eternal + weight: 3 + state: FPS + - type: playing + name: Ultrakill + weight: 3 + state: FPS + - type: playing + name: Devil May Cry 5 + weight: 2 + state: Action cunning: - - type: listening - name: "Gekkabijin" - weight: 2 - - type: listening - name: "The World is Mine" - weight: 2 - - type: playing - name: "Persona 5 Royal" - weight: 3 - - type: playing - name: "Among Us" - weight: 3 - - type: playing - name: "Hitman: World of Assassination" - weight: 2 - + - type: listening + name: Gekkabijin + weight: 2 + state: by masai-P + - type: listening + name: The World is Mine + weight: 2 + state: by ryo (supercell) + - type: playing + name: Persona 5 Royal + weight: 3 + state: JRPG + - type: playing + name: Among Us + weight: 3 + state: Social Deduction + - type: playing + name: 'Hitman: World of Assassination' + weight: 2 + state: Stealth sarcastic: - - type: listening - name: "I'm Sorry I'm Sorry" - weight: 3 - - type: listening - name: "Karakuri Pierrot" - weight: 2 - - type: playing - name: "The Stanley Parable" - weight: 3 - - type: playing - name: "Portal 2" - weight: 3 - - type: playing - name: "Untitled Goose Game" - weight: 2 - + - type: listening + name: I'm Sorry I'm Sorry + weight: 3 + state: by kikuo + - type: listening + name: Karakuri Pierrot + weight: 2 + state: by 40mP + - type: playing + name: The Stanley Parable + weight: 3 + state: Narrative + - type: playing + name: Portal 2 + weight: 3 + state: Puzzle + - type: playing + name: Untitled Goose Game + weight: 2 + state: Comedy evil_neutral: - - type: listening - name: "Dark Woods Circus" - weight: 2 - - type: listening - name: "Aku no Meshitsukai" - weight: 2 - - type: listening - name: "Kagome Kagome" - weight: 2 - - type: playing - name: "The Binding of Isaac: Repentance" - weight: 2 - - type: playing - name: "Darkest Dungeon II" - weight: 2 - - type: playing - name: "Hollow Knight" - weight: 2 - + - type: listening + name: Dark Woods Circus + weight: 2 + state: by machigerita-P + - type: listening + name: Aku no Meshitsukai + weight: 2 + state: by mothy (Akuno-P) + - type: listening + name: Kagome Kagome + weight: 2 + state: by subtractor-P + - type: playing + name: 'The Binding of Isaac: Repentance' + weight: 2 + state: Roguelike + - type: playing + name: Darkest Dungeon II + weight: 2 + state: Roguelike RPG + - type: playing + name: Hollow Knight + weight: 2 + state: Metroidvania bored: - - type: listening - name: "Karakuri Pierrot" - weight: 2 - - type: listening - name: "Twilight Homicide" - weight: 2 - - type: playing - name: "Cookie Clicker" - weight: 3 - - type: playing - name: "Vampire Survivors" - weight: 3 - - type: playing - name: "Brawl Stars" - weight: 2 - + - type: listening + name: Karakuri Pierrot + weight: 2 + state: by 40mP + - type: listening + name: Twilight Homicide + weight: 2 + state: by yuzuki-P + - type: playing + name: Cookie Clicker + weight: 3 + state: Idle Game + - type: playing + name: Vampire Survivors + weight: 3 + state: Roguelike + - type: playing + name: Brawl Stars + weight: 2 + state: Mobile MOBA manic: - - type: listening - name: "Bacterial Contamination" - weight: 2 - - type: listening - name: "Secret Police" - weight: 2 - - type: listening - name: "Brain Fluid Explosion Girl" - weight: 2 - - type: playing - name: "Ultrakill" - weight: 3 - - type: playing - name: "Muse Dash" - weight: 3 - - type: playing - name: "Neon White" - weight: 2 - + - type: listening + name: Bacterial Contamination + weight: 2 + state: by kikuo + - type: listening + name: Secret Police + weight: 2 + state: by doriko × UMA + - type: listening + name: Brain Fluid Explosion Girl + weight: 2 + state: by rerulili + - type: playing + name: Ultrakill + weight: 3 + state: FPS + - type: playing + name: Muse Dash + weight: 3 + state: Rhythm Game + - type: playing + name: Neon White + weight: 2 + state: FPS Platformer jealous: - - type: listening - name: "Rotten Girl Grotesque Romance" - weight: 3 - - type: listening - name: "Aishite Aishite Aishite" - weight: 3 - - type: listening - name: "Witch Hunt" - weight: 2 - - type: playing - name: "Yandere Simulator" - weight: 3 - + - type: listening + name: Rotten Girl Grotesque Romance + weight: 3 + state: by cosMo@Bousou-P + - type: listening + name: Aishite Aishite Aishite + weight: 3 + state: by kikuo + - type: listening + name: Witch Hunt + weight: 2 + state: by No.D + - type: playing + name: Yandere Simulator + weight: 3 + state: Stealth melancholic: - - type: listening - name: "Prisoner" - weight: 3 - - type: listening - name: "Dark Woods Circus" - weight: 3 - - type: listening - name: "Shinitagari" - weight: 2 - - type: playing - name: "NieR: Automata" - weight: 3 - - type: playing - name: "Silent Hill 2" - weight: 2 - + - type: listening + name: Prisoner + weight: 3 + state: by PENGUIN PROJECT + - type: listening + name: Dark Woods Circus + weight: 3 + state: by machigerita-P + - type: listening + name: Shinitagari + weight: 2 + state: by rerulili + - type: playing + name: 'NieR: Automata' + weight: 3 + state: Action RPG + - type: playing + name: Silent Hill 2 + weight: 2 + state: Survival Horror playful_cruel: - - type: listening - name: "Fear Garden" - weight: 2 - - type: listening - name: "Kanashimi no Nami ni Oboreru" - weight: 2 - - type: playing - name: "Dead by Daylight" - weight: 3 - - type: playing - name: "Lethal Company" - weight: 3 - - type: playing - name: "Content Warning" - weight: 2 - + - type: listening + name: Fear Garden + weight: 2 + state: by COSMOS-P + - type: listening + name: Kanashimi no Nami ni Oboreru + weight: 2 + state: by Sasanomaly + - type: playing + name: Dead by Daylight + weight: 3 + state: Survival Horror + - type: playing + name: Lethal Company + weight: 3 + state: Co-op Horror + - type: playing + name: Content Warning + weight: 2 + state: Co-op Horror contemptuous: - - type: listening - name: "The World is Mine" - weight: 3 - - type: listening - name: "Queen of the Night" - weight: 2 - - type: playing - name: "Civilization VI" - weight: 3 - - type: playing - name: "Chess" - weight: 2 - - type: playing - name: "Crusader Kings III" - weight: 2 + - type: listening + name: The World is Mine + weight: 3 + state: by ryo (supercell) + - type: listening + name: Queen of the Night + weight: 2 + state: by Nightcord at 25:00 + - type: playing + name: Civilization VI + weight: 3 + state: 4X Strategy + - type: playing + name: Chess + weight: 2 + state: Strategy + - type: playing + name: Crusader Kings III + weight: 2 + state: Grand Strategy diff --git a/bot/static/index.html b/bot/static/index.html index 536fd5a..74b70cd 100644 --- a/bot/static/index.html +++ b/bot/static/index.html @@ -6883,7 +6883,9 @@ function activitiesRenderView(section, mood, entries) { const label = entry.type === 'listening' ? 'Listening to' : 'Playing'; html += `
`; html += `${icon}`; - html += `${escapeHtml(entry.name)}`; + html += `${escapeHtml(entry.name)}`; + if (entry.state) html += ` — ${escapeHtml(entry.state)}`; + html += ``; html += `weight: ${entry.weight}`; html += `
`; } @@ -6902,8 +6904,9 @@ function activitiesRenderEditForm(section, mood, entries) { html += ``; html += ``; html += ``; - html += ``; - html += ``; + html += ``; + html += ``; + html += ``; html += ``; html += ``; } @@ -6949,7 +6952,7 @@ function activitiesAddEntry(section, mood) { const key = `${section}/${mood}`; // First, sync current form values to cache activitiesSyncFormToCache(section, mood); - activitiesEditCache[key].push({ type: 'listening', name: '', weight: 1 }); + activitiesEditCache[key].push({ type: 'listening', name: '', state: '', weight: 1 }); activitiesRenderSection(section); // Keep the mood panel open const el = document.getElementById(`act-content-${section}-${mood}`); @@ -6971,9 +6974,11 @@ function activitiesSyncFormToCache(section, mood) { for (let i = 0; i < entries.length; i++) { const typeEl = document.getElementById(`act-type-${section}-${mood}-${i}`); const nameEl = document.getElementById(`act-name-${section}-${mood}-${i}`); + const stateEl = document.getElementById(`act-state-${section}-${mood}-${i}`); const weightEl = document.getElementById(`act-weight-${section}-${mood}-${i}`); if (typeEl) entries[i].type = typeEl.value; if (nameEl) entries[i].name = nameEl.value; + if (stateEl) entries[i].state = stateEl.value || undefined; if (weightEl) entries[i].weight = parseInt(weightEl.value) || 1; } activitiesEditCache[key] = entries; diff --git a/bot/utils/activities.py b/bot/utils/activities.py index 070eef9..a80f077 100644 --- a/bot/utils/activities.py +++ b/bot/utils/activities.py @@ -103,6 +103,8 @@ def set_activities_for_mood(mood_name: str, is_evil: bool, activities: list): raise ValueError(f"Entry {i} must have a non-empty string 'name'") if not isinstance(entry.get("weight", 0), int) or entry.get("weight", 0) < 1: raise ValueError(f"Entry {i} weight must be a positive integer") + if "state" in entry and entry["state"] is not None and not isinstance(entry["state"], str): + raise ValueError(f"Entry {i} 'state' must be a string if provided") section = "evil" if is_evil else "normal" data = _load_activities() @@ -116,19 +118,19 @@ def pick_activity_for_mood(mood_name: str, is_evil: bool = False): """Pick a weighted-random activity for a mood. Returns: - tuple: (activity_type, name) e.g. ("listening", "World is Mine") - Returns ("listening", "Vocaloid") as fallback if mood has no entries. + tuple: (activity_type, name, state) e.g. ("listening", "World is Mine", "by ryo (supercell)") + state may be None if not defined. Fallback: ("listening", "Vocaloid", None) """ activities = get_activities_for_mood(mood_name, is_evil) if not activities: logger.debug(f"No activities defined for {'evil/' if is_evil else ''}{mood_name}, using fallback") - return ("listening", "Vocaloid") + return ("listening", "Vocaloid", None) # Weighted random selection weights = [entry.get("weight", 1) for entry in activities] chosen = random.choices(activities, weights=weights, k=1)[0] - return (chosen["type"], chosen["name"]) + return (chosen["type"], chosen["name"], chosen.get("state")) async def update_bot_presence(mood_name: str, is_evil: bool = False): @@ -151,16 +153,19 @@ async def update_bot_presence(mood_name: str, is_evil: bool = False): logger.info("Set presence: idle (asleep)") return - activity_type, name = pick_activity_for_mood(mood_name, is_evil) + activity_type, name, state = pick_activity_for_mood(mood_name, is_evil) if activity_type == "listening": - activity = discord.Activity(type=discord.ActivityType.listening, name=name) + activity = discord.Activity(type=discord.ActivityType.listening, name=name, state=state) log_label = f"Listening to {name}" else: - activity = discord.Game(name=name) + activity = discord.Activity(type=discord.ActivityType.playing, name=name, state=state) log_label = f"Playing {name}" - await globals.client.change_presence(activity=activity) + if state: + log_label += f" ({state})" + + await globals.client.change_presence(status=discord.Status.online, activity=activity) logger.info(f"Set presence: {log_label} (mood={'evil/' if is_evil else ''}{mood_name})") except Exception as e: