Skip to content

add clan tag to chat messages #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Swan merged 1 commit into from
Jun 23, 2026
Merged

add clan tag to chat messages #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions db/chat_messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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").
Expand All @@ -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).
Expand Down
Loading