From dbfcc7f1eb7da8508227bc9ccd9a1be4208a19ac Mon Sep 17 00:00:00 2001
From: WilliamQiufeng <williamqiufeng@outlook.com>
Date: Tue, 23 Jun 2026 20:31:02 +0100
Subject: [PATCH] add clan tag to chat messages

---
 db/chat_messages.go | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/db/chat_messages.go b/db/chat_messages.go
index 3787d69..3ed3068 100644
--- a/db/chat_messages.go
+++ b/db/chat_messages.go
@@ -2,22 +2,29 @@ package db
 
 import (
 	"fmt"
-	"gorm.io/gorm"
 	"slices"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type ChatMessage struct {
-	Id            int       `gorm:"column:id; PRIMARY_KEY" json:"id"`
-	SenderId      int       `gorm:"column:sender_id" json:"sender_id"`
-	Type          int8      `gorm:"type" json:"type"`
-	ReceiverId    *int      `gorm:"receiver_id" json:"receiver_id"`
-	Channel       string    `gorm:"channel" json:"channel"`
-	Message       string    `gorm:"message" json:"message"`
-	Timestamp     int64     `gorm:"timestamp" json:"-"`
-	TimestampJSON time.Time `gorm:"-:all" json:"timestamp"`
-	IsHidden      bool      `gorm:"column:hidden" json:"-"`
-	User          *User     `gorm:"foreignKey:SenderId" json:"user"`
+	Id       int `gorm:"column:id; PRIMARY_KEY" json:"id"`
+	SenderId int `gorm:"column:sender_id" json:"sender_id"`
+	// In case you are wondering why these are here instead of using User.ClanXXX,
+	// In other places retrieving User, you need an additional user.SetClanTagAndColor()
+	// to fill in those fields, which would be less efficient than just joining the tables
+	ClanId          *int      `gorm:"column:clan_id" json:"clan_id"`
+	ClanTag         *string   `gorm:"column:clan_tag" json:"clan_tag"`
+	ClanAccentColor *string   `gorm:"column:clan_accent_color" json:"clan_accent_color"`
+	Type            int8      `gorm:"column:type" json:"type"`
+	ReceiverId      *int      `gorm:"column:receiver_id" json:"receiver_id"`
+	Channel         string    `gorm:"column:channel" json:"channel"`
+	Message         string    `gorm:"column:message" json:"message"`
+	Timestamp       int64     `gorm:"column:timestamp" json:"-"`
+	TimestampJSON   time.Time `gorm:"-:all" json:"timestamp"`
+	IsHidden        bool      `gorm:"column:hidden" json:"-"`
+	User            *User     `gorm:"foreignKey:SenderId" json:"user"`
 }
 
 func (*ChatMessage) TableName() string {
@@ -40,7 +47,9 @@ func GetPublicChatMessageHistory(channel string) ([]*ChatMessage, error) {
 	var messages = make([]*ChatMessage, 0)
 
 	result := SQL.
+		Select("chat_messages.*, `User`.clan_id AS clan_id, clans.tag AS clan_tag, clans.accent_color AS clan_accent_color").
 		Joins("User").
+		Joins("LEFT JOIN clans ON `User`.clan_id = clans.id").
 		Where("chat_messages.channel = ? AND chat_messages.hidden = 0", fmt.Sprintf("#%v", channel)).
 		Limit(50).
 		Order("chat_messages.id DESC").
@@ -62,10 +71,12 @@ func GetPrivateChatMessageHistory(userId int, otherUser int) ([]*ChatMessage, er
 	var messages = make([]*ChatMessage, 0)
 
 	result := SQL.
+		Select("chat_messages.*, `User`.clan_id AS clan_id, clans.tag AS clan_tag, clans.accent_color AS clan_accent_color").
 		Joins("User").
-		Where("chat_messages.hidden = 0 AND "+
+		Joins("LEFT JOIN clans ON `User`.clan_id = clans.id").
+		Where("chat_messages.hidden = 0 AND ("+
 			"(chat_messages.sender_id = ? AND chat_messages.receiver_id = ?) OR "+
-			"(chat_messages.sender_id = ? AND chat_messages.receiver_id = ?) ",
+			"(chat_messages.sender_id = ? AND chat_messages.receiver_id = ?))",
 			userId, otherUser,
 			otherUser, userId).
 		Limit(50).