diff --git a/core/chat/persistence.go b/core/chat/persistence.go index 317ef4664..14958689e 100644 --- a/core/chat/persistence.go +++ b/core/chat/persistence.go @@ -36,7 +36,6 @@ func createTable(db *sql.DB) { "id" string NOT NULL PRIMARY KEY, "author" TEXT, "body" TEXT, - "image" TEXT, "messageType" TEXT, "visible" INTEGER, "timestamp" DATE @@ -51,11 +50,11 @@ func createTable(db *sql.DB) { func addMessage(message models.ChatMessage) { tx, err := _db.Begin() - stmt, err := tx.Prepare("INSERT INTO messages(id, author, body, image, messageType, visible, timestamp) values(?, ?, ?, ?, ?, ?, ?)") + stmt, err := tx.Prepare("INSERT INTO messages(id, author, body, messageType, visible, timestamp) values(?, ?, ?, ?, ?, ?)") if err != nil { log.Fatal(err) } - _, err = stmt.Exec(message.ID, message.Author, message.Body, message.Image, message.MessageType, 1, message.Timestamp) + _, err = stmt.Exec(message.ID, message.Author, message.Body, message.MessageType, 1, message.Timestamp) if err != nil { log.Fatal(err) } @@ -78,12 +77,11 @@ func getChatHistory() []models.ChatMessage { var id string var author string var body string - var image string var messageType string var visible int var timestamp time.Time - err = rows.Scan(&id, &author, &body, &image, &messageType, &visible, ×tamp) + err = rows.Scan(&id, &author, &body, &messageType, &visible, ×tamp) if err != nil { log.Fatal(err) } @@ -92,7 +90,6 @@ func getChatHistory() []models.ChatMessage { message.ID = id message.Author = author message.Body = body - message.Image = image message.MessageType = messageType message.Visible = visible == 1 message.Timestamp = timestamp diff --git a/core/chat/server.go b/core/chat/server.go index 87b311864..ad70972d5 100644 --- a/core/chat/server.go +++ b/core/chat/server.go @@ -140,7 +140,7 @@ func (s *server) sendWelcomeMessageToClient(c *Client) { time.Sleep(7 * time.Second) initialChatMessageText := fmt.Sprintf("Welcome to %s! %s", config.Config.InstanceDetails.Title, config.Config.InstanceDetails.Summary) - initialMessage := models.ChatMessage{"owncast-server", config.Config.InstanceDetails.Name, initialChatMessageText, config.Config.InstanceDetails.Logo.Small, "initial-message-1", "CHAT", true, time.Now()} + initialMessage := models.ChatMessage{"owncast-server", config.Config.InstanceDetails.Name, initialChatMessageText, "initial-message-1", "CHAT", true, time.Now()} c.Write(initialMessage) }() diff --git a/models/chatMessage.go b/models/chatMessage.go index 5080c2669..af65b385d 100644 --- a/models/chatMessage.go +++ b/models/chatMessage.go @@ -18,7 +18,6 @@ type ChatMessage struct { Author string `json:"author"` Body string `json:"body"` - Image string `json:"image"` ID string `json:"id"` MessageType string `json:"type"` Visible bool `json:"visible"` diff --git a/openapi.yaml b/openapi.yaml index 8d0fab8b1..b1e5992c1 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -311,9 +311,6 @@ paths: body: type: string description: Escaped HTML of the chat message content. - image: - type: string - description: URL of the chat user avatar. id: type: string description: Unique ID of the chat message. diff --git a/webroot/js/app-standalone-chat.js b/webroot/js/app-standalone-chat.js index b57b32255..86e4873d1 100644 --- a/webroot/js/app-standalone-chat.js +++ b/webroot/js/app-standalone-chat.js @@ -4,8 +4,8 @@ const html = htm.bind(h); import Chat from './components/chat/chat.js'; import Websocket from './utils/websocket.js'; -import { getLocalStorage, generateAvatar, generateUsername } from './utils/helpers.js'; -import { KEY_USERNAME, KEY_AVATAR } from './utils/constants.js'; +import { getLocalStorage, generateUsername } from './utils/helpers.js'; +import { KEY_USERNAME } from './utils/constants.js'; export default class StandaloneChat extends Component { constructor(props, context) { @@ -15,28 +15,25 @@ export default class StandaloneChat extends Component { websocket: new Websocket(), chatEnabled: true, // always true for standalone chat username: getLocalStorage(KEY_USERNAME) || generateUsername(), - userAvatarImage: getLocalStorage(KEY_AVATAR) || generateAvatar(`${this.username}${Date.now()}`), }; this.websocket = null; this.handleUsernameChange = this.handleUsernameChange.bind(this); } - handleUsernameChange(newName, newAvatar) { + handleUsernameChange(newName) { this.setState({ username: newName, - userAvatarImage: newAvatar, }); } render(props, state) { - const { username, userAvatarImage, websocket } = state; + const { username, websocket } = state; return ( html` <${Chat} websocket=${websocket} username=${username} - userAvatarImage=${userAvatarImage} messagesOnly /> ` diff --git a/webroot/js/app.js b/webroot/js/app.js index 3fa1453a7..29706c78b 100644 --- a/webroot/js/app.js +++ b/webroot/js/app.js @@ -14,7 +14,6 @@ import { classNames, clearLocalStorage, debounce, - generateAvatar, generateUsername, getLocalStorage, pluralize, @@ -22,7 +21,6 @@ import { } from './utils/helpers.js'; import { HEIGHT_SHORT_WIDE, - KEY_AVATAR, KEY_CHAT_DISPLAYED, KEY_USERNAME, MESSAGE_OFFLINE, @@ -50,9 +48,6 @@ export default class App extends Component { displayChat: chatStorage === null ? true : chatStorage, chatInputEnabled: false, // chat input box state username: getLocalStorage(KEY_USERNAME) || generateUsername(), - userAvatarImage: - getLocalStorage(KEY_AVATAR) || - generateAvatar(`${this.username}${Date.now()}`), configData: {}, extraPageContent: '', @@ -282,10 +277,9 @@ export default class App extends Component { } - handleUsernameChange(newName, newAvatar) { + handleUsernameChange(newName) { this.setState({ username: newName, - userAvatarImage: newAvatar, }); } @@ -330,7 +324,6 @@ export default class App extends Component { playerActive, streamOnline, streamStatusMessage, - userAvatarImage, username, viewerCount, websocket, @@ -415,7 +408,6 @@ export default class App extends Component { > <${UsernameForm} username=${username} - userAvatarImage=${userAvatarImage} handleUsernameChange=${this.handleUsernameChange} />