small fixes for server

client/src/components/Home.vue

@@ -82,6 +82,8 @@ export default {
           //get content if the container is not empty
           if (this.container.length > 0) {
             this.getContent();
+          } else {
+            this.hasLoaded = true;
           }
         });
     },

server/controllers/crawl.js

@@ -5,7 +5,7 @@ import Article from "../models/article.js";
 import autodiscover from "../util/autodiscover.js";
 import parseFeed from "../util/parser.js";
 import language from "../util/language.js";
-import cheerio from "cheerio";
+import { load } from 'cheerio'
 import * as htmlparser2 from "htmlparser2";
 import cache from '../util/cache.js';
 import striptags from "striptags";
@@ -119,7 +119,7 @@ const processArticle = async (feed, post) => {
 
         //htmlparser2 has error-correcting mechanisms, which may be useful when parsing non-HTML content.
         const dom = htmlparser2.parseDocument(post.description);
-        const $ = cheerio.load(dom, { _useHtmlParser2: true });
+        const $ = load(dom, { _useHtmlParser2: true });
 
         //dismiss undefined errors
         if (typeof $ !== 'undefined') {

server/controllers/manager.js

@@ -415,16 +415,17 @@ export const feedChangeCategory = async (req, res, next) => {
   const feedId = req.body.feedId;
   const categoryId = req.body.categoryId;
 
-  if (feedId === undefined || feedId === categoryId) {
+  if (feedId === undefined || categoryId === undefined) {
     return res.status(404).json({
       message: "feedId or categoryId is not set"
     });
   }
 
   try {
     const feed = await Feed.findByPk(feedId);
+    const category = await Category.findByPk(categoryId);
 
-    if (feed) {
+    if (feed && category) {
       feed
         .update({
           categoryId: req.body.categoryId