generated from HoloTech/holotech-plugin-template
fix: Make 'earned_from' column name consistent
This commit is contained in:
+19
-28
@@ -57,7 +57,7 @@ class RewardCampaign:
|
||||
async def add_reward(
|
||||
self,
|
||||
profileid: int,
|
||||
earned_reason: str,
|
||||
earned_from: str,
|
||||
event_id: Optional[int] = None,
|
||||
twitch_user_id: Optional[str] = None,
|
||||
twitch_user_name: Optional[str] = None,
|
||||
@@ -66,7 +66,7 @@ class RewardCampaign:
|
||||
row = await EarnedReward.create(
|
||||
campaign_id=self.row.campaign_id,
|
||||
profileid=profileid,
|
||||
earned_reason=earned_reason,
|
||||
earned_from=earned_from,
|
||||
event_id=event_id,
|
||||
twitch_user_id=twitch_user_id,
|
||||
twitch_user_name=twitch_user_name,
|
||||
@@ -93,6 +93,7 @@ class RewardCampaign:
|
||||
|
||||
async def try_to_log_reward(self, reward: EarnedReward):
|
||||
import discord
|
||||
|
||||
if self.webhook:
|
||||
embed = await self._log_format_reward(reward)
|
||||
if reward.log_messageid:
|
||||
@@ -107,7 +108,9 @@ class RewardCampaign:
|
||||
await reward.update(log_messageid=message.id)
|
||||
except discord.HTTPException:
|
||||
# Couldn't send, give up.
|
||||
logger.warning(f"Failed to log campaign reward {reward!r}", exc_info=True)
|
||||
logger.warning(
|
||||
f"Failed to log campaign reward {reward!r}", exc_info=True
|
||||
)
|
||||
|
||||
async def _log_format_reward(self, reward: EarnedReward):
|
||||
"""
|
||||
@@ -125,44 +128,39 @@ class RewardCampaign:
|
||||
f"Twitch user `{reward.twitch_user_name or 'Unknown'}` `(ID: {reward.twitch_user_id or 'Unknown'})`.\n"
|
||||
f"Internal ID `{reward.profileid}`"
|
||||
),
|
||||
inline=True
|
||||
inline=True,
|
||||
)
|
||||
|
||||
# Earning field
|
||||
embed.add_field(
|
||||
name="Reward Earned",
|
||||
name="Reward Earned",
|
||||
value=(
|
||||
f"Earned campaign reward at {discord.utils.format_dt(reward.earned_at, 'F')}.\n"
|
||||
f"Earned reason: '{reward.earned_from}'"
|
||||
),
|
||||
inline=True
|
||||
inline=True,
|
||||
)
|
||||
|
||||
# Reference field
|
||||
embed.add_field(
|
||||
name="Reference",
|
||||
value=reward.reference or "No Reference information saved.",
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
# Modnote field
|
||||
embed.add_field(
|
||||
name="Notes",
|
||||
value=reward.modnote or "No notes added",
|
||||
inline=False
|
||||
name="Notes", value=reward.modnote or "No notes added", inline=False
|
||||
)
|
||||
|
||||
# Fulfilled field
|
||||
if reward.fulfilled_at is not None:
|
||||
fluffed = f"Fluffed at {discord.utils.format_dt(reward.fulfilled_at, 'F')}"
|
||||
if reward.fulfilled_note:
|
||||
fluffed += '\n' + "Fluff Note: " + reward.fulfilled_note
|
||||
fluffed += "\n" + "Fluff Note: " + reward.fulfilled_note
|
||||
else:
|
||||
fluffed = "Not yet fluffed"
|
||||
|
||||
embed.add_field(
|
||||
name="Fulfilled",
|
||||
value=fluffed
|
||||
)
|
||||
embed.add_field(name="Fulfilled", value=fluffed)
|
||||
|
||||
embed.set_footer(text="Last Updated")
|
||||
embed.timestamp = utc_now()
|
||||
@@ -173,7 +171,9 @@ class RewardCampaign:
|
||||
class CampaignRegistry:
|
||||
VERSION = CampaignData.VERSION
|
||||
|
||||
def __init__(self, data: CampaignData, session: aiohttp.ClientSession | None = None):
|
||||
def __init__(
|
||||
self, data: CampaignData, session: aiohttp.ClientSession | None = None
|
||||
):
|
||||
self.data = data
|
||||
# TODO: Actually pass in a session
|
||||
self._session = aiohttp.ClientSession()
|
||||
@@ -238,27 +238,18 @@ class CampaignRegistry:
|
||||
return camp
|
||||
|
||||
async def create_campaign(
|
||||
self,
|
||||
cid: int,
|
||||
campaign_name: str,
|
||||
**kwargs
|
||||
self, cid: int, campaign_name: str, **kwargs
|
||||
) -> RewardCampaign:
|
||||
"""
|
||||
Create a new campaign.
|
||||
The name must be unique (ignoring case) to facilitate easy lookup.
|
||||
"""
|
||||
row = await Campaign.create(
|
||||
communityid=cid,
|
||||
campaign_name=campaign_name,
|
||||
**kwargs
|
||||
communityid=cid, campaign_name=campaign_name, **kwargs
|
||||
)
|
||||
return RewardCampaign(row, session=self._session)
|
||||
|
||||
async def update_campaign(
|
||||
self,
|
||||
campaign_id: int,
|
||||
**kwargs
|
||||
) -> RewardCampaign:
|
||||
async def update_campaign(self, campaign_id: int, **kwargs) -> RewardCampaign:
|
||||
"""
|
||||
Update a campaign with the given data args.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user