mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-10-13 22:41:57 +00:00
The In-Line Actions Update
* Add extensible actions system. * Add extensive UI for configuring the actions system. * Add setting to disable channel hosting. * Fix the stupid Rooms thing popping up every time you open a channel. * Fix how we grab chat types from React. * Refactor how we handle incoming chat messages. * Add a hook for outgoing chat messages. * Fix emoji appearing squished with baseline emote alignment. * Display arrows on balloons. * Fix an issue generating emoji URLs. * Do not use the default values for settings with merge strategies if profiles have those settings, just empty. * Display a message in the chat settings menu if we tried opening FFZ's settings and failed. * Wait a bit for webpack's loader if it's not immediately there for some reason. * Probably other stuff. * Not mod cards. Yet.
This commit is contained in:
SirStendec
parent
e9214bb46a
commit
fdde05030f
67 changed files with 7689 additions and 226 deletions
|
|
@ -15,6 +15,7 @@ const BAD_ERRORS = [
|
|||
'error internal',
|
||||
'context deadline exceeded',
|
||||
'unexpected service response',
|
||||
'service unavailable',
|
||||
'404',
|
||||
'500',
|
||||
'501',
|
||||
|
|
|
|||
|
|
@ -123,13 +123,21 @@ export default class WebMunch extends Module {
|
|||
// Grabbing Require
|
||||
// ========================================================================
|
||||
|
||||
getRequire() {
|
||||
getRequire(limit = 0) {
|
||||
if ( this._require )
|
||||
return Promise.resolve(this._require);
|
||||
|
||||
return new Promise(resolve => {
|
||||
const fn = this._original_loader || window.webpackJsonp;
|
||||
if ( ! fn ) {
|
||||
if ( limit > 100 )
|
||||
throw new Error('unable to find webpackJsonp');
|
||||
|
||||
return setTimeout(() => this.getRequire(limit++).then(resolve), 100);
|
||||
}
|
||||
|
||||
const id = `${this._id}$${this._rid++}`;
|
||||
(this._original_loader || window.webpackJsonp)(
|
||||
fn(
|
||||
[],
|
||||
{
|
||||
[id]: (module, exports, __webpack_require__) => {
|
||||
|
|
|
|||
|
|
@ -91,14 +91,25 @@ export function createElement(tag, props, ...children) {
|
|||
return el;
|
||||
}
|
||||
|
||||
export function setChildren(el, children, no_sanitize) {
|
||||
export function setChildren(el, children, no_sanitize, no_empty) {
|
||||
if ( typeof children === 'string' ) {
|
||||
if ( no_sanitize )
|
||||
el.innerHTML = children;
|
||||
else
|
||||
el.textContent = children;
|
||||
if ( no_empty ) {
|
||||
el.appendChild(no_sanitize ?
|
||||
range.createContextualFragment(children) :
|
||||
document.createTextNode(children)
|
||||
)
|
||||
|
||||
} else {
|
||||
if ( no_sanitize )
|
||||
el.innerHTML = children;
|
||||
else
|
||||
el.textContent = children;
|
||||
}
|
||||
|
||||
} else if ( Array.isArray(children) ) {
|
||||
if ( ! no_empty )
|
||||
el.innerHTML = '';
|
||||
|
||||
for(const child of children)
|
||||
if ( typeof child === 'string' )
|
||||
el.appendChild(no_sanitize ?
|
||||
|
|
@ -106,11 +117,18 @@ export function setChildren(el, children, no_sanitize) {
|
|||
document.createTextNode(child)
|
||||
);
|
||||
|
||||
else if ( Array.isArray(child) )
|
||||
setChildren(el, child, no_sanitize, true);
|
||||
|
||||
else if ( child )
|
||||
el.appendChild(child);
|
||||
|
||||
} else if ( children )
|
||||
} else if ( children ) {
|
||||
if ( ! no_empty )
|
||||
el.innerHTML = '';
|
||||
|
||||
el.appendChild(children);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
236
src/utilities/font-awesome.js
Normal file
236
src/utilities/font-awesome.js
Normal file
|
|
@ -0,0 +1,236 @@
|
|||
'use strict';
|
||||
|
||||
import {createElement} from 'utilities/dom';
|
||||
|
||||
// ============================================================================
|
||||
// Font Awesome Data
|
||||
// ============================================================================
|
||||
|
||||
export const ALIASES = {
|
||||
'ban': ['ban', 'block'],
|
||||
'ok': ['ok', 'unban', 'untimeout'],
|
||||
'clock-o': ['clock-o', 'clock', 'timeout'],
|
||||
'times': ['remove','close','times'],
|
||||
'cog': ['gear','cog'],
|
||||
'repeat': ['rotate-right','repeat'],
|
||||
'outdent': ['dedent','outdent'],
|
||||
'picture-o': ['photo','image','picture-o'],
|
||||
'pencil-square-o': ['edit','pencil-square-o'],
|
||||
'share': ['mail-forward','share'],
|
||||
'exclamation-triangle': ['warning','exclamation-triangle'],
|
||||
'bar-chart': ['bar-chart-o','bar-chart'],
|
||||
'cogs': ['gears','cogs'],
|
||||
'facebook': ['facebook-f','facebook'],
|
||||
'rss': ['feed','rss'],
|
||||
'users': ['group','users'],
|
||||
'link': ['chain','link'],
|
||||
'scissors': ['cut','scissors'],
|
||||
'files-o': ['copy','files-o'],
|
||||
'floppy-o': ['save','floppy-o'],
|
||||
'bars': ['navicon','reorder','bars'],
|
||||
'sort': ['unsorted','sort'],
|
||||
'sort-desc': ['sort-down','sort-desc'],
|
||||
'sort-asc': ['sort-up','sort-asc'],
|
||||
'undo': ['rotate-left','undo'],
|
||||
'gavel': ['legal','gavel'],
|
||||
'tachometer': ['dashboard','tachometer'],
|
||||
'bolt': ['flash','bolt'],
|
||||
'clipboard': ['paste','clipboard'],
|
||||
'mobile': ['mobile-phone','mobile'],
|
||||
'reply': ['mail-reply','reply'],
|
||||
'reply-all': ['mail-reply-all','reply-all'],
|
||||
'star-half-o': ['star-half-empty','star-half-full','star-half-o'],
|
||||
'chain-broken': ['unlink','chain-broken'],
|
||||
'caret-square-o-down': ['toggle-down','caret-square-o-down'],
|
||||
'caret-square-o-up': ['toggle-up','caret-square-o-up'],
|
||||
'caret-square-o-right': ['toggle-right','caret-square-o-right'],
|
||||
'eur': ['euro','eur'],
|
||||
'usd': ['dollar','usd'],
|
||||
'inr': ['rupee','inr'],
|
||||
'jpy': ['cny','rmb','yen','jpy'],
|
||||
'rub': ['ruble','rouble','rub'],
|
||||
'krw': ['won','krw'],
|
||||
'btc': ['bitcoin','btc'],
|
||||
'gratipay': ['gittip','gratipay'],
|
||||
'caret-square-o-left': ['toggle-left','caret-square-o-left'],
|
||||
'try': ['turkish-lira','try'],
|
||||
'university': ['institution','bank','university'],
|
||||
'graduation-cap': ['mortar-board','graduation-cap'],
|
||||
'car': ['automobile','car'],
|
||||
'taxi': ['cab','taxi'],
|
||||
'file-image-o': ['file-photo-o','file-picture-o','file-image-o'],
|
||||
'file-archive-o': ['file-zip-o','file-archive-o'],
|
||||
'file-audio-o': ['file-sound-o','file-audio-o'],
|
||||
'file-video-o': ['file-movie-o','file-video-o'],
|
||||
'life-ring': ['life-bouy','life-buoy','life-saver','support','life-ring'],
|
||||
'rebel': ['ra','resistance','rebel'],
|
||||
'empire': ['ge','empire'],
|
||||
'hacker-news': ['y-combinator-square','yc-square','hacker-news'],
|
||||
'weixin': ['wechat','weixin'],
|
||||
'paper-plane': ['send','paper-plane'],
|
||||
'paper-plane-o': ['send-o','paper-plane-o'],
|
||||
'futbol-o': ['soccer-ball-o','futbol-o'],
|
||||
'ils': ['shekel','sheqel','ils'],
|
||||
'transgender': ['intersex','transgender'],
|
||||
'bed': ['hotel','bed'],
|
||||
'y-combinator': ['yc','y-combinator'],
|
||||
'battery-full': ['battery-4','battery','battery-full'],
|
||||
'battery-three-quarters': ['battery-3','battery-three-quarters'],
|
||||
'battery-half': ['battery-2','battery-half'],
|
||||
'battery-quarter': ['battery-1','battery-quarter'],
|
||||
'battery-empty': ['battery-0','battery-empty'],
|
||||
'hourglass-start': ['hourglass-1','hourglass-start'],
|
||||
'hourglass-half': ['hourglass-2','hourglass-half'],
|
||||
'hourglass-end': ['hourglass-3','hourglass-end'],
|
||||
'hand-rock-o': ['hand-grab-o','hand-rock-o'],
|
||||
'hand-paper-o': ['hand-stop-o','hand-paper-o'],
|
||||
'television': ['tv','television'],
|
||||
'american-sign-language-interpreting': ['asl-interpreting','american-sign-language-interpreting'],
|
||||
'deaf': ['deafness','hard-of-hearing','deaf'],
|
||||
'sign-language': ['signing','sign-language'],
|
||||
'google-plus-official': ['google-plus-circle','google-plus-official'],
|
||||
'font-awesome': ['fa','font-awesome'],
|
||||
'address-card': ['vcard','address-card'],
|
||||
'address-card-o': ['vcard-o','address-card-o'],
|
||||
'id-card': ['drivers-license','id-card'],
|
||||
'id-card-o': ['drivers-license-o','id-card-o'],
|
||||
'thermometer-full': ['thermometer-4','thermometer','thermometer-full'],
|
||||
'thermometer-three-quarters': ['thermometer-3','thermometer-three-quarters'],
|
||||
'thermometer-half': ['thermometer-2','thermometer-half'],
|
||||
'thermometer-quarter': ['thermometer-1','thermometer-quarter'],
|
||||
'thermometer-empty': ['thermometer-0','thermometer-empty'],
|
||||
'bath': ['bathtub','s15','bath'],
|
||||
'window-close': ['times-rectangle','window-close'],
|
||||
'window-close-o': ['times-rectangle-o','window-close-o']
|
||||
};
|
||||
|
||||
export const ICONS = [
|
||||
'glass','music','search','envelope-o','heart','star','star-o','user',
|
||||
'film','th-large','th','th-list','check','times','search-plus',
|
||||
'search-minus','power-off','signal','cog','trash-o','home','file-o',
|
||||
'clock-o','road','download','arrow-circle-o-down','arrow-circle-o-up',
|
||||
'inbox','play-circle-o','repeat','refresh','list-alt','lock','flag',
|
||||
'headphones','volume-off','volume-down','volume-up','qrcode','barcode',
|
||||
'tag','tags','book','bookmark','print','camera','font','bold','italic',
|
||||
'text-height','text-width','align-left','align-center','align-right',
|
||||
'align-justify','list','outdent','indent','video-camera','picture-o',
|
||||
'pencil','map-marker','adjust','tint','pencil-square-o','share-square-o',
|
||||
'check-square-o','arrows','step-backward','fast-backward','backward',
|
||||
'play','pause','stop','forward','fast-forward','step-forward','eject',
|
||||
'chevron-left','chevron-right','plus-circle','minus-circle','times-circle',
|
||||
'check-circle','question-circle','info-circle','crosshairs',
|
||||
'times-circle-o','check-circle-o','ban','arrow-left','arrow-right',
|
||||
'arrow-up','arrow-down','share','expand','compress','plus','minus',
|
||||
'asterisk','exclamation-circle','gift','leaf','fire','eye','eye-slash',
|
||||
'exclamation-triangle','plane','calendar','random','comment','magnet',
|
||||
'chevron-up','chevron-down','retweet','shopping-cart','folder','folder-open',
|
||||
'arrows-v','arrows-h','bar-chart','twitter-square','facebook-square',
|
||||
'camera-retro','key','cogs','comments','thumbs-o-up','thumbs-o-down',
|
||||
'star-half','heart-o','sign-out','linkedin-square','thumb-tack','external-link',
|
||||
'sign-in','trophy','github-square','upload','lemon-o','phone','square-o',
|
||||
'bookmark-o','phone-square','twitter','facebook','github','unlock',
|
||||
'credit-card','rss','hdd-o','bullhorn','bell','certificate','hand-o-right',
|
||||
'hand-o-left','hand-o-up','hand-o-down','arrow-circle-left','arrow-circle-right',
|
||||
'arrow-circle-up','arrow-circle-down','globe','wrench','tasks','filter',
|
||||
'briefcase','arrows-alt','users','link','cloud','flask','scissors','files-o',
|
||||
'paperclip','floppy-o','square','bars','list-ul','list-ol','strikethrough',
|
||||
'underline','table','magic','truck','pinterest','pinterest-square',
|
||||
'google-plus-square','google-plus','money','caret-down','caret-up',
|
||||
'caret-left','caret-right','columns','sort','sort-desc','sort-asc',
|
||||
'envelope','linkedin','undo','gavel','tachometer','comment-o','comments-o',
|
||||
'bolt','sitemap','umbrella','clipboard','lightbulb-o','exchange',
|
||||
'cloud-download','cloud-upload','user-md','stethoscope','suitcase','bell-o',
|
||||
'coffee','cutlery','file-text-o','building-o','hospital-o','ambulance',
|
||||
'medkit','fighter-jet','beer','h-square','plus-square','angle-double-left',
|
||||
'angle-double-right','angle-double-up','angle-double-down','angle-left',
|
||||
'angle-right','angle-up','angle-down','desktop','laptop','tablet','mobile',
|
||||
'circle-o','quote-left','quote-right','spinner','circle','reply','github-alt',
|
||||
'folder-o','folder-open-o','smile-o','frown-o','meh-o','gamepad','keyboard-o',
|
||||
'flag-o','flag-checkered','terminal','code','reply-all','star-half-o',
|
||||
'location-arrow','crop','code-fork','chain-broken','question','info',
|
||||
'exclamation','superscript','subscript','eraser','puzzle-piece','microphone',
|
||||
'microphone-slash','shield','calendar-o','fire-extinguisher','rocket',
|
||||
'maxcdn','chevron-circle-left','chevron-circle-right','chevron-circle-up',
|
||||
'chevron-circle-down','html5','css3','anchor','unlock-alt','bullseye',
|
||||
'ellipsis-h','ellipsis-v','rss-square','play-circle','ticket','minus-square',
|
||||
'minus-square-o','level-up','level-down','check-square','pencil-square',
|
||||
'external-link-square','share-square','compass','caret-square-o-down',
|
||||
'caret-square-o-up','caret-square-o-right','eur','gbp','usd','inr','jpy','rub',
|
||||
'krw','btc','file','file-text','sort-alpha-asc','sort-alpha-desc',
|
||||
'sort-amount-asc','sort-amount-desc','sort-numeric-asc','sort-numeric-desc',
|
||||
'thumbs-up','thumbs-down','youtube-square','youtube','xing','xing-square',
|
||||
'youtube-play','dropbox','stack-overflow','instagram','flickr','adn','bitbucket',
|
||||
'bitbucket-square','tumblr','tumblr-square','long-arrow-down','long-arrow-up',
|
||||
'long-arrow-left','long-arrow-right','apple','windows','android','linux',
|
||||
'dribbble','skype','foursquare','trello','female','male','gratipay','sun-o',
|
||||
'moon-o','archive','bug','vk','weibo','renren','pagelines','stack-exchange',
|
||||
'arrow-circle-o-right','arrow-circle-o-left','caret-square-o-left','dot-circle-o',
|
||||
'wheelchair','vimeo-square','try','plus-square-o','space-shuttle','slack',
|
||||
'envelope-square','wordpress','openid','university','graduation-cap','yahoo',
|
||||
'google','reddit','reddit-square','stumbleupon-circle','stumbleupon','delicious',
|
||||
'digg','pied-piper-pp','pied-piper-alt','drupal','joomla','language','fax',
|
||||
'building','child','paw','spoon','cube','cubes','behance','behance-square',
|
||||
'steam','steam-square','recycle','car','taxi','tree','spotify','deviantart',
|
||||
'soundcloud','database','file-pdf-o','file-word-o','file-excel-o',
|
||||
'file-powerpoint-o','file-image-o','file-archive-o','file-audio-o','file-video-o',
|
||||
'file-code-o','vine','codepen','jsfiddle','life-ring','circle-o-notch','rebel',
|
||||
'empire','git-square','git','hacker-news','tencent-weibo','qq','weixin',
|
||||
'paper-plane','paper-plane-o','history','circle-thin','header','paragraph',
|
||||
'sliders','share-alt','share-alt-square','bomb','futbol-o','tty','binoculars',
|
||||
'plug','slideshare','twitch','yelp','newspaper-o','wifi','calculator','paypal',
|
||||
'google-wallet','cc-visa','cc-mastercard','cc-discover','cc-amex','cc-paypal',
|
||||
'cc-stripe','bell-slash','bell-slash-o','trash','copyright','at','eyedropper',
|
||||
'paint-brush','birthday-cake','area-chart','pie-chart','line-chart','lastfm',
|
||||
'lastfm-square','toggle-off','toggle-on','bicycle','bus','ioxhost','angellist',
|
||||
'cc','ils','meanpath','buysellads','connectdevelop','dashcube','forumbee',
|
||||
'leanpub','sellsy','shirtsinbulk','simplybuilt','skyatlas','cart-plus',
|
||||
'cart-arrow-down','diamond','ship','user-secret','motorcycle','street-view',
|
||||
'heartbeat','venus','mars','mercury','transgender','transgender-alt','venus-double',
|
||||
'mars-double','venus-mars','mars-stroke','mars-stroke-v','mars-stroke-h','neuter',
|
||||
'genderless','facebook-official','pinterest-p','whatsapp','server','user-plus',
|
||||
'user-times','bed','viacoin','train','subway','medium','y-combinator','optin-monster',
|
||||
'opencart','expeditedssl','battery-full','battery-three-quarters','battery-half',
|
||||
'battery-quarter','battery-empty','mouse-pointer','i-cursor','object-group',
|
||||
'object-ungroup','sticky-note','sticky-note-o','cc-jcb','cc-diners-club','clone',
|
||||
'balance-scale','hourglass-o','hourglass-start','hourglass-half','hourglass-end',
|
||||
'hourglass','hand-rock-o','hand-paper-o','hand-scissors-o','hand-lizard-o',
|
||||
'hand-spock-o','hand-pointer-o','hand-peace-o','trademark','registered',
|
||||
'creative-commons','gg','gg-circle','tripadvisor','odnoklassniki',
|
||||
'odnoklassniki-square','get-pocket','wikipedia-w','safari','chrome','firefox',
|
||||
'opera','internet-explorer','television','contao','500px','amazon',
|
||||
'calendar-plus-o','calendar-minus-o','calendar-times-o','calendar-check-o',
|
||||
'industry','map-pin','map-signs','map-o','map','commenting','commenting-o',
|
||||
'houzz','vimeo','black-tie','fonticons','reddit-alien','edge','credit-card-alt',
|
||||
'codiepie','modx','fort-awesome','usb','product-hunt','mixcloud','scribd',
|
||||
'pause-circle','pause-circle-o','stop-circle','stop-circle-o','shopping-bag',
|
||||
'shopping-basket','hashtag','bluetooth','bluetooth-b','percent','gitlab',
|
||||
'wpbeginner','wpforms','envira','universal-access','wheelchair-alt',
|
||||
'question-circle-o','blind','audio-description','volume-control-phone','braille',
|
||||
'assistive-listening-systems','american-sign-language-interpreting','deaf',
|
||||
'glide','glide-g','sign-language','low-vision','viadeo','viadeo-square',
|
||||
'snapchat','snapchat-ghost','snapchat-square','pied-piper','first-order',
|
||||
'yoast','themeisle','google-plus-official','font-awesome','handshake-o',
|
||||
'envelope-open','envelope-open-o','linode','address-book','address-book-o',
|
||||
'address-card','address-card-o','user-circle','user-circle-o','user-o',
|
||||
'id-badge','id-card','id-card-o','quora','free-code-camp','telegram',
|
||||
'thermometer-full','thermometer-three-quarters','thermometer-half',
|
||||
'thermometer-quarter','thermometer-empty','shower','bath','podcast',
|
||||
'window-maximize','window-minimize','window-restore','window-close',
|
||||
'window-close-o','bandcamp','grav','etsy','imdb','ravelry','eercast',
|
||||
'microchip','snowflake-o','superpowers','wpexplorer','meetup'];
|
||||
|
||||
let loaded = false;
|
||||
|
||||
import FA_URL from 'styles/font-awesome.scss';
|
||||
|
||||
export const load = () => {
|
||||
if ( loaded )
|
||||
return;
|
||||
|
||||
document.head.appendChild(createElement('link', {
|
||||
href: FA_URL,
|
||||
rel: 'stylesheet',
|
||||
type: 'text/css',
|
||||
crossOrigin: 'anonymouse'
|
||||
}));
|
||||
}
|
||||
|
|
@ -246,6 +246,11 @@ export function pick_random(obj) {
|
|||
}
|
||||
|
||||
|
||||
export const escape_regex = RegExp.escape || function escape_regex(str) {
|
||||
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
|
||||
export class SourcedSet {
|
||||
constructor() {
|
||||
this._cache = [];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue