Commit Graph

2062 Commits

Author SHA1 Message Date
Calvin Montgomery 6aebe82298 Merge pull request #604 from Xaekai/phoning.it.in
Prevent rendering of <iframes> and <objects> in the error message …
2016-07-25 20:24:13 -07:00
Xaekai 285dab9ed7 Prevent rendering of <iframes> and <objects> in the error message when attempting to queue them as supported host links instead of custom embeds.
I thought about just moving the parse failure message handling to queueMessage, but that quickly turned into a minefield of pain. This gets the job done for now.
2016-07-22 19:22:15 -07:00
Calvin Montgomery 71c5fe2a05 Merge pull request #603 from Xaekai/servicesocket
Add a service socket
2016-07-21 22:01:56 -07:00
Xaekai 9655d2635a Minor fixes 2016-07-21 18:17:38 -07:00
Xaekai 670cb97e79 Complete rewrite of the service socket client
Add one more command to the service commandline
2016-07-20 03:22:57 -07:00
calzoneman 6e416fea8a Add a hack to detect distrust of Let's Encrypt
Many older devices do not support the Let's Encrypt CA, for various
reasons.  This causes connection issues for sites using Let's Encrypt to
support HTTPS connections.  This commit adds a hack that can be enabled
with a switch in callbacks.js to try to detect when the user's browser
does not trust the certificate and permit the user to connect to an
insecure endpoint instead.

Unfortunately, the AJAX API does not allow to distinguish between *why*
a request fails, so the best we can do is detect that the HTTPS request
failed, try to make a request over plain HTTP, and if it works, assume
the HTTPS request failed due to a certificate error.  It's not 100%
foolproof since the HTTPS endpoint could just be down for some reason,
but it should work well enough in most cases.

Closes #602
2016-07-17 16:30:35 -07:00
Xaekai 9559035118 Add a service socket to enable out of band access to the process commandline 2016-07-16 11:05:32 -07:00
Calvin Montgomery aaa21aad05 Merge pull request #598 from Xaekai/imagestrip
Image strip option
2016-07-14 23:44:49 -07:00
Xaekai aded7b1f38 Allow users to strip images from chat. 2016-07-14 23:37:29 -07:00
Calvin Montgomery 31a392cea9 Merge pull request #599 from calzoneman/improve-cs-emotelist
Greatly improve performance of channel settings emote list
2016-07-14 23:26:30 -07:00
calzoneman 29a4834baa Add a signature to announcements
The `from` field has existed for ages, but was never actually displayed.
Displaying it to users reduces confusion about who is making the
announcement.
2016-07-14 23:25:17 -07:00
calzoneman 9e00bb133e Fix #601 2016-07-14 23:19:40 -07:00
calzoneman d01d558ed6 Fill in incomplete CSEmoteList changes 2016-07-12 23:04:07 -07:00
calzoneman ce260e0f5c Greatly improve performance of channel settings emote list
The channel settings emote list is now paginated and leverages the same
basic code as the emote browser, but with a different renderer.  Fixes
 #594 and kills an ugly function.
2016-07-11 23:55:07 -07:00
Calvin Montgomery 97cb751573 Merge pull request #597 from Xaekai/flairpersist
Make modflair setting persistent from button too.
2016-07-11 22:21:15 -07:00
Xaekai b2b034d9df Make modflair setting persistent from button too. 2016-07-11 22:14:26 -07:00
Calvin Montgomery 5e399b96cf Merge pull request #596 from Xaekai/acpnav
Move ACP nav entry to templating
2016-07-11 22:11:59 -07:00
Xaekai 5eebd88e13 Move ACP nav entry to templating
Closes #516
2016-07-10 23:23:46 -07:00
Calvin Montgomery 44cc6336b9 Merge pull request #593 from Xaekai/themesanity
Default theme reference refactor
2016-07-10 20:46:33 -07:00
calzoneman 2a2ed7ce1c Fix partitioning for channels with capital letters 2016-07-09 01:51:06 -07:00
Xaekai aa6066dfd5 Reduce the number of places the default theme is hardcoded from 6 to 1. 2016-07-08 19:01:31 -07:00
Calvin Montgomery 0de5f88eee Merge pull request #592 from Xaekai/fixcomma
Add missing comma
2016-07-08 00:10:49 -07:00
Xaekai 0bafe9f2d7 Add missing comma 2016-07-08 00:04:20 -07:00
Calvin Montgomery 2ae5af096b Merge pull request #591 from Xaekai/fuckitwelldoitlive
Add missing formatter entry for vid.me
2016-07-07 23:46:57 -07:00
Xaekai 0aa73a4b14 Add missing formatter entry for vid.me 2016-07-07 23:32:09 -07:00
Calvin Montgomery 292efd2b71 Merge pull request #589 from Xaekai/polltime
Add timestamps to polls
2016-07-07 23:30:19 -07:00
Calvin Montgomery 32bb63e06b Merge pull request #588 from Xaekai/moretags
Add some various harmless tags to the XSS whitelist
2016-07-07 23:06:46 -07:00
Xaekai c3cd84f7af Merge remote-tracking branch 'upstream/3.0' into polltime 2016-07-07 23:06:12 -07:00
Xaekai 9cb2f2f0d3 Merge branch '3.0' into polltime 2016-07-07 22:57:46 -07:00
Xaekai 5896a1c0eb Add timestamps to polls.
Closes #562
2016-07-07 22:56:06 -07:00
Xaekai 42cf772dc3 Merge branch '3.0' into moretags 2016-07-07 22:51:08 -07:00
Calvin Montgomery 7025a70034 Merge pull request #587 from Xaekai/jade2pug
Update from Jade to Pug
2016-07-07 22:33:01 -07:00
Xaekai 9f4d2c7ffb Add some various harmless tags to the XSS whitelist
sub, sup: Closes #579
cite, small: Bootstrap uses these for blockquotes
template: Will allow for cleaner channel scripts. Since it's contents are inert it will also allow channel admins to have "comments" in their banner.
2016-07-07 21:52:34 -07:00
Xaekai df5c5cd54f The Puggening: Update from Jade to Pug
1.) module dependency updated from jade 1.11.0 to pug 2.0.0-beta3
2.) All references to Jade have been changed to Pug
3.) /srv/web/jade.js is renamed to pug.js
4.) all template files renamed accordingly
5.) "mixin somename" is automatically considered a declaration, invocations must use "+somename"
6.) variable interpolation is no longer supported inside element attributes, use direct references and string concatenation instead.
7.) bumped minor version
2016-07-07 21:48:09 -07:00
calzoneman f75d40d278 Fix a bug with passwords for bot logins 2016-07-03 23:50:16 -07:00
calzoneman edb5fb6f4e Sync announcements across partitions 2016-07-03 21:28:43 -07:00
calzoneman 312892e56b Short term additional fix for #583
The previous commits do not handle all of the edge cases of #583
appropriately.  This is a short term solution that will work, but is not
as efficient as it could be.  The whole refreshAccount function needs to
be reconsidered and replaced with a more sane way of handling atomic
updates to the user's account state.
2016-06-29 22:00:25 -07:00
calzoneman c70dc83504 Fix previous fix 2016-06-26 21:15:33 -07:00
calzoneman e9fdb1a7e5 Fix login race condition (#583) 2016-06-26 16:21:15 -07:00
Calvin Montgomery 8ede986d22 Merge pull request #582 from calzoneman/vidme
Add vidme support (#568)
2016-06-26 16:20:42 -07:00
calzoneman 6f56862307 Add vidme support (#568) 2016-06-25 17:09:48 -07:00
calzoneman 056b2a48ea Add throttling of usercount frames 2016-06-18 00:32:50 -07:00
Calvin Montgomery e4decbc34f Merge pull request #580 from calzoneman/partitioning
Implement sharding of channels across multiple instances
2016-06-18 00:13:28 -07:00
calzoneman 77d84d5b76 Add redis client error listener 2016-06-13 23:09:27 -07:00
calzoneman b6bb0aa56d Add redis-based channel index 2016-06-09 23:42:30 -07:00
calzoneman 5b9948f709 Omit the connection warning if the socket connected at least once before 2016-06-08 22:58:34 -07:00
calzoneman 6e772c6837 Add partition map reload 2016-06-08 22:54:16 -07:00
calzoneman 7faf2829b2 Improve clientside socket.io connection error reporting 2016-06-07 23:00:50 -07:00
calzoneman a360cd8808 Reject joins for channels mapped to other partitions 2016-06-07 22:47:49 -07:00
calzoneman 77465e6b49 Add partitioning logic 2016-06-06 21:54:49 -07:00