Merge branch 'production'

src/canvases.json

@@ -309,7 +309,7 @@
     "desc": "Mirror of PixelCanvas"
   },
   "7": {
-    "indent": "x",
+    "ident": "w",
     "title": "1bit",
     "colors": [
       [ 0, 0, 0 ],
@@ -323,7 +323,7 @@
     "cds": 80000,
     "ranked": false,
     "req": 10000,
-    "sd": "2020-07-05",
+    "sd": "2020-11-09",
     "desc": "Black and White canvas"
   }
 }

src/core/passport.js

@@ -15,11 +15,26 @@ import { OAuth2Strategy as GoogleStrategy } from 'passport-google-oauth';
 import logger from './logger';
 import { sanitizeName } from '../utils/validation';
 
-import { User, RegUser, Channel } from '../data/models';
+import {
+  User, RegUser, Channel, UserBlock,
+} from '../data/models';
 import { auth } from './config';
 import { compareToHash } from '../utils/hash';
 import { getIPFromRequest } from '../utils/ip';
 
+const include = [{
+  model: Channel,
+  as: 'channel',
+}, {
+  model: RegUser,
+  through: UserBlock,
+  as: 'blocked',
+  foreignKey: 'uid',
+  attributes: [
+    'id',
+    'name',
+  ],
+}];
 
 passport.serializeUser((user, done) => {
   done(null, user.id);
@@ -29,10 +44,7 @@ passport.deserializeUser(async (req, id, done) => {
   const user = new User(id, getIPFromRequest(req));
   if (id) {
     RegUser.findByPk(id, {
-      include: {
+      include,
-        model: Channel,
-        as: 'channel',
-      },
     }).then((reguser) => {
       if (reguser) {
         user.setRegUser(reguser);
@@ -64,10 +76,7 @@ passport.use(new JsonStrategy({
       ? { email: nameoremail }
       : { name: nameoremail };
     RegUser.findOne({
-      include: {
+      include,
-        model: Channel,
-        as: 'channel',
-      },
       where: query,
     }).then((reguser) => {
       if (!reguser) {
@@ -96,18 +105,12 @@ async function oauthLogin(email, name, discordid = null) {
   }
   name = sanitizeName(name);
   let reguser = await RegUser.findOne({
-    include: {
+    include,
-      model: Channel,
-      as: 'channel',
-    },
     where: { email },
   });
   if (!reguser) {
     reguser = await RegUser.findOne({
-      include: {
+      include,
-        model: Channel,
-        as: 'channel',
-      },
       where: { name },
     });
     while (reguser) {
@@ -116,10 +119,7 @@ async function oauthLogin(email, name, discordid = null) {
       name = `${name.substring(0, 15)}-${Math.random().toString(36).substring(2, 10)}`;
       // eslint-disable-next-line no-await-in-loop
       reguser = await RegUser.findOne({
-        include: {
+        include,
-          model: Channel,
-          as: 'channel',
-        },
         where: { name },
       });
     }
@@ -214,18 +214,12 @@ passport.use(new RedditStrategy({
     // reddit needs an own login strategy based on its id,
     // because we can not access it's mail
     let reguser = await RegUser.findOne({
-      include: {
+      include,
-        model: Channel,
-        as: 'channel',
-      },
       where: { redditid },
     });
     if (!reguser) {
       reguser = await RegUser.findOne({
-        include: {
+        include,
-          model: Channel,
-          as: 'channel',
-        },
         where: { name },
       });
       while (reguser) {
@@ -234,10 +228,7 @@ passport.use(new RedditStrategy({
         name = `${name.substring(0, 15)}-${Math.random().toString(36).substring(2, 10)}`;
         // eslint-disable-next-line no-await-in-loop
         reguser = await RegUser.findOne({
-          include: {
+          include,
-            model: Channel,
-            as: 'channel',
-          },
           where: { name },
         });
       }

src/data/models/UserBlock.js

@@ -0,0 +1,17 @@
+/*
+ *
+ * Junction table for User -> Blocked User
+ * Relations defined in ./index.js
+ *
+ * @flow
+ *
+ */
+
+import Model from '../sequelize';
+
+const UserBlock = Model.define('UserBlock', {
+}, {
+  timestamps: false,
+});
+
+export default UserBlock;

src/data/models/index.js

@@ -8,7 +8,11 @@ import RegUser from './RegUser';
 import Channel from './Channel';
 import UserChannel from './UserChannel';
 import Message from './Message';
+import UserBlock from './UserBlock';
 
+/*
+ * User Channel access
+ */
 RegUser.belongsToMany(Channel, {
   as: 'channel',
   through: UserChannel,
@@ -18,11 +22,32 @@ Channel.belongsToMany(RegUser, {
   through: UserChannel,
 });
 
+/*
+ * User blocks of other user
+ */
+RegUser.belongsToMany(RegUser, {
+  as: 'blocked',
+  through: UserBlock,
+  foreignKey: 'uid',
+});
+RegUser.belongsToMany(RegUser, {
+  as: 'blockedBy',
+  through: UserBlock,
+  foreignKey: 'buid',
+});
+
 function sync(...args) {
   return sequelize.sync(...args);
 }
 
 export default { sync };
 export {
-  Whitelist, Blacklist, User, RegUser, Channel, UserChannel, Message,
+  Whitelist,
+  Blacklist,
+  User,
+  RegUser,
+  Channel,
+  UserChannel,
+  Message,
+  UserBlock,
 };