Merge changes in from Panama Red: Hotfix 4

src/schemas/user/userSchema.js

@@ -360,7 +360,7 @@ userSchema.statics.findProfile = async function(user, includeEmail = false){
             date: statModel.firstLaunch,
             tokes: tokeModel.tokeMap,
             tokeCount: tokeModel.count, 
-            img: "/nonfree/johnny.png",
+            img: "/nonfree/img/emotes/tokebot.jpg",
             signature: "!TOKE",
             bio: "!TOKE OR DIE!"
         };

src/utils/linkUtils.js

@@ -35,15 +35,6 @@ module.exports.cache = new Map();
 module.exports.markLink = async function(dirtyLink){
     const link = sanitizeUrl(dirtyLink);
 
-    //If this link is referencing this web server
-    if(link.match(new RegExp(`^${config.protocol}://${config.domain}`)) != null){
-	//Lazily return it as a good link, since we know it'll at least return a good 404 page XP
-        return {
-            link,
-            type: "link"
-        }
-    }
-
     //Check link cache for the requested link
     const cachedLink = module.exports.cache.get(link);
 

www/nonfree

@@ -1 +1 @@
-Subproject commit 8f3f78be454a156aa7b6a9a811cd656cf4bd80b2
+Subproject commit 9d978b45e11e9ab8dd03dd24d3876d8c33eb480c