Merge branch 'develop' of github.com:steemit/steemit.com into develop

app/utils/StateFunctions.js

@@ -52,6 +52,12 @@ export function contentStats(content) {
     let hasFlag = false
     content.get('active_votes').forEach(v => {
         const rshares = String(v.get('rshares'))
+        const voterRepLog10 = repLog10(v.get('reputation'))
+        if(voterRepLog10) {
+            // Don't allow low rep users to gray out everyone's posts.
+            if(voterRepLog10 < 25)
+                return
+        }
         const neg = rshares.substring(0, 1) === '-'
         if(neg) hasFlag = true
         // Prevent tiny downvotes (less than 9 digits) from hiding content

scripts/send_waiting_list_invites.js

+import models from '../db/models';
+import sendEmail from '../server/sendEmail';
+
+models.User.findAll({
+    attributes: ['id', 'email'],
+    where: {waiting_list: true,  email: {$ne: null}},
+    order: 'id DESC',
+    limit: 2
+}).then(users => {
+    for(let u of users) {
+        const email = u.email.toLowerCase();
+        const m = email.match(/\.(\w+)$/);
+        if (!m || m[1] === 'ru') continue;
+        const confirmation_code = Math.random().toString(36).slice(2);
+        const i_attrs = {
+            provider: 'email',
+            user_id: u.id,
+            email,
+            verified: false,
+            confirmation_code
+        };
+        models.Identity.create(i_attrs).then(() => {
+            sendEmail('waiting_list_invite', email, {confirmation_code});
+        });
+    }
+});

server/server_pages/enter_confirm_email.jsx

@@ -54,7 +54,7 @@ function *confirmEmailHandler() {
     }
     if (!eid.verified) {
         yield eid.update({verified: true});
-        yield models.User.update({email: eid.email}, {where: {id: eid.user_id}});
+        yield models.User.update({email: eid.email, waiting_list: false}, {where: {id: eid.user_id}});
     }
     this.redirect('/create_account');
 }