Save internal_name and display_name in channel

2022-12-22 11:22:36 +01:00
parent f65c231ba0
commit 0cb2a977a0
20 changed files with 414 additions and 296 deletions
--- a/scnserver/models/channel.go
+++ b/scnserver/models/channel.go
@@ -10,7 +10,8 @@ import (
 type Channel struct {
 	ChannelID         ChannelID
 	OwnerUserID       UserID
-	Name              string
+	InternalName      string
+	DisplayName       string
 	SubscribeKey      string
 	SendKey           string
 	TimestampCreated  time.Time
@@ -22,7 +23,8 @@ func (c Channel) JSON(includeKey bool) ChannelJSON {
 	return ChannelJSON{
 		ChannelID:         c.ChannelID,
 		OwnerUserID:       c.OwnerUserID,
-		Name:              c.Name,
+		InternalName:      c.InternalName,
+		DisplayName:       c.DisplayName,
 		SubscribeKey:      langext.Conditional(includeKey, langext.Ptr(c.SubscribeKey), nil),
 		SendKey:           langext.Conditional(includeKey, langext.Ptr(c.SendKey), nil),
 		TimestampCreated:  c.TimestampCreated.Format(time.RFC3339Nano),
@@ -57,7 +59,8 @@ func (c ChannelWithSubscription) JSON(includeChannelKey bool) ChannelWithSubscri
 type ChannelJSON struct {
 	ChannelID         ChannelID `json:"channel_id"`
 	OwnerUserID       UserID    `json:"owner_user_id"`
-	Name              string    `json:"name"`
+	InternalName      string    `json:"internal_name"`
+	DisplayName       string    `json:"display_name"`
 	SubscribeKey      *string   `json:"subscribe_key"` // can be nil, depending on endpoint
 	SendKey           *string   `json:"send_key"`      // can be nil, depending on endpoint
 	TimestampCreated  string    `json:"timestamp_created"`
@@ -73,7 +76,8 @@ type ChannelWithSubscriptionJSON struct {
 type ChannelDB struct {
 	ChannelID         ChannelID `db:"channel_id"`
 	OwnerUserID       UserID    `db:"owner_user_id"`
-	Name              string    `db:"name"`
+	InternalName      string    `db:"internal_name"`
+	DisplayName       string    `db:"display_name"`
 	SubscribeKey      string    `db:"subscribe_key"`
 	SendKey           string    `db:"send_key"`
 	TimestampCreated  int64     `db:"timestamp_created"`
@@ -86,7 +90,8 @@ func (c ChannelDB) Model() Channel {
 	return Channel{
 		ChannelID:         c.ChannelID,
 		OwnerUserID:       c.OwnerUserID,
-		Name:              c.Name,
+		InternalName:      c.InternalName,
+		DisplayName:       c.DisplayName,
 		SubscribeKey:      c.SubscribeKey,
 		SendKey:           c.SendKey,
 		TimestampCreated:  time.UnixMilli(c.TimestampCreated),
--- a/scnserver/models/message.go
+++ b/scnserver/models/message.go
@@ -13,55 +13,55 @@ const (
 )

 type Message struct {
-	SCNMessageID    SCNMessageID
-	SenderUserID    UserID
-	OwnerUserID     UserID
-	ChannelName     string
-	ChannelID       ChannelID
-	SenderName      *string
-	SenderIP        string
-	TimestampReal   time.Time
-	TimestampClient *time.Time
-	Title           string
-	Content         *string
-	Priority        int
-	UserMessageID   *string
-	Deleted         bool
+	SCNMessageID        SCNMessageID
+	SenderUserID        UserID
+	OwnerUserID         UserID
+	ChannelInternalName string
+	ChannelID           ChannelID
+	SenderName          *string
+	SenderIP            string
+	TimestampReal       time.Time
+	TimestampClient     *time.Time
+	Title               string
+	Content             *string
+	Priority            int
+	UserMessageID       *string
+	Deleted             bool
 }

 func (m Message) FullJSON() MessageJSON {
 	return MessageJSON{
-		SCNMessageID:  m.SCNMessageID,
-		SenderUserID:  m.SenderUserID,
-		OwnerUserID:   m.OwnerUserID,
-		ChannelName:   m.ChannelName,
-		ChannelID:     m.ChannelID,
-		SenderName:    m.SenderName,
-		SenderIP:      m.SenderIP,
-		Timestamp:     m.Timestamp().Format(time.RFC3339Nano),
-		Title:         m.Title,
-		Content:       m.Content,
-		Priority:      m.Priority,
-		UserMessageID: m.UserMessageID,
-		Trimmed:       false,
+		SCNMessageID:        m.SCNMessageID,
+		SenderUserID:        m.SenderUserID,
+		OwnerUserID:         m.OwnerUserID,
+		ChannelInternalName: m.ChannelInternalName,
+		ChannelID:           m.ChannelID,
+		SenderName:          m.SenderName,
+		SenderIP:            m.SenderIP,
+		Timestamp:           m.Timestamp().Format(time.RFC3339Nano),
+		Title:               m.Title,
+		Content:             m.Content,
+		Priority:            m.Priority,
+		UserMessageID:       m.UserMessageID,
+		Trimmed:             false,
 	}
 }

 func (m Message) TrimmedJSON() MessageJSON {
 	return MessageJSON{
-		SCNMessageID:  m.SCNMessageID,
-		SenderUserID:  m.SenderUserID,
-		OwnerUserID:   m.OwnerUserID,
-		ChannelName:   m.ChannelName,
-		ChannelID:     m.ChannelID,
-		SenderName:    m.SenderName,
-		SenderIP:      m.SenderIP,
-		Timestamp:     m.Timestamp().Format(time.RFC3339Nano),
-		Title:         m.Title,
-		Content:       m.TrimmedContent(),
-		Priority:      m.Priority,
-		UserMessageID: m.UserMessageID,
-		Trimmed:       m.NeedsTrim(),
+		SCNMessageID:        m.SCNMessageID,
+		SenderUserID:        m.SenderUserID,
+		OwnerUserID:         m.OwnerUserID,
+		ChannelInternalName: m.ChannelInternalName,
+		ChannelID:           m.ChannelID,
+		SenderName:          m.SenderName,
+		SenderIP:            m.SenderIP,
+		Timestamp:           m.Timestamp().Format(time.RFC3339Nano),
+		Title:               m.Title,
+		Content:             m.TrimmedContent(),
+		Priority:            m.Priority,
+		UserMessageID:       m.UserMessageID,
+		Trimmed:             m.NeedsTrim(),
 	}
 }

@@ -94,54 +94,54 @@ func (m Message) ShortContent() string {
 }

 type MessageJSON struct {
-	SCNMessageID  SCNMessageID `json:"scn_message_id"`
-	SenderUserID  UserID       `json:"sender_user_id"`
-	OwnerUserID   UserID       `json:"owner_user_id"`
-	ChannelName   string       `json:"channel_name"`
-	ChannelID     ChannelID    `json:"channel_id"`
-	SenderName    *string      `json:"sender_name"`
-	SenderIP      string       `json:"sender_ip"`
-	Timestamp     string       `json:"timestamp"`
-	Title         string       `json:"title"`
-	Content       *string      `json:"content"`
-	Priority      int          `json:"priority"`
-	UserMessageID *string      `json:"usr_message_id"`
-	Trimmed       bool         `json:"trimmed"`
+	SCNMessageID        SCNMessageID `json:"scn_message_id"`
+	SenderUserID        UserID       `json:"sender_user_id"`
+	OwnerUserID         UserID       `json:"owner_user_id"`
+	ChannelInternalName string       `json:"channel_internal_name"`
+	ChannelID           ChannelID    `json:"channel_id"`
+	SenderName          *string      `json:"sender_name"`
+	SenderIP            string       `json:"sender_ip"`
+	Timestamp           string       `json:"timestamp"`
+	Title               string       `json:"title"`
+	Content             *string      `json:"content"`
+	Priority            int          `json:"priority"`
+	UserMessageID       *string      `json:"usr_message_id"`
+	Trimmed             bool         `json:"trimmed"`
 }

 type MessageDB struct {
-	SCNMessageID    SCNMessageID `db:"scn_message_id"`
-	SenderUserID    UserID       `db:"sender_user_id"`
-	OwnerUserID     UserID       `db:"owner_user_id"`
-	ChannelName     string       `db:"channel_name"`
-	ChannelID       ChannelID    `db:"channel_id"`
-	SenderName      *string      `db:"sender_name"`
-	SenderIP        string       `db:"sender_ip"`
-	TimestampReal   int64        `db:"timestamp_real"`
-	TimestampClient *int64       `db:"timestamp_client"`
-	Title           string       `db:"title"`
-	Content         *string      `db:"content"`
-	Priority        int          `db:"priority"`
-	UserMessageID   *string      `db:"usr_message_id"`
-	Deleted         int          `db:"deleted"`
+	SCNMessageID        SCNMessageID `db:"scn_message_id"`
+	SenderUserID        UserID       `db:"sender_user_id"`
+	OwnerUserID         UserID       `db:"owner_user_id"`
+	ChannelInternalName string       `db:"channel_internal_name"`
+	ChannelID           ChannelID    `db:"channel_id"`
+	SenderName          *string      `db:"sender_name"`
+	SenderIP            string       `db:"sender_ip"`
+	TimestampReal       int64        `db:"timestamp_real"`
+	TimestampClient     *int64       `db:"timestamp_client"`
+	Title               string       `db:"title"`
+	Content             *string      `db:"content"`
+	Priority            int          `db:"priority"`
+	UserMessageID       *string      `db:"usr_message_id"`
+	Deleted             int          `db:"deleted"`
 }

 func (m MessageDB) Model() Message {
 	return Message{
-		SCNMessageID:    m.SCNMessageID,
-		SenderUserID:    m.SenderUserID,
-		OwnerUserID:     m.OwnerUserID,
-		ChannelName:     m.ChannelName,
-		ChannelID:       m.ChannelID,
-		SenderName:      m.SenderName,
-		SenderIP:        m.SenderIP,
-		TimestampReal:   time.UnixMilli(m.TimestampReal),
-		TimestampClient: timeOptFromMilli(m.TimestampClient),
-		Title:           m.Title,
-		Content:         m.Content,
-		Priority:        m.Priority,
-		UserMessageID:   m.UserMessageID,
-		Deleted:         m.Deleted != 0,
+		SCNMessageID:        m.SCNMessageID,
+		SenderUserID:        m.SenderUserID,
+		OwnerUserID:         m.OwnerUserID,
+		ChannelInternalName: m.ChannelInternalName,
+		ChannelID:           m.ChannelID,
+		SenderName:          m.SenderName,
+		SenderIP:            m.SenderIP,
+		TimestampReal:       time.UnixMilli(m.TimestampReal),
+		TimestampClient:     timeOptFromMilli(m.TimestampClient),
+		Title:               m.Title,
+		Content:             m.Content,
+		Priority:            m.Priority,
+		UserMessageID:       m.UserMessageID,
+		Deleted:             m.Deleted != 0,
 	}
 }

--- a/scnserver/models/subscription.go
+++ b/scnserver/models/subscription.go
@@ -8,56 +8,56 @@ import (
 )

 type Subscription struct {
-	SubscriptionID     SubscriptionID
-	SubscriberUserID   UserID
-	ChannelOwnerUserID UserID
-	ChannelID          ChannelID
-	ChannelName        string
-	TimestampCreated   time.Time
-	Confirmed          bool
+	SubscriptionID      SubscriptionID
+	SubscriberUserID    UserID
+	ChannelOwnerUserID  UserID
+	ChannelID           ChannelID
+	ChannelInternalName string
+	TimestampCreated    time.Time
+	Confirmed           bool
 }

 func (s Subscription) JSON() SubscriptionJSON {
 	return SubscriptionJSON{
-		SubscriptionID:     s.SubscriptionID,
-		SubscriberUserID:   s.SubscriberUserID,
-		ChannelOwnerUserID: s.ChannelOwnerUserID,
-		ChannelID:          s.ChannelID,
-		ChannelName:        s.ChannelName,
-		TimestampCreated:   s.TimestampCreated.Format(time.RFC3339Nano),
-		Confirmed:          s.Confirmed,
+		SubscriptionID:      s.SubscriptionID,
+		SubscriberUserID:    s.SubscriberUserID,
+		ChannelOwnerUserID:  s.ChannelOwnerUserID,
+		ChannelID:           s.ChannelID,
+		ChannelInternalName: s.ChannelInternalName,
+		TimestampCreated:    s.TimestampCreated.Format(time.RFC3339Nano),
+		Confirmed:           s.Confirmed,
 	}
 }

 type SubscriptionJSON struct {
-	SubscriptionID     SubscriptionID `json:"subscription_id"`
-	SubscriberUserID   UserID         `json:"subscriber_user_id"`
-	ChannelOwnerUserID UserID         `json:"channel_owner_user_id"`
-	ChannelID          ChannelID      `json:"channel_id"`
-	ChannelName        string         `json:"channel_name"`
-	TimestampCreated   string         `json:"timestamp_created"`
-	Confirmed          bool           `json:"confirmed"`
+	SubscriptionID      SubscriptionID `json:"subscription_id"`
+	SubscriberUserID    UserID         `json:"subscriber_user_id"`
+	ChannelOwnerUserID  UserID         `json:"channel_owner_user_id"`
+	ChannelID           ChannelID      `json:"channel_id"`
+	ChannelInternalName string         `json:"channel_internal_name"`
+	TimestampCreated    string         `json:"timestamp_created"`
+	Confirmed           bool           `json:"confirmed"`
 }

 type SubscriptionDB struct {
-	SubscriptionID     SubscriptionID `db:"subscription_id"`
-	SubscriberUserID   UserID         `db:"subscriber_user_id"`
-	ChannelOwnerUserID UserID         `db:"channel_owner_user_id"`
-	ChannelID          ChannelID      `db:"channel_id"`
-	ChannelName        string         `db:"channel_name"`
-	TimestampCreated   int64          `db:"timestamp_created"`
-	Confirmed          int            `db:"confirmed"`
+	SubscriptionID      SubscriptionID `db:"subscription_id"`
+	SubscriberUserID    UserID         `db:"subscriber_user_id"`
+	ChannelOwnerUserID  UserID         `db:"channel_owner_user_id"`
+	ChannelID           ChannelID      `db:"channel_id"`
+	ChannelInternalName string         `db:"channel_internal_name"`
+	TimestampCreated    int64          `db:"timestamp_created"`
+	Confirmed           int            `db:"confirmed"`
 }

 func (s SubscriptionDB) Model() Subscription {
 	return Subscription{
-		SubscriptionID:     s.SubscriptionID,
-		SubscriberUserID:   s.SubscriberUserID,
-		ChannelOwnerUserID: s.ChannelOwnerUserID,
-		ChannelID:          s.ChannelID,
-		ChannelName:        s.ChannelName,
-		TimestampCreated:   time.UnixMilli(s.TimestampCreated),
-		Confirmed:          s.Confirmed != 0,
+		SubscriptionID:      s.SubscriptionID,
+		SubscriberUserID:    s.SubscriberUserID,
+		ChannelOwnerUserID:  s.ChannelOwnerUserID,
+		ChannelID:           s.ChannelID,
+		ChannelInternalName: s.ChannelInternalName,
+		TimestampCreated:    time.UnixMilli(s.TimestampCreated),
+		Confirmed:           s.Confirmed != 0,
 	}
 }