generated from HoloTech/holotech-plugin-template
(twitch): Fix some typos
This commit is contained in:
+12
-11
@@ -73,14 +73,14 @@ class CampaignComponent(cmds.Component):
|
|||||||
# Add a reward to the database with the correct info.
|
# Add a reward to the database with the correct info.
|
||||||
await campaign.add_reward(
|
await campaign.add_reward(
|
||||||
profileid=event_row["profileid"],
|
profileid=event_row["profileid"],
|
||||||
earned_reason=f"(SUB NOTICE): User subscribed for {duration} months at tier {tier}",
|
earned_reason=f"(SUB) User subscribed for {duration} months at tier {tier}",
|
||||||
event_id=event_row["event_id"],
|
event_id=event_row["event_id"],
|
||||||
twitch_user_id=data["chatter_user_id"],
|
twitch_user_id=data["chatter_user_id"],
|
||||||
twitch_user_name=data["chatter_user_name"],
|
twitch_user_name=data["chatter_user_name"],
|
||||||
)
|
)
|
||||||
await self.dispatch_update(campaign)
|
await self.dispatch_update(campaign)
|
||||||
# TODO: Webhook logging maybe..
|
# TODO: Webhook logging maybe.. (do this in campaign)
|
||||||
# Or just general logging.
|
# Or just general logging. (also do this in campaign, but we can do again here)
|
||||||
|
|
||||||
@cmds.Component.listener()
|
@cmds.Component.listener()
|
||||||
async def event_safe_event_chat_notice_resub(self, payload):
|
async def event_safe_event_chat_notice_resub(self, payload):
|
||||||
@@ -136,9 +136,9 @@ class CampaignComponent(cmds.Component):
|
|||||||
reward_cap = campaign.row.target_rewards
|
reward_cap = campaign.row.target_rewards
|
||||||
|
|
||||||
if reward_cap is not None:
|
if reward_cap is not None:
|
||||||
response = "{name}: {given} rewards earned out of {cap}!"
|
response = f"{name}: {given} rewards earned out of {cap}!"
|
||||||
else:
|
else:
|
||||||
response = "{name}: {given} rewards earned so far!"
|
response = f"{name}: {given} rewards earned so far!"
|
||||||
formatted = response.format(
|
formatted = response.format(
|
||||||
name=campaign.row.campaign_name,
|
name=campaign.row.campaign_name,
|
||||||
given=rewards_earned,
|
given=rewards_earned,
|
||||||
@@ -175,7 +175,7 @@ class CampaignComponent(cmds.Component):
|
|||||||
await ctx.reply(
|
await ctx.reply(
|
||||||
f"Your campaign '{existing_name}' is already active! "
|
f"Your campaign '{existing_name}' is already active! "
|
||||||
"Sorry, we don't yet support multiple active campaigns, "
|
"Sorry, we don't yet support multiple active campaigns, "
|
||||||
"please finish your campaign before starting a new one."
|
"please use '!campaign finish' to end your current campaign before starting a new one."
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -230,17 +230,16 @@ class CampaignComponent(cmds.Component):
|
|||||||
reward_cap = campaign.row.target_rewards
|
reward_cap = campaign.row.target_rewards
|
||||||
|
|
||||||
if reward_cap is not None:
|
if reward_cap is not None:
|
||||||
response = "Completed {name}: {given} rewards earned out of {cap}!"
|
response = f"Completed {name}: {given} rewards earned out of {cap}!"
|
||||||
else:
|
else:
|
||||||
response = "Completed {name}: {given} rewards earned so far!"
|
response = f"Completed {name}: {given} rewards earned so far!"
|
||||||
formatted = response.format(
|
formatted = response.format(
|
||||||
name=campaign.row.campaign_name,
|
name=campaign.row.campaign_name,
|
||||||
given=rewards_earned,
|
given=rewards_earned,
|
||||||
cap=reward_cap,
|
cap=reward_cap,
|
||||||
)
|
)
|
||||||
await ctx.reply(formatte
|
await ctx.reply(formatted)
|
||||||
await self.dispatch_update(campaign)
|
await self.dispatch_update(campaign)
|
||||||
)
|
|
||||||
|
|
||||||
@group_campaign.command(name="reward")
|
@group_campaign.command(name="reward")
|
||||||
@cmds.is_moderator()
|
@cmds.is_moderator()
|
||||||
@@ -259,6 +258,8 @@ class CampaignComponent(cmds.Component):
|
|||||||
name = user.display_name or profile.nickname or "Unknown"
|
name = user.display_name or profile.nickname or "Unknown"
|
||||||
pid = profile.profileid
|
pid = profile.profileid
|
||||||
|
|
||||||
|
reason = f"(Given by {ctx.author.mention}) {reward_reason}"
|
||||||
|
|
||||||
campaigns = await self.campaigns.fetch_campaigns(cid, active=True)
|
campaigns = await self.campaigns.fetch_campaigns(cid, active=True)
|
||||||
if len(campaigns) > 1:
|
if len(campaigns) > 1:
|
||||||
names = ", ".join(camp.row.campaign_name for camp in campaigns)
|
names = ", ".join(camp.row.campaign_name for camp in campaigns)
|
||||||
@@ -270,7 +271,7 @@ class CampaignComponent(cmds.Component):
|
|||||||
|
|
||||||
await campaign.add_reward(
|
await campaign.add_reward(
|
||||||
pid,
|
pid,
|
||||||
reward_reason,
|
reason,
|
||||||
twitch_user_id=user.id,
|
twitch_user_id=user.id,
|
||||||
twitch_user_name=user.name,
|
twitch_user_name=user.name,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user