Skip to content

Horoscope - Fix date text #64

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

Closed
wants to merge 1 commit into from
Closed

Horoscope - Fix date text #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions horoscope/horoscope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ async def _horoscope(self, ctx, *, sign: str):
"chinese": "http://www.horoscope.com/us/horoscopes/chinese/horoscope-chinese-daily-today.aspx?sign=",
}
regex = [
r"<strong( class=\"date\"|)>([^`]*?)<\/strong> - ([^`]*?)\n",
r"<\/strong> - ([^`]*?)\n",
r"\w+\s\d+,\s\d+",
]
try:
horos = sign.split(", ")
Expand All @@ -106,8 +107,9 @@ async def _horoscope(self, ctx, *, sign: str):
async with self.session.get(uir, headers=option) as resp:
test = str(await resp.text('ISO-8859-1'))
msg = re.findall(regex[0], test)[0]
msg_content = msg[2].replace("</p>", "")
msg = msg_content + " - " + msg[1]
date = re.findall(regex[1], test)[0]
msg_content = msg.replace("</p>", "")
msg = msg_content + " - " + date
await ctx.send(
"Today's chinese horoscope for the one"
" born in the year of the {} is:\n".format(sign) + box(msg)
Expand All @@ -128,8 +130,9 @@ async def _horoscope(self, ctx, *, sign: str):
async with self.session.get(uir, headers=option) as resp:
test = str(await resp.text('ISO-8859-1'))
msg = re.findall(regex[0], test)[0]
msg_content = msg[2].replace("</p>", "")
msg = msg_content + " - " + msg[1]
date = re.findall(regex[1], test)[0]
msg_content = msg.replace("</p>", "")
msg = msg_content + " - " + date
if style == "love":
await ctx.send(
"Today's love horoscope for **{}** is:\n".format(sign) + box(msg)
Expand Down