generated from HoloTech/holotech-plugin-template
fix: Many typos
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from typing import Optional
|
||||
import asyncio
|
||||
|
||||
from aiohttp import client
|
||||
import discord
|
||||
from discord.ext import commands as cmds
|
||||
from discord import Forbidden, User, app_commands as appcmds
|
||||
@@ -193,6 +194,7 @@ class CampaignCog(LionCog):
|
||||
moderator_role_id=moderator_role.id if moderator_role else None,
|
||||
logging_webhook_url=logging_webhook,
|
||||
)
|
||||
await campaign.start()
|
||||
|
||||
# Ack creation
|
||||
# TODO: Can also show dashboard
|
||||
@@ -256,7 +258,7 @@ class CampaignCog(LionCog):
|
||||
|
||||
# If logging webhook is given, check that it works
|
||||
if logging_webhook is not None:
|
||||
webhook = ThreadedWebhook.from_url(logging_webhook)
|
||||
webhook = ThreadedWebhook.from_url(logging_webhook, client=self.bot)
|
||||
try:
|
||||
await webhook.test_webhook()
|
||||
except (discord.HTTPException, discord.Forbidden):
|
||||
@@ -276,9 +278,9 @@ class CampaignCog(LionCog):
|
||||
)
|
||||
|
||||
# Ack creation
|
||||
# TODO: Can also show dashboard
|
||||
await ctx.reply(
|
||||
f"Setup and started your reward campaign {campaign.row.campaign_name}! Good luck"
|
||||
"Updated your campaign, good luck!",
|
||||
ephemeral=True
|
||||
)
|
||||
|
||||
campaign_configure_cmd.autocomplete("campaign_name")(_campaign_acmpl)
|
||||
|
||||
@@ -16,9 +16,8 @@ from meta import LionBot
|
||||
from meta.errors import UserInputError
|
||||
from meta.config import conf
|
||||
from utils.lib import tabulate, utc_now, MessageArgs, parse_duration
|
||||
from utils.ui import MessageUI, AButton, AsComponents, ConfigEditor
|
||||
from utils.ui import MessageUI
|
||||
from utils.ui.micros import FastModal
|
||||
from utils.ui.pagers import BasePager, Pager
|
||||
|
||||
from ...campaign import RewardCampaign
|
||||
from ...data import EarnedReward
|
||||
@@ -54,7 +53,7 @@ class CampaignDashboard(MessageUI):
|
||||
await widget.wait()
|
||||
self._slaves.remove(widget)
|
||||
|
||||
@button(emoji=conf.emojis.cancel, style=ButtonStyle.red)
|
||||
@button(emoji=conf.emojis.cancel)
|
||||
async def quit_button(self, press: discord.Interaction, pressed: Button):
|
||||
"""Close the UI and all children."""
|
||||
await press.response.defer(thinking=False)
|
||||
@@ -124,7 +123,7 @@ class CampaignDashboard(MessageUI):
|
||||
|
||||
embed.add_field(
|
||||
name="Rewards Summary",
|
||||
value=blocks[0] or 'No Rewards Earned',
|
||||
value=blocks[0] if blocks else 'No Rewards Earned',
|
||||
inline=True
|
||||
)
|
||||
for block in blocks[1:]:
|
||||
|
||||
@@ -196,7 +196,7 @@ class RewardList(MessageUI):
|
||||
self.pagen -= 1
|
||||
await self.refresh()
|
||||
|
||||
@button(emoji=conf.emojis.cancel, style=ButtonStyle.red)
|
||||
@button(emoji=conf.emojis.cancel)
|
||||
async def quit_button(self, press: discord.Interaction, pressed: Button):
|
||||
"""Close the UI and all children."""
|
||||
await press.response.defer(thinking=False)
|
||||
@@ -247,7 +247,7 @@ class RewardList(MessageUI):
|
||||
value = reward.earned_id
|
||||
|
||||
return SelectOption(
|
||||
label=name, value=value
|
||||
label=name, value=str(value)
|
||||
)
|
||||
|
||||
async def refresh_layout(self):
|
||||
@@ -256,7 +256,7 @@ class RewardList(MessageUI):
|
||||
)
|
||||
await asyncio.gather(*to_refresh)
|
||||
|
||||
if self.page_count > 1:
|
||||
if self.page_count <= 1:
|
||||
self.prev_page_button.disabled = True
|
||||
self.next_page_button.disabled = True
|
||||
else:
|
||||
@@ -270,7 +270,24 @@ class RewardList(MessageUI):
|
||||
|
||||
async def make_message(self) -> MessageArgs:
|
||||
embed = discord.Embed(title=f"{self.campaign.row.campaign_name} Reward List")
|
||||
# embed.set_footer with last update
|
||||
embed.set_footer(text='Last Update')
|
||||
embed.timestamp = utc_now()
|
||||
|
||||
campaign = self.campaign
|
||||
all_rewards = await campaign.get_rewards()
|
||||
rewards_earned = len(all_rewards)
|
||||
reward_cap = campaign.row.target_rewards
|
||||
if reward_cap is not None:
|
||||
description = f"{rewards_earned} earned out of {reward_cap} available"
|
||||
else:
|
||||
description = f"{rewards_earned} earned so far"
|
||||
|
||||
embed.description = description
|
||||
|
||||
|
||||
for reward in self.page:
|
||||
name, value = self._format_reward_section(reward)
|
||||
embed.add_field(name=name, value=value, inline=False)
|
||||
|
||||
return MessageArgs(embed=embed)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user