Skip to content

Fixes nameday formatting #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mosbth merged 2 commits into from
Jan 31, 2025
Merged

Fixes nameday formatting #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664b8c1
Changes test for nameday
Challe-P Jan 23, 2025
d103545
Fixes nameday formatting
Challe-P Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion marvin_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,15 +453,24 @@ def marvinNameday(row):
r = requests.get(url, timeout=5)
nameday_data = r.json()
names = nameday_data["dagar"][0]["namnsdag"]
parsed_names = formatNames(names)
if names:
msg = getString("nameday", "somebody").format(",".join(names))
msg = getString("nameday", "somebody").format(parsed_names)
else:
msg = getString("nameday", "nobody")
except Exception as e:
LOG.error("Failed to get nameday: %s", e)
msg = getString("nameday", "error")
return msg

def formatNames(names):
"""
Parses namedata from nameday API
"""
if len(names) > 1:
return " och ".join([", ".join(names[:-1])] + names[-1:])
return "".join(names)

def marvinUptime(row):
"""
Display info about uptime tournament
Expand Down
24 changes: 24 additions & 0 deletions namedayFiles/triple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"cachetid": "2025-01-23 10:31:50",
"version": "2.1",
"uri": "/dagar/v2.1/2025/01/06",
"startdatum": "2025-01-06",
"slutdatum": "2025-01-06",
"dagar": [
{
"datum": "2025-01-06",
"veckodag": "Måndag",
"arbetsfri dag": "Ja",
"röd dag": "Ja",
"vecka": "02",
"dag i vecka": "1",
"helgdag": "Trettondedag jul",
"namnsdag": [
"Kasper",
"Melker",
"Baltsar"
],
"flaggdag": ""
}
]
}
3 changes: 2 additions & 1 deletion test_marvin_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ def testNameDayRequest(self):
def testNameDayResponse(self):
"""Test that marvin properly parses nameday responses"""
self.assertNameDayOutput("single", "Idag har Svea namnsdag")
self.assertNameDayOutput("double", "Idag har Alfred,Alfrida namnsdag")
self.assertNameDayOutput("double", "Idag har Alfred och Alfrida namnsdag")
self.assertNameDayOutput("triple", "Idag har Kasper, Melker och Baltsar namnsdag")
self.assertNameDayOutput("nobody", "Ingen har namnsdag idag")

def testNameDayError(self):
Expand Down
Loading