Merge branch 'master' of github.com:mayeaux/nodetube

* 'master' of github.com:mayeaux/nodetube:
  bugfix
  eslint fix and remove logs
  channel page working
  seems to be working
  fixing channel page
  update upload functionality

Author: mayeaux

controllers/backend/uploading.js

@@ -108,11 +108,16 @@ exports.getUploadProgress = async(req, res) => {
 };
 
 function areUploadsOff(uploadsOn, isNotTrustedUser, res){
+
+  // allows users to
   if(uploadsOn == 'false' && isNotTrustedUser){
     console.log('HERE');
     res.status(500);
-    return res.send({ message: 'UPLOADS_OFF'});
+    res.send({ message: 'UPLOADS_OFF'});
+    return false;
   }
+
+  return true;
 }
 
 function testIfUserRestricted(user, logObject, res){
@@ -122,8 +127,11 @@ function testIfUserRestricted(user, logObject, res){
     uploadLogger.info('User upload status restricted', logObject);
 
     res.status(403);
-    return res.send('Sorry your account is restricted');
+    res.send('Sorry your account is restricted');
+    return true;
   }
+
+  return false;
 }
 
 function aboutToProcess(res, channelUrl, uniqueTag){
@@ -164,8 +172,11 @@ async function checkIfAlreadyUploaded(user, title, logObject, res){
   if(alreadyUploaded){
     uploadLogger.info('Upload title already uploaded', logObject);
     res.status(500);
-    return res.send({message: 'ALREADY-UPLOADED'});
+    res.send({message: 'ALREADY-UPLOADED'});
+    return true;
   }
+
+  return false;
 }
 
 /** RESPOND EARLY IF ITS AN UNKNOWN FILE TYPE **/
@@ -217,13 +228,15 @@ exports.postFileUpload = async(req, res) => {
 
     const isNotTrustedUser = !req.user.privs.autoVisibleUpload;
 
-    // TODO: have to fix these, should end function execution early (see unknown file type below)
-    areUploadsOff(uploadsOn, isNotTrustedUser, logObject, res);
+    const uploadsAreOff = areUploadsOff(uploadsOn, isNotTrustedUser, logObject, res);
+    if(uploadsAreOff){ return; }
 
     // ends the response early if user is restricted
-    testIfUserRestricted(user, logObject, res);
+    const userIsRestricted = testIfUserRestricted(user, logObject, res);
+    if(userIsRestricted){ return; }
 
-    checkIfAlreadyUploaded(user, title, logObject, res);
+    const uploadAlreadyUploaded = checkIfAlreadyUploaded(user, title, logObject, res);
+    if(uploadAlreadyUploaded){ return; }
 
     // let upload = setUpload()
 
@@ -274,7 +287,7 @@ exports.postFileUpload = async(req, res) => {
       // TODO: not a great design but I don't know a better approach
       // user this after upload object is made because it saves it to db
       const isUnknown = await testIsFileTypeUnknown(upload, fileType, fileExtension, logObject, res);
-      if(isUnknown)return;
+      if(isUnknown){ return; }
 
       // where is this used?
       let uploadPath = `./upload/${identifier}`;

controllers/frontend/account.js

@@ -15,6 +15,10 @@ const Subscription = require('../../models/index').Subscription;
 
 const { uploadServer, uploadUrl } = require('../../lib/helpers/settings');
 
+const { filterUploadsByMediaType } = require('../../lib/mediaBrowsing/helpers');
+
+const { URLSearchParams } = require('url');
+
 const brandName = process.env.INSTANCE_BRAND_NAME;
 
 const thumbnailServer = process.env.THUMBNAIL_SERVER || '';
@@ -123,7 +127,7 @@ exports.subscriptions = async(req, res) => {
   }
 };
 
-// TODO: find a new home, wrong controller
+// TODO: desperately needs a cleanup
 /**
  * GET /channel
  * Profile page.
@@ -136,6 +140,12 @@ exports.getChannel = async(req, res) => {
 
   const channelUrl = req.params.channel;
 
+  let media = req.query.mediaType;
+  if(!media){
+    media = 'all';
+  }
+  const mediaType = media;
+
   const limit = 51;
   const skipAmount = (page * limit) - limit;
 
@@ -208,6 +218,8 @@ exports.getChannel = async(req, res) => {
     /** DB CALL TO GET UPLOADS **/
     let uploads = await Upload.find(searchQuery).populate('').sort({ createdAt : -1 });
 
+    uploads = filterUploadsByMediaType(uploads, mediaType);
+
     // console.log(`IS ADMIN OR MOD: ${viewerIsAdminOrMod}`);
     // console.log(`IS OWNER: ${viewerIsOwner}`);
 
@@ -253,6 +265,8 @@ exports.getChannel = async(req, res) => {
       orderBy = req.query.orderBy;
     }
 
+    // console.log(`orderBy : ${orderBy}`)
+
     if(orderBy !== 'popular' && orderBy !== 'newToOld' && orderBy !== 'oldToNew' && orderBy !== 'alphabetical'){
       console.log('doesnt connect');
       orderBy = 'newToOld';
@@ -316,23 +330,23 @@ exports.getChannel = async(req, res) => {
 
     if(orderBy == 'newToOld'){
 
-      console.log('new to old');
+      // console.log('new to old');
       uploads = uploads.sort(function(a, b){
         return b.createdAt - a.createdAt;
       });
     }
 
     if(orderBy == 'oldToNew'){
 
-      console.log('old to new');
+      // console.log('old to new');
       uploads = uploads.sort(function(a, b){
         return a.createdAt - b.createdAt;
       });
     }
 
     if(orderBy == 'alphabetical'){
 
-      console.log('alphabetical');
+      // console.log('alphabetical');
 
       uploads = uploads.sort(function(a, b){
         return a.title.localeCompare(b.title);
@@ -396,7 +410,10 @@ exports.getChannel = async(req, res) => {
       userUploadAmount,
       channelUrl: user.channelUrl,
       categories,
-      joinedTimeAgo
+      joinedTimeAgo,
+      media,
+      page,
+      orderBy
     });
 
   } catch(err){

views/account/channel.pug

@@ -124,23 +124,42 @@ block content
     hr
 
     div.center-block.text-center
+
         div.dropdown(style="display:inline;margin-right:15px;")
-            button.btn.btn-primary.dropdown-toggle(type='button', data-toggle='dropdown' style="border-radius:5px")
+            button.fw.btn.btn-primary.dropdown-toggle(type='button', data-toggle='dropdown' style="border-radius:5px")
                 | Order By: #{orderByEnglishString} &nbsp
                 span.caret
 
             ul.dropdown-menu.dropdown
                 li
-                    a(href=`/user/${channel.channelUrl}?orderBy=popular`) Popular
+                    a(href=`/user/${channel.channelUrl}?orderBy=popular&mediaType=${media}&page=${page}`) Popular
                 li
-                    a(href=`/user/${channel.channelUrl}?orderBy=newToOld`) New To Old
+                    a(href=`/user/${channel.channelUrl}?orderBy=newToOld&mediaType=${media}&page=${page}`) New To Old
                 li
-                    a(href=`/user/${channel.channelUrl}?orderBy=oldToNew`) Old To New
+                    a(href=`/user/${channel.channelUrl}?orderBy=oldToNew&mediaType=${media}&page=${page}`) Old To New
                 li
-                    a(href=`/user/${channel.channelUrl}?orderBy=alphabetical`) Alphabetical
+                    a(href=`/user/${channel.channelUrl}?orderBy=alphabetical&mediaType=${media}&page=${page}`) Alphabetical
+
+        div.search-upload-buttons-container.dropdown(style="display:inline;padding-right:15px;")
+            button#dropdownMenu1.fw.btn.btn-primary.dropdown-toggle(type='button', data-toggle='dropdown' style="border-radius:5px;")
+                | File Type: #{media.charAt(0).toUpperCase() + media.slice(1)} &nbsp
+                span.caret
+
+            ul.dropdown-menu(role='menu', aria-labelledby='dropdownMenu1')
+                li(role='presentation')
+                    a(href=`/user/${channelUrl}/?mediaType=all&orderBy=${orderBy}&page=${page}`) All
+                li(role='presentation')
+                    a(href=`/user/${channelUrl}/?mediaType=video&orderBy=${orderBy}&page=${page}`) Videos
+                li(role='presentation')
+                    a(href=`/user/${channelUrl}/?mediaType=audio&orderBy=${orderBy}&page=${page}`) Audio
+                li(role='presentation')
+                    a(href=`/user/${channelUrl}/?mediaType=image&orderBy=${orderBy}&page=${page}`) Images
 
         include ../viewPartials/sensitivityFilterDropdown
 
+
+
+
         include ../viewPartials/channelOverviewPagination
 
     br