Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-22 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(guild): separate scout invitations into guild_invites table

Browse Source 
Scout invitations were stored in guild_applications with type 'invited',
forcing the scout list response to use charID as the invitation ID — a
known hack that made CancelGuildScout semantically incorrect.

Introduce a dedicated guild_invites table (migration 0012) with a serial
PK. The scout list now returns real invite IDs and actual InvitedAt
timestamps. CancelGuildScout cancels by PK. AcceptInvite and DeclineInvite
operate on guild_invites while player-applied applications remain in
guild_applications unchanged.
This commit is contained in:
Houmgaor
2026-03-21 17:59:25 +01:00
parent a67b10abbc
commit dbbfb927f8
10 changed files with 230 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/channelserver/svc_guild.go
View File

@@ -280,16 +280,16 @@ func (svc *GuildService) PostScout(actorCharID, targetCharID uint32, strings Sco
return fmt.Errorf("guild lookup: %w", err)
}
hasApp, err := svc.guildRepo.HasApplication(guild.ID, targetCharID)
hasInvite, err := svc.guildRepo.HasInvite(guild.ID, targetCharID)
if err != nil {
return fmt.Errorf("check application: %w", err)
return fmt.Errorf("check invite: %w", err)
}
if hasApp {
if hasInvite {
return ErrAlreadyInvited
}
err = svc.guildRepo.CreateApplicationWithMail(
guild.ID, targetCharID, actorCharID, GuildApplicationTypeInvited,
err = svc.guildRepo.CreateInviteWithMail(
guild.ID, targetCharID, actorCharID,
actorCharID, targetCharID,
strings.Title,
fmt.Sprintf(strings.Body, guild.Name))
@@ -309,8 +309,8 @@ func (svc *GuildService) AnswerScout(charID, leaderID uint32, accept bool, strin
return nil, fmt.Errorf("guild lookup for leader %d: %w", leaderID, err)
}
app, err := svc.guildRepo.GetApplication(guild.ID, charID, GuildApplicationTypeInvited)
if app == nil || err != nil {
hasInvite, err := svc.guildRepo.HasInvite(guild.ID, charID)
if err != nil || !hasInvite {
return &AnswerScoutResult{
GuildID: guild.ID,
Success: false,
@@ -319,13 +319,13 @@ func (svc *GuildService) AnswerScout(charID, leaderID uint32, accept bool, strin
var mails []Mail
if accept {
err = svc.guildRepo.AcceptApplication(guild.ID, charID)
err = svc.guildRepo.AcceptInvite(guild.ID, charID)
mails = []Mail{
{SenderID: 0, RecipientID: charID, Subject: strings.SuccessTitle, Body: fmt.Sprintf(strings.SuccessBody, guild.Name), IsSystemMessage: true},
{SenderID: charID, RecipientID: leaderID, Subject: strings.AcceptedTitle, Body: fmt.Sprintf(strings.AcceptedBody, guild.Name), IsSystemMessage: true},
}
} else {
err = svc.guildRepo.RejectApplication(guild.ID, charID)
err = svc.guildRepo.DeclineInvite(guild.ID, charID)
mails = []Mail{
{SenderID: 0, RecipientID: charID, Subject: strings.RejectedTitle, Body: fmt.Sprintf(strings.RejectedBody, guild.Name), IsSystemMessage: true},
{SenderID: charID, RecipientID: leaderID, Subject: strings.DeclinedTitle, Body: fmt.Sprintf(strings.DeclinedBody, guild.Name), IsSystemMessage: true},