From 887a86e927325b6222a237a66b1da87943dae951 Mon Sep 17 00:00:00 2001
From: Shawn K <skhameneh@gmail.com>
Date: Mon, 12 Nov 2018 14:12:31 -0600
Subject: [PATCH 1/3] Update autoblockPublishMiddleware.js
---
server/middleware/autoblockPublishMiddleware.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/middleware/autoblockPublishMiddleware.js b/server/middleware/autoblockPublishMiddleware.js
index 42e9076c..503fef51 100644
--- a/server/middleware/autoblockPublishMiddleware.js
+++ b/server/middleware/autoblockPublishMiddleware.js
@@ -2,7 +2,7 @@ const fs = require('fs');
const logger = require('winston');
const { publishing: { publishingChannelWhitelist } } = require('@config/siteConfig');
-const ipBanFile = './config/ipBan.txt';
+const ipBanFile = './site/config/ipBan.txt';
const forbiddenMessage = '<h1>Forbidden</h1>If you are seeing this by mistake, please contact us using <a href="https://chat.lbry.io/">https://chat.lbry.io/</a>';
let ipCounts = {};
--
2.45.3
From 079c9ef784b57adbdc29284ff80dc990dd5530e9 Mon Sep 17 00:00:00 2001
From: Shawn K <skhameneh@gmail.com>
Date: Mon, 12 Nov 2018 14:21:07 -0600
Subject: [PATCH 2/3] Update autoblockPublishMiddleware.js
---
server/middleware/autoblockPublishMiddleware.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/middleware/autoblockPublishMiddleware.js b/server/middleware/autoblockPublishMiddleware.js
index 503fef51..4c4456fb 100644
--- a/server/middleware/autoblockPublishMiddleware.js
+++ b/server/middleware/autoblockPublishMiddleware.js
@@ -58,7 +58,7 @@ const autoblockPublishBodyMiddleware = (req, res, next) => {
let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
const { channelName } = req.body;
- if (channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) {
+ if (channelName && publishingChannelWhitelist.indexOf(channelName.toLowerCase()) !== -1) {
delete ipCounts[ip];
}
}
--
2.45.3
From aaa8feb57761287349aa46f4615bf8e53d7bac04 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 12 Nov 2018 15:45:55 -0500
Subject: [PATCH 3/3] remove unsupported file types from channel pages
---
client/src/components/AssetPreview/index.jsx | 74 +++++++++-----------
1 file changed, 35 insertions(+), 39 deletions(-)
diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx
index 6bfd5e68..4da63eb1 100644
--- a/client/src/components/AssetPreview/index.jsx
+++ b/client/src/components/AssetPreview/index.jsx
@@ -3,46 +3,42 @@ import { Link } from 'react-router-dom';
import createCanonicalLink from '../../../../utils/createCanonicalLink';
const AssetPreview = ({ defaultThumbnail, claimData }) => {
- const { name, fileExt, contentType, thumbnail, title } = claimData;
- const showUrl = createCanonicalLink({ asset: { ...claimData }});
+ const {name, fileExt, contentType, thumbnail, title} = claimData;
+ const showUrl = createCanonicalLink({asset: {...claimData}});
const embedUrl = `${showUrl}.${fileExt}`;
- return (
- <Link to={showUrl} className='asset-preview'>
- {(() => {
- switch (contentType) {
- case 'image/jpeg':
- case 'image/jpg':
- case 'image/png':
- case 'image/gif':
- return (
- <div>
- <img
- className={'asset-preview-image'}
- src={embedUrl}
- alt={name}
- />
- <h3 className='list-title'>{title}</h3>
- </div>
- );
- case 'video/mp4':
- return (
- <div>
- <img
- className={'asset-preview-video'}
- src={thumbnail || defaultThumbnail}
- alt={name}
- />
- <h3 className='list-title'>{title}</h3>
- </div>
- );
- default:
- return (
- <p>unsupported file type</p>
- );
- }
- })()}
- </Link>
- );
+ switch (contentType) {
+ case 'image/jpeg':
+ case 'image/jpg':
+ case 'image/png':
+ case 'image/gif':
+ return (
+ <Link to={showUrl} className='asset-preview'>
+ <div>
+ <img
+ className={'asset-preview-image'}
+ src={embedUrl}
+ alt={name}
+ />
+ <h3 className='list-title'>{title}</h3>
+ </div>
+ </Link>
+ );
+ case 'video/mp4':
+ return (
+ <Link to={showUrl} className='asset-preview'>
+ <div>
+ <img
+ className={'asset-preview-video'}
+ src={thumbnail || defaultThumbnail}
+ alt={name}
+ />
+ <h3 className='list-title'>{title}</h3>
+ </div>
+ </Link>
+ );
+ default:
+ return null;
+ }
};
export default AssetPreview;
--
2.45.3