Merge branch 'fix-27' into dev

src/app/help/en/faq.md

@@ -240,7 +240,7 @@ You can earn digital tokens on Smoke by:
 
 **Voting and curating** - If you discover a post and upvote it before it becomes popular, you can earn a curation reward. The reward amount will depend on the amount of SMOKE Power you have.
 
-**Purchasing** - Users can purchase SMOKE or Smoke Dollar tokens directly through the Smoke wallet using bitcoin, Ether, or BitShares tokens. They are also available from other markets and exchanges including BlockTrades, Poloniex, Bittrex, Shapeshift.io, and Changelly. SMOKE tokens that are powered up to SMOKE Power earn a small amount of interest for holding.
+**Purchasing** - Users can purchase SMOKE or Smoke Dollar tokens directly through the Smoke wallet using bitcoin, Ether, or BitShares tokens. They are also available from other markets and exchanges including Bitshares and RuDEX. SMOKE tokens that are powered up to SMOKE Power earn a small amount of interest for holding.
 
 <a href="/faq.html#Table_of_Contents_General">^</a>
 <a class="anchor" name="Where_do_the_tokens_come_from"></a>
@@ -752,18 +752,8 @@ The price of SMOKE is based on the supply and demand of the token, determined by
 
 With SMOKE tokens in your wallet, click "Power Up" to turn them into SMOKE Power.
 
-If you don’t already have SMOKE in your wallet, you can purchase them using bitcoin (BTC), ether (ETH), or BitShares (BTS) tokens. You may purchase BTC on various exchanges, such as Coinbase.com or Localbitcoins.com. 
+If you don’t already have SMOKE in your wallet, you can purchase them using bitcoin (BTC), ether (ETH), or BitShares (BTS) tokens. You may purchase BTC on exchanges such as Bitshares or RuDEX. 
 
-To buy:
-- Click "Buy Smoke" from the main menu in the top right corner of Smoke.io, or from your wallet.
-- Select the currency to deposit, and enter the amount of that currency you wish to use.
-- Enter your Smoke account name (without the @) for "Your receive address".
-- Click the "Get Deposit Address" button.
-- Send the currency to the provided address.
-
-SMOKE purchases made via Smoke.io are facilitated by <a href="https://blocktrades.us">BlockTrades</a>.
-
-bitcoin can also be exchanged for SMOKE on external markets such as <a href="https://poloniex.com">Poloniex</a>, <a href="https://bittrex.com">Bittrex</a>, <a href="https://shapeshift.io">ShapeShift.io</a>, and <a href="https://changelly.com">Changelly</a>.
 
 <a href="/faq.html#Table_of_Contents_Economics">^</a>
 <a class="anchor" name="How_long_does_it_take_SMOKE_or_SMOKE_Power_that_I_purchased_to_show_up_in_my_account"></a>
@@ -1339,11 +1329,11 @@ https://twitter.com/steemit
 <a class="anchor" name="What_is_the_Smoke_Whitepaper_and_what_is_its_purpose"></a>
 ## What is the Smoke Whitepaper and what is its purpose?
 
-The Smoke Whitepaper was written to describe the mechanics of the token system that makes decentralized content incentives and distribution possible in a way that can improve web technologies across the board. It is also applicable to Smoke, the first website to plug into the Smoke blockchain. Users who have read the Smoke Whitepaper will better understand how their interactions with Smoke are interactions with Smoke, the decentralized network.
+The Smoke Whitepaper was written to describe the mechanics of the token system that makes decentralized content incentives and distribution possible in a way that can improve web technologies across the board. It is also applicable to smoke.io, the first website to plug into the Smoke blockchain. Users who have read the Smoke Whitepaper will better understand how their interactions with smoke.io are interactions with Smoke blockchain, the decentralized network.
 
 It is worth noting that the Whitepaper hasn’t been updated almost since Smoke came into existence. Many changes have been made since then, so much of the Whitepaper is now out of date. It is in the process of being rewritten.
 
-https://steem.io/SmokeWhitePaper.pdf
+https://smoke.network/Smoke-Whitepaper-2.0.pdf
 
 <a href="/faq.html#Table_of_Contents_Miscellaneous">^</a>
 <a class="anchor" name="Where_can_I_ask_for_help_if_my_question_was_not_answered_here"></a>
@@ -1360,7 +1350,7 @@ You can also create a post on Smoke.io with the tag #help, and someone in the co
 <a class="anchor" name="Third_Party_References_and_User_Links"></a>
 ## Third Party References and User Links
 
-BlockTrades, Poloniex, Bittrex, Changelly, Shapeshift.io, Coinbase, Localbitcoins, SmokeDB, PeerHub, Smoke.chat, SmokeTools, AnonSmoke, SmokeConnect, Streemian, SmokeStats, Pixabay, Smokecleaners, Pexels, Postimage, Markdown Cheatsheet, @cheetah, Bitcointalk, bitcoinfees, blockchain.info, and steemd are third party applications/services, and are not owned or maintained by Smoke, Inc. Their listing here, as well as any other third party applications or websites that are listed, does not constitute and endorsement or recommendation on behalf of Smoke, Inc.
+Bitshares, RuDEX.. are third party applications/services, and are not owned or maintained by Smoke, Inc. Their listing here, as well as any other third party applications or websites that are listed, does not constitute and endorsement or recommendation on behalf of Smoke, Inc.
 
 All links to user posts were created by our users and do not necessarily represent the views of Smoke, Inc. or its management. Their listing here does not constitute and endorsement or recommendation on behalf of Smoke, Inc.
 

src/app/utils/BadActorList.js

@@ -1,101 +1,4 @@
 const list = `
-polonox
-poloneix
-biitrex
-biittrex
-bitter
-bitterx
-bittex
-bittrax
-bittre
-bittrec
-bittres
-bittrex.com
-bittrexe
-bittrexx
-bittrez
-bittrix
-bittrx
-bitttrex
-bitrex
-bitrexx
-bitrix
-bitrrex
-bttrex
-btrex
-bttrex
-ittrex
-bittrex-deposit
-poloiex
-poloinex
-polomiex
-polon
-poloneex
-poloneix
-polonex
-poloni
-poloniax
-polonie
-poloniec
-poloniee
-polonieex
-poloniek
-polonieks
-polonies
-poloniet
-poloniets
-poloniex.com
-poloniexcold
-poloniexe
-poloniexs
-poloniext
-poloniexx
-poloniey
-poloniez
-poloniiex
-poloniix
-poloniks
-poloniox
-polonium
-polonix
-polonniex
-polooniex
-pooniex
-poooniex
-plolniex
-ploniex
-plooniex
-poloex
-oloniex
-pooloniex
-poliniex
-polniex
-poleniex
-polionex
-pollniex
-polloniex
-polnoiex
-polonyex
-polonied
-polonixe
-blocktardes
-blocktrade
-bocktrades
-changelly.com
-changely
-shapeshif
-shapeshift
-randomwhale
-randowale
-coinpayments
-minnowboost
-minnowboster
-minowbooster
-blocktades
-bloocktrades
-bloctrades
-blocktradess
-blocktrade
 `.trim().split('\n');
 
 export default list;

src/app/utils/DMCAList.js

@@ -1,47 +1,2 @@
 export default `
-/children/@carlidos/why-it-s-important-to-teach-your-child-gratitude
-/curation/@carlidos/lead-by-better-borrowing-3-content-curation-tips-100-of-steem-dollars-will-be-donated-to-curie
-/compliment/@carlidos/you-get-complimented-on-and-you-cower-down-why
-/motivation/@carlidos/the-power-that-moves-the-world
-/project-positivity/@carlidos/the-wonder-of-mother-earth-project-positivity
-/children/@carlidos/impossible-to-get-anything-done-with-a-preschooler-at-home
-/steemit/@carlidos/internet-censorship-and-surveillance
-/life/@carlidos/how-your-child-develops-emotionally-through-play-focuses-on-my-son
-/kyoto/@carlidos/two-days-in-kyoto-japan
-/psych101/@psych101/psych-101-moving-through-and-recovering-from-social-anxiety
-/crowdfunding/@carlidos/the-basics-of-crowdfunding
-/psychology/@carlidos/psych-101-classic-schools-of-thoughts-in-psychology
-/psychology/@carlidos/the-makings-of-schizophrenia-part-1
-/psychology/@carlidos/psych-101-beginner-operant-condition
-/luciddreaming/@carlidos/6wisjx-how-to-interpret-your-own-dreams
-/life/@carlidos/regain-control-of-your-time-and-finally-get-things-done
-/psych101/@psych101/psych-101-show-your-appreciation-to-those-close-to-you-while-you-still-can
-/life/@carlidos/psych-101-the-temptation-to-project-in-cyberspace-psych-101-the-trap-of-projection-in-cyberspace
-/life/@carlidos/psych-101-support-groups-and-the-risks-of-imitation
-/life/@carlidos/the-pitfalls-of-dating-with-a-big-age-difference-psychology
-/life/@carlidos/psych-101-how-to-induce-a-lucid-dream-psych-101-the-memory-palace
-/psychology/@carlidos/psych-101-beginner-classical-conditioning-psych-101-intermediate-classical-conditioning
-/sex/@carlidos/honoring-your-sexual-needs-and-boundaries-within-a-relationship
-/life/@carlidos/the-power-of-trusting-yourself
-/psych/@carlidos/psych-101-how-psychology-shapes-our-world
-/love/@carlidos/is-love-without-attachment-possible
-/food/@outchemy/5-top-countries-you-need-to-visit-if-you-are-a-chocolate-addict
-/travel/@outchemy/broken-relationships-the-museum-of-zagreb-that-celebrates-heartache
-/travel/@outchemy/get-rid-of-the-toxins-see-these-amazing-detox-vacations
-/photography/@maxmalini/the-dark-hedges
-/creation/@andysyuhada/toys-creation-own-photography
-/photography/@andysyuhada/animals-photography
-/photography/@andysyuhada/flies-and-locusts-aceh
-/photography/@andysyuhada/how-to-make-toys-photography
-/photography/@andysyuhada/life-photography-toys
-/photography/@andysyuhada/photographing-birds-in-a-tree-relaxing
-/photography/@andysyuhada/toys-photography-life-toys
-/photography/@andysyuhada/toys-photography-very-funny-was-dancing-and-singing
-/photography/@andysyuhada/tutorial-photography-pengujian-kamera
-/photography/@elvinanurhaliza/butterfly-photography
-/photography/@elvinanurhaliza/finepix-s4800-reptiles-etc
-/photography/@elvinanurhaliza/photography-flowers-finepix-s4800
-/photography/@elvinanurhaliza/photohraphy-dewy-flowers
-/photography/@elvinanurhaliza/spider-finepix-s4800-reptiles-etc
-/entertainment/@seanfrederic/feature-film-loco-i-m-a-producer-on-starts-filming-soon
 `.trim().split('\n');

src/app/utils/DMCAUserList.js

@@ -1,8 +1,4 @@
 const list = `
-spaces
-the-gaming-llama
-cmgsteems
-iamgod
 `.trim().split('\n');
 
 export default list;

src/app/utils/ExtractMeta.js

@@ -14,7 +14,7 @@ function addSiteMeta(metas) {
     metas.push({property: 'og:image', content: 'https://smoke.io/images/smoke.png'});
     metas.push({property: 'fb:app_id', content: $STM_Config.fb_app});
     metas.push({name: 'twitter:card', content: 'summary'});
-    metas.push({name: 'twitter:site', content: '@steemit'});
+    metas.push({name: 'twitter:site', content: '@smoke_io'});
     metas.push({name: 'twitter:title', content: '#Smoke'});
     metas.push({name: 'twitter:description', site_desc: siteDescription});
     metas.push({name: 'twitter:image', content: 'https://smoke.io/images/smoke.png'});
@@ -53,7 +53,7 @@ export default function extractMeta(chain_data, rp) {
 
             // Twitter card data
             metas.push({name: 'twitter:card', content: image ? 'summary_large_image' : 'summary'});
-            metas.push({name: 'twitter:site', content: '@steemit'});
+            metas.push({name: 'twitter:site', content: '@smoke_io'});
             metas.push({name: 'twitter:title', content: title});
             metas.push({name: 'twitter:description', content: desc});
             metas.push({name: 'twitter:image', content: image || 'https://smoke.io/images/steemit-twshare-2.png'});
@@ -64,7 +64,7 @@ export default function extractMeta(chain_data, rp) {
         const account = chain_data.accounts[rp.accountname];
         let {name, about, profile_image} = normalizeProfile(account);
         if (name == null) name = account.name;
-        if (about == null) about = "Join thousands on steemit who share, post and earn rewards.";
+        if (about == null) about = "Join thousands on smoke.io who share, post and earn rewards.";
         if (profile_image == null) profile_image = 'https://smoke.io/images/steemit-twshare-2.png';
         // Set profile tags
         const title = `@${account.name}`;
@@ -76,7 +76,7 @@ export default function extractMeta(chain_data, rp) {
 
         // Twitter card data
         metas.push({name: 'twitter:card', content: 'summary'});
-        metas.push({name: 'twitter:site', content: '@steemit'});
+        metas.push({name: 'twitter:site', content: '@smoke_io'});
         metas.push({name: 'twitter:title', content: title});
         metas.push({name: 'twitter:description', content: desc});
         metas.push({name: 'twitter:image', content: image});

src/app/utils/ImageUserBlockList.js

@@ -1,5 +1,4 @@
 const list = `
-iamgod
 `.trim().split('\n');
 
 export default list;

src/app/utils/ProxifyUrl.js

@@ -9,7 +9,7 @@
  * @type {RegExp}
  */
 const rProxyDomain = /^http(s)?:\/\/steemit(dev|stage)?images.com\//g;
-const rProxyDomainsDimensions = /http(s)?:\/\/steemit(dev|stage)?images.com\/([0-9]+x[0-9]+)\//g;
+const rProxyDomainsDimensions = /http(s)?:\/\/smoke.io\/smokeimageproxy\/([0-9]+x[0-9]+)\//g;
 const NATURAL_SIZE = '0x0/';
 
 export const imageProxy = () => $STM_Config.img_proxy_prefix;

src/app/utils/SanitizeConfig.js

@@ -108,7 +108,7 @@ export default ({large = true, highQualityPost = true, noImage = false, sanitize
             if(!href) href = '#'
             href = href.trim()
             const attys = {href}
-            // If it's not a (relative or absolute) steemit URL...
+            // If it's not a (relative or absolute) smoke.io URL...
             if (!href.match(/^(\/(?!\/)|https:\/\/smoke.io)/)) {
                 // attys.target = '_blank' // pending iframe impl https://mathiasbynens.github.io/rel-noopener/
                 attys.rel = highQualityPost ? 'noopener' : 'nofollow noopener'

src/app/utils/VerifiedExchangeList.js

@@ -1,6 +1,4 @@
 const list = `
-poloniex
-bittrex
 `.trim().split('\n');
 
 export default list;

src/app/utils/userIllegalContent.js

@@ -1,5 +1,4 @@
 const list = `
-aplomb
 `.trim().split('\n');
 
 export default list;

src/server/server.js

@@ -174,7 +174,7 @@ app.use(
     mount('/robots.txt', function* () {
         this.set('Cache-Control', 'public, max-age=86400000');
         this.type = 'text/plain';
-        this.body = 'User-agent: *\nAllow: /';
+        this.body = 'User-agent: *\nAllow: /\nDisallow: /@smoke/*';
     })
 );