0.0.6 -> Master (#731)
* Implement webhook events for external integrations (#574) * Implement webhook events for external integrations Reference #556 * move message type to models and remove duplicate * add json header so content type can be determined * Pass at migrating webhooks to datastore + management apis (#589) * Pass at migrating webhooks to datastore + management apis * Support nil lastUsed timestamps and return back the new webhook on create * Cleanup from review feedback * Simplify a bit Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com> Co-authored-by: Gabe Kangas <gabek@real-ity.com> * Webhook query cleanup * Access tokens + Send system message external API (#585) * New add, get and delete access token APIs * Create auth token middleware * Update last_used timestamp when using an access token * Add auth'ed endpoint for sending system messages * Cleanup * Update api spec for new apis * Commit updated API documentation * Add auth'ed endpoint for sending user chat messages * Return access token string * Commit updated API documentation * Fix route * Support nil lastUsed time * Commit updated Javascript packages * Remove duplicate function post rebase * Fix msg id generation * Update controllers/admin/chat.go Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> * Webhook query cleanup * Add SystemMessageSent to EventType Co-authored-by: Owncast <owncast@owncast.online> Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> * Set webhook as used on completion. Closes #610 * Display webhook errors as errors * Commit updated API documentation * Add user joined chat event * Change integration API paths. Update API spec * Update development version of admin that supports integration apis * Commit updated API documentation * Add automated tests for external integration APIs * check error * quiet this test for now * Route up some additional 3rd party apis. #638 * Commit updated API documentation * Save username on user joined event * Add missing scope to valid scopes list * Add generic chat action event API for 3rd parties. Closes #666 * Commit updated API documentation * First pass at moving WIP config framework into project for #234 * Only support exported fields in custom types * Using YP get/set key as a first pass at using the data layer. Fixes + integration. * Ignore test db * Start adding getters and setters for config values * More get/set config work. Starting to populate api with data * Wire up some config edit endpoints * More endpoints * Disable cors middleware * Add more endpoints and add test to test them * Remove the in-memory change APIs * Add endpoint for changing tags * Add more config endpoints * Starting to point more things away from config file and to the datastore * Populate YP with db data * Create new util method for parsing page body markdown and return it in api * Verify proposed path to ffmpeg * For development purposes show the config key in logs * Move stats values to datastore * Moving over more values to the datastore * Move S3 config to datastore * First pass the config -> db migrator * Add the start of the video config apis * It builds pointing everything away from the config * Tweak ffmpeg path error message * Backup database every hour. Closes #549 * Config + defaults + migration work for db * Cleanup logging * Remove all the old config structs * Add descriptive info about migration * Tweak ffmpeg validation logic * Fix db backup path. backup on db version migration * Set video and s3 configurations * Update api spec with new config endpoints * Add migrator for stats file * Commit updated API documentation * Use a dynamic system port for internal HLS writes. Closes #577 (#626) * Use a dynamic system port for internal HLS writes. Closes #577 * Cleanup * YP key migration to datastore * Create a backup directory if needed before migrations * Remove config test that no longer makes sense. Cleanup. * Change number types from float32 to float64 * Update automated test suite * Allow restoring a database backup via command line flags. Closes #549 * Add new hls segment config api * Commit updated API documentation * Update apis to require a value container property * add socialHandles api * Commit updated API documentation * Add new latancy level setting to replace segment settings * Commit updated API documentation * Fix spelling * Commit updated API documentation * hardcode a json api of available social platforms * Add additional icons * Return social handles in server config api * Add socialhandles validation to test * Move list of hard coded social platforms to an api * Remove audio only code from transcoder since we do not use it * Add latency levels api + snapshot of video settings as current broadcast * Add config/serverurl endpoint * Return 404 on YP api if disabled * Surface stream title in YP response * Add stream title to web ui * Cleanup log message. Closes #520 * Rename ffmpeg package to transcoder * Add ws package for testing * Reduce chat backlog to past 5hrs, max 50. Closes #548 * Fix error formatting * Add endpoint for resetting yp registration * Add yp/reset to api spec. return status in response * Return zero viewer count if stream is offline. Closes #422 * Post-rebase fixes * Fix merge conflict in openapi file * Commit updated API documentation * Standardize controller names * Support setting the stream key via the command line. Closes #665 * Return social handles with YP data. First half of https://github.com/owncast/owncast-yp/issues/28 * Give the YP package access to server status regardless if enabled or not * Change delay in automated tests * Add stream title integration API. For #638 * Commit updated API documentation * Add storage to the migrator * Missing returning NSFW value in server config * Add flag to ignore websocket client. Closes #537 * Add error for parsing broadcaster metadata * Add support for a cli specified http server port. Closes #674 * Add cpu usage levels and a temporary mapping between it and libx264 presets * Test for valid url endpoint when saving s3 config * Re-configure storage on every stream to allow changing storage providers * After 5 minutes of a stream being stopped clear the stream title * Hide viewer count once stream goes offline instead of when player stops * Pull steamTitle from the status that gets updated instead of the config * Commit updated API documentation * Optionally show stream title in the header * Reset stream title when server starts * Show chat action when stream title is updated * Allow system messages to come back in persistence * Split out getting chat history for moderation + fix tests * Remove server title and standardize on name only * Commit updated API documentation * Bump github.com/aws/aws-sdk-go from 1.37.1 to 1.37.2 (#680) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.1 to 1.37.2. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.1...v1.37.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add video variant and stream latency config file migrator * Remove mostly unused disable upgrade check bool * Commit updated API documentation * Allow bundling the admin from the 0.0.6 branch * Fix saving port numbers * Use name instead of old title on window focus * Work on latency levels. Fix test to use levels. Clean up transcoder to only reference levels * Another place where title -> name * Fix test * Bump github.com/aws/aws-sdk-go from 1.37.2 to 1.37.3 (#690) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.2 to 1.37.3. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.2...v1.37.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependabot config * Bump github.com/aws/aws-sdk-go from 1.37.3 to 1.37.5 (#693) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.37.3 to 1.37.5. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.37.3...v1.37.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump video.js from 7.10.2 to 7.11.4 in /build/javascript (#694) * Bump video.js from 7.10.2 to 7.11.4 in /build/javascript Bumps [video.js](https://github.com/videojs/video.js) from 7.10.2 to 7.11.4. - [Release notes](https://github.com/videojs/video.js/releases) - [Changelog](https://github.com/videojs/video.js/blob/main/CHANGELOG.md) - [Commits](https://github.com/videojs/video.js/compare/v7.10.2...v7.11.4) Signed-off-by: dependabot[bot] <support@github.com> * Commit updated Javascript packages Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Owncast <owncast@owncast.online> * Make the latency migrator dynamic so I can tweak values easier * Split out fetching ffmpeg path from validating the path so it can be changed in the admin * Some commenting and linter cleanup * Validate the path for a logo change and throw an error if it does not exist * Logo change requests have to be a real file now * Cleanup, making linter happy * Format javascript on push * Only format js in master * Tweak latency level values * Remove unused config file examples * Fix thumbnail generation after messing with the ffmpeg path getter * Reduce how often we report high hardware utilization warnings * Bundle the 0.0.6 branch version of the admin * Return validated ffmpeg path in admin server config * Change the logo to be stored in the data directory instead of webroot * Bump postcss from 8.2.4 to 8.2.5 in /build/javascript (#702) Bumps [postcss](https://github.com/postcss/postcss) from 8.2.4 to 8.2.5. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.4...8.2.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Default config file no longer used * don't show stream title when offline addresses https://github.com/owncast/owncast/issues/677 * Remove auto-clearing stream title. #677 * webroot -> data when using logo as thumbnail * Do not list websocket/access token create/delete as integration APIs * Commit updated API documentation * Bundle updated admin * Remove pointing to the 0.0.6 admin branch * Linter cleanup * Linter cleanup * Add donations and follow links to show up under social handles * Prettified Code! * More linter cleanup * Update admin bundle * Remove use of platforms.js and return icons with social handles. Closes #732 * Update admin bundle * Support custom config path for use in migration * Remove unused platform-logos.gif * Reduce log level of message * Remove unused logo files in static dir * Handle dev vs. release build info * Restore logo.png for initial thumbnail * Cleanup some files from the build process that are not needed * Fix incorrect build-time injection var * Fix missing file getting copied to the build * Remove console directory message. * Update admin bundle * Fix comment * Report storage setup error * add some value set error checking * Use validated dynamic ffmpeg path for animated gif preview * Make chat message links be white so they don't hide in the bg. Closes #599 * Restore conditional that was accidentally removed Co-authored-by: Aaron Ogle <geekgonecrazy@users.noreply.github.com> Co-authored-by: Owncast <owncast@owncast.online> Co-authored-by: Ginger Wong <omqmail@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: nebunez <uoj2y7wak869@opayq.net> Co-authored-by: gabek <gabek@users.noreply.github.com>
This commit is contained in:
Gabe Kangas
@@ -12,7 +12,7 @@ export default class StandaloneChat extends Component {
|
||||
super(props, context);
|
||||
|
||||
this.state = {
|
||||
websocket: new Websocket(),
|
||||
websocket: new Websocket(true), // Send along the "ignoreClient" flag so this isn't counted as a viewer
|
||||
chatEnabled: true, // always true for standalone chat
|
||||
username: getLocalStorage(KEY_USERNAME) || generateUsername(),
|
||||
};
|
||||
@@ -35,6 +35,7 @@ export default class StandaloneChat extends Component {
|
||||
websocket=${websocket}
|
||||
username=${username}
|
||||
messagesOnly
|
||||
ignoreClient
|
||||
/>
|
||||
`
|
||||
);
|
||||
|
||||
@@ -177,8 +177,8 @@ export default class App extends Component {
|
||||
}
|
||||
|
||||
setConfigData(data = {}) {
|
||||
const { title, summary } = data;
|
||||
window.document.title = title;
|
||||
const { name, summary } = data;
|
||||
window.document.title = name;
|
||||
|
||||
this.setState({
|
||||
configData: {
|
||||
@@ -199,6 +199,7 @@ export default class App extends Component {
|
||||
viewerCount,
|
||||
online,
|
||||
lastConnectTime,
|
||||
streamTitle,
|
||||
} = status;
|
||||
|
||||
this.lastDisconnectTime = status.lastDisconnectTime;
|
||||
@@ -215,6 +216,7 @@ export default class App extends Component {
|
||||
viewerCount,
|
||||
lastConnectTime,
|
||||
streamOnline: online,
|
||||
streamTitle,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -263,7 +265,7 @@ export default class App extends Component {
|
||||
}
|
||||
|
||||
if (this.windowBlurred) {
|
||||
document.title = ` 🔴 ${this.state.configData && this.state.configData.title}`;
|
||||
document.title = ` 🔴 ${this.state.configData && this.state.configData.name}`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,11 +284,12 @@ export default class App extends Component {
|
||||
playerActive: true,
|
||||
streamOnline: true,
|
||||
chatInputEnabled: true,
|
||||
streamTitle: '',
|
||||
streamStatusMessage: MESSAGE_ONLINE,
|
||||
});
|
||||
|
||||
if (this.windowBlurred) {
|
||||
document.title = ` 🟢 ${this.state.configData && this.state.configData.title}`;
|
||||
document.title = ` 🟢 ${this.state.configData && this.state.configData.name}`;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -362,7 +365,7 @@ export default class App extends Component {
|
||||
|
||||
handleWindowFocus() {
|
||||
this.windowBlurred = false;
|
||||
window.document.title = this.state.configData && this.state.configData.title;
|
||||
window.document.title = this.state.configData && this.state.configData.name;
|
||||
}
|
||||
|
||||
handleSpaceBarPressed(e) {
|
||||
@@ -396,6 +399,7 @@ export default class App extends Component {
|
||||
playerActive,
|
||||
streamOnline,
|
||||
streamStatusMessage,
|
||||
streamTitle,
|
||||
touchKeyboardActive,
|
||||
username,
|
||||
viewerCount,
|
||||
@@ -409,10 +413,9 @@ export default class App extends Component {
|
||||
version: appVersion,
|
||||
logo = TEMP_IMAGE,
|
||||
socialHandles = [],
|
||||
name: streamerName,
|
||||
summary,
|
||||
tags = [],
|
||||
title,
|
||||
name,
|
||||
extraPageContent,
|
||||
} = configData;
|
||||
|
||||
@@ -431,6 +434,10 @@ export default class App extends Component {
|
||||
)
|
||||
: null;
|
||||
|
||||
const viewerCountMessage = streamOnline && viewerCount > 0 ? (
|
||||
html`${viewerCount} ${pluralize('viewer', viewerCount)}`
|
||||
) : null;
|
||||
|
||||
const mainClass = playerActive ? 'online' : '';
|
||||
const isPortrait = this.hasTouchScreen && orientation === ORIENTATION_PORTRAIT;
|
||||
const shortHeight = windowHeight <= HEIGHT_SHORT_WIDE && !isPortrait;
|
||||
@@ -469,7 +476,7 @@ export default class App extends Component {
|
||||
<img class="logo visually-hidden" src=${OWNCAST_LOGO_LOCAL} alt="owncast logo" />
|
||||
</span>
|
||||
<span class="instance-title overflow-hidden truncate"
|
||||
>${title}</span
|
||||
>${(streamOnline && streamTitle) ? streamTitle : name}</span
|
||||
>
|
||||
</h1>
|
||||
<div
|
||||
@@ -515,7 +522,7 @@ export default class App extends Component {
|
||||
class="flex text-center flex-row justify-between font-mono py-2 px-8 bg-gray-900 text-indigo-200 shadow-md border-b border-gray-100 border-solid"
|
||||
>
|
||||
<span>${streamStatusMessage}</span>
|
||||
<span id="stream-viewer-count">${viewerCount} ${pluralize('viewer', viewerCount)}.</span>
|
||||
<span id="stream-viewer-count">${viewerCountMessage}</span>
|
||||
</section>
|
||||
</main>
|
||||
|
||||
@@ -532,9 +539,12 @@ export default class App extends Component {
|
||||
>
|
||||
<h2 class="font-semibold text-5xl">
|
||||
<span class="streamer-name text-indigo-600"
|
||||
>${streamerName}</span
|
||||
>${name}</span
|
||||
>
|
||||
</h2>
|
||||
<h3 class="font-semibold text-3xl">
|
||||
${streamOnline && streamTitle}
|
||||
</h3>
|
||||
<${SocialIconsList} handles=${socialHandles} />
|
||||
<div
|
||||
id="stream-summary"
|
||||
@@ -564,7 +574,7 @@ export default class App extends Component {
|
||||
websocket=${websocket}
|
||||
username=${username}
|
||||
chatInputEnabled=${chatInputEnabled}
|
||||
instanceTitle=${title}
|
||||
instanceTitle=${name}
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -7,9 +7,9 @@ import '/js/web_modules/@justinribeiro/lite-youtube.js';
|
||||
import Message from './message.js';
|
||||
import ChatInput from './chat-input.js';
|
||||
import { CALLBACKS, SOCKET_MESSAGE_TYPES } from '../../utils/websocket.js';
|
||||
import { jumpToBottom, debounce } from '../../utils/helpers.js';
|
||||
import { jumpToBottom, debounce, getLocalStorage } from '../../utils/helpers.js';
|
||||
import { extraUserNamesFromMessageHistory } from '../../utils/chat.js';
|
||||
import { URL_CHAT_HISTORY, MESSAGE_JUMPTOBOTTOM_BUFFER } from '../../utils/constants.js';
|
||||
import { URL_CHAT_HISTORY, MESSAGE_JUMPTOBOTTOM_BUFFER, KEY_CUSTOM_USERNAME_SET } from '../../utils/constants.js';
|
||||
|
||||
export default class Chat extends Component {
|
||||
constructor(props, context) {
|
||||
@@ -126,7 +126,7 @@ export default class Chat extends Component {
|
||||
// extra user names
|
||||
const chatUserNames = extraUserNamesFromMessageHistory(data);
|
||||
this.setState({
|
||||
messages: data,
|
||||
messages: this.state.messages.concat(data),
|
||||
chatUserNames,
|
||||
});
|
||||
})
|
||||
@@ -136,6 +136,8 @@ export default class Chat extends Component {
|
||||
}
|
||||
|
||||
sendUsernameChange(oldName, newName) {
|
||||
clearTimeout(this.sendUserJoinedEvent);
|
||||
|
||||
const nameChange = {
|
||||
type: SOCKET_MESSAGE_TYPES.NAME_CHANGE,
|
||||
oldName,
|
||||
@@ -215,6 +217,11 @@ export default class Chat extends Component {
|
||||
this.setState({
|
||||
webSocketConnected: true,
|
||||
});
|
||||
|
||||
const hasPreviouslySetCustomUsername = getLocalStorage(KEY_CUSTOM_USERNAME_SET);
|
||||
if (hasPreviouslySetCustomUsername && !this.props.ignoreClient) {
|
||||
this.sendJoinedMessage();
|
||||
}
|
||||
}
|
||||
|
||||
websocketDisconnected() {
|
||||
@@ -236,6 +243,20 @@ export default class Chat extends Component {
|
||||
this.websocket.send(message);
|
||||
}
|
||||
|
||||
sendJoinedMessage() {
|
||||
const { username } = this.props;
|
||||
const message = {
|
||||
username: username,
|
||||
type: SOCKET_MESSAGE_TYPES.USER_JOINED,
|
||||
};
|
||||
|
||||
// Artificial delay so people who join and immediately
|
||||
// leave don't get counted.
|
||||
this.sendUserJoinedEvent = setTimeout(function() {
|
||||
this.websocket.send(message);
|
||||
}.bind(this), 5000);
|
||||
}
|
||||
|
||||
updateAuthorList(message) {
|
||||
const { type } = message;
|
||||
const nameList = this.state.chatUserNames;
|
||||
|
||||
@@ -24,6 +24,33 @@ export default function Message(props) {
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else if (type === SOCKET_MESSAGE_TYPES.USER_JOINED) {
|
||||
const { username } = message;
|
||||
return (
|
||||
html`
|
||||
<div class="message message-user-joined flex items-center justify-start p-3">
|
||||
<div class="message-content flex flex-row items-center justify-center text-sm w-full">
|
||||
<div class="text-white text-center opacity-50 overflow-hidden break-words">
|
||||
<span class="font-bold">${username}</span> joined the chat.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else if (type === SOCKET_MESSAGE_TYPES.CHAT_ACTION) {
|
||||
const { author, body } = message;
|
||||
const formattedMessage = `${body}`
|
||||
return (
|
||||
html`
|
||||
<div class="message message-user-joined flex items-center justify-start p-3">
|
||||
<div class="message-content flex flex-row items-center justify-center text-sm w-full">
|
||||
<div class="text-white text-center opacity-50 overflow-hidden break-words">
|
||||
<span dangerouslySetInnerHTML=${{ __html: formattedMessage }}></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
);
|
||||
} else {
|
||||
console.log("Unknown message type:", type);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import htm from '/js/web_modules/htm.js';
|
||||
const html = htm.bind(h);
|
||||
|
||||
import { setLocalStorage } from '../../utils/helpers.js';
|
||||
import { KEY_USERNAME } from '../../utils/constants.js';
|
||||
import { KEY_USERNAME, KEY_CUSTOM_USERNAME_SET } from '../../utils/constants.js';
|
||||
|
||||
export default class UsernameForm extends Component {
|
||||
constructor(props, context) {
|
||||
@@ -51,6 +51,8 @@ export default class UsernameForm extends Component {
|
||||
newName = newName.trim();
|
||||
if (newName !== '' && newName !== curName) {
|
||||
setLocalStorage(KEY_USERNAME, newName);
|
||||
// So we know that the user has set a custom name
|
||||
setLocalStorage(KEY_CUSTOM_USERNAME_SET, true);
|
||||
if (onUsernameChange) {
|
||||
onUsernameChange(newName);
|
||||
}
|
||||
|
||||
@@ -1,18 +1,15 @@
|
||||
import {h} from '/js/web_modules/preact.js';
|
||||
import htm from '/js/web_modules/htm.js';
|
||||
import {SOCIAL_PLATFORMS} from '../utils/platforms.js';
|
||||
import {classNames} from '../utils/helpers.js';
|
||||
|
||||
const html = htm.bind(h);
|
||||
|
||||
function SocialIcon(props) {
|
||||
const {platform, icon, url} = props;
|
||||
const platformInfo = SOCIAL_PLATFORMS[platform.toLowerCase()];
|
||||
const inList = !!platformInfo;
|
||||
const iconSupplied = !!icon
|
||||
const name = inList ? platformInfo.name : platform;
|
||||
const name = platform;
|
||||
|
||||
const finalIcon = iconSupplied ? icon : (inList ? platformInfo.icon : '/img/platformlogos/default.svg')
|
||||
const finalIcon = iconSupplied ? icon : '/img/platformlogos/default.svg';
|
||||
|
||||
const style = `background-image: url(${finalIcon});`
|
||||
|
||||
@@ -22,7 +19,6 @@ function SocialIcon(props) {
|
||||
"justify-start": true,
|
||||
"items-center": true,
|
||||
"-mr-1": true,
|
||||
"use-default": !inList,
|
||||
});
|
||||
const labelClass = classNames({
|
||||
"platform-label": true,
|
||||
|
||||
@@ -24,6 +24,7 @@ export const PLAYER_VOLUME = 'owncast_volume';
|
||||
|
||||
|
||||
export const KEY_USERNAME = 'owncast_username';
|
||||
export const KEY_CUSTOM_USERNAME_SET = 'owncast_custom_username_set'
|
||||
export const KEY_CHAT_DISPLAYED = 'owncast_chat';
|
||||
export const KEY_CHAT_FIRST_MESSAGE_SENT = 'owncast_first_message_sent';
|
||||
export const CHAT_INITIAL_PLACEHOLDER_TEXT = 'Type here to chat, no account necessary.';
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
export const SOCIAL_PLATFORMS = {
|
||||
default: {
|
||||
name: "default",
|
||||
icon: '/img/platformlogos/default.svg',
|
||||
},
|
||||
|
||||
facebook: {
|
||||
name: "Facebook",
|
||||
icon: '/img/platformlogos/facebook.svg',
|
||||
},
|
||||
twitter: {
|
||||
name: "Twitter",
|
||||
icon: '/img/platformlogos/twitter.svg',
|
||||
},
|
||||
instagram: {
|
||||
name: "Instagram",
|
||||
icon: '/img/platformlogos/instagram.svg',
|
||||
},
|
||||
snapchat: {
|
||||
name: "Snapchat",
|
||||
icon: '/img/platformlogos/snapchat.svg',
|
||||
},
|
||||
tiktok: {
|
||||
name: "TikTok",
|
||||
icon: '/img/platformlogos/tiktok.svg',
|
||||
},
|
||||
soundcloud: {
|
||||
name: "Soundcloud",
|
||||
icon: '/img/platformlogos/soundcloud.svg',
|
||||
},
|
||||
bandcamp: {
|
||||
name: "Bandcamp",
|
||||
icon: '/img/platformlogos/bandcamp.svg',
|
||||
},
|
||||
patreon: {
|
||||
name: "Patreon",
|
||||
icon: '/img/platformlogos/patreon.svg',
|
||||
},
|
||||
youtube: {
|
||||
name: "YouTube",
|
||||
icon: '/img/platformlogos/youtube.svg',
|
||||
},
|
||||
spotify: {
|
||||
name: "Spotify",
|
||||
icon: '/img/platformlogos/spotify.svg',
|
||||
},
|
||||
twitch: {
|
||||
name: "Twitch",
|
||||
icon: '/img/platformlogos/twitch.svg',
|
||||
},
|
||||
paypal: {
|
||||
name: "Paypal",
|
||||
icon: '/img/platformlogos/paypal.svg',
|
||||
},
|
||||
github: {
|
||||
name: "Github",
|
||||
icon: '/img/platformlogos/github.svg',
|
||||
},
|
||||
linkedin: {
|
||||
name: "LinkedIn",
|
||||
icon: '/img/platformlogos/linkedin.svg',
|
||||
},
|
||||
discord: {
|
||||
name: "Discord",
|
||||
icon: '/img/platformlogos/discord.svg',
|
||||
},
|
||||
mastodon: {
|
||||
name: "Mastodon",
|
||||
icon: '/img/platformlogos/mastodon.svg',
|
||||
},
|
||||
gitlab: {
|
||||
name: "Gitlab",
|
||||
icon: '/img/platformlogos/gitlab.svg',
|
||||
},
|
||||
kofi: {
|
||||
name: "Ko-Fi",
|
||||
icon: '/img/platformlogos/ko-fi.svg',
|
||||
},
|
||||
keyoxide: {
|
||||
name: "Key Oxide",
|
||||
icon: '/img/platformlogos/keyoxide.png',
|
||||
},
|
||||
};
|
||||
@@ -9,9 +9,13 @@ export const SOCKET_MESSAGE_TYPES = {
|
||||
PING: 'PING',
|
||||
NAME_CHANGE: 'NAME_CHANGE',
|
||||
PONG: 'PONG',
|
||||
SYSTEM: 'SYSTEM'
|
||||
SYSTEM: 'SYSTEM',
|
||||
USER_JOINED: 'USER_JOINED',
|
||||
CHAT_ACTION: 'CHAT_ACTION'
|
||||
};
|
||||
|
||||
const IGNORE_CLIENT_FLAG = 'IGNORE_CLIENT';
|
||||
|
||||
export const CALLBACKS = {
|
||||
RAW_WEBSOCKET_MESSAGE_RECEIVED: 'rawWebsocketMessageReceived',
|
||||
WEBSOCKET_CONNECTED: 'websocketConnected',
|
||||
@@ -21,7 +25,7 @@ export const CALLBACKS = {
|
||||
const TIMER_WEBSOCKET_RECONNECT = 5000; // ms
|
||||
|
||||
export default class Websocket {
|
||||
constructor() {
|
||||
constructor(ignoreClient) {
|
||||
this.websocket = null;
|
||||
this.websocketReconnectTimer = null;
|
||||
|
||||
@@ -33,11 +37,14 @@ export default class Websocket {
|
||||
this.createAndConnect = this.createAndConnect.bind(this);
|
||||
this.scheduleReconnect = this.scheduleReconnect.bind(this);
|
||||
|
||||
this.ignoreClient = ignoreClient;
|
||||
|
||||
this.createAndConnect();
|
||||
}
|
||||
|
||||
createAndConnect() {
|
||||
const ws = new WebSocket(URL_WEBSOCKET);
|
||||
const extraFlags = this.ignoreClient ? [IGNORE_CLIENT_FLAG] : [];
|
||||
const ws = new WebSocket(URL_WEBSOCKET, extraFlags);
|
||||
ws.onopen = this.onOpen.bind(this);
|
||||
ws.onclose = this.onClose.bind(this);
|
||||
ws.onerror = this.onError.bind(this);
|
||||
|
||||
Reference in New Issue
Block a user