remove nsfw filter for now

Author: divamgupta

electron_app/src/StableDiffusion.vue

@@ -5,7 +5,7 @@
 
 import { send_to_py } from "./py_vue_bridge.js"
 import {get_tokens} from './clip_tokeniser/clip_encoder.js'
-const nsfwjs = require('nsfwjs');
+
 
 function remove_non_ascii(str) {
   
@@ -49,39 +49,48 @@ export default {
             if(msg_code == "inwk"){
                 this.is_input_avail = false;
             }
+
+            // removing the nsfw thing as it does not run in m1 build
+            // if(msg_code == "nwim"){
+            //     let impath = msg.substring(5).trim()
+
+            //     const img = new Image();
+            //     img.src = "file://" + impath;
+
+            //     img.attached_cbs = this.attached_cbs;
+
+            //     // check for nsfw content
+            //     img.onload = () => {
+            //         if (this.$parent.app_state.app_data.settings.nsfw_filter == true) {
+            //             if (img.attached_cbs) {
+            //                 if (img.attached_cbs.on_img)
+            //                     img.attached_cbs.on_img(impath);
+            //             }
+            //         }
+            //         else {
+            //             const nsfwjs = require('nsfwjs');
+            //             nsfwjs.load()
+            //                 .then(model => model.classify(img))
+            //                 .catch(() => {
+            //                     console.log("cant run nsfw")
+            //                 })
+            //                 .then(predictions => {
+            //                     if (predictions && (predictions[0].className ==  'Hentai' || predictions[0].className ==  'Porn')) {
+            //                             impath = "nsfw_" + Math.random();
+            //                     }
+            //                     if (img.attached_cbs) {
+            //                         if (img.attached_cbs.on_img)
+            //                             img.attached_cbs.on_img(impath);
+            //                     }
+            //                 });
+            //         }
+            //     }
+            // }
             if(msg_code == "nwim"){
                 let impath = msg.substring(5).trim()
-
-                const img = new Image();
-                img.src = "file://" + impath;
-
-                img.attached_cbs = this.attached_cbs;
-
-                // check for nsfw content
-                img.onload = () => {
-                    if (this.$parent.app_state.app_data.settings.nsfw_filter == true) {
-                        if (img.attached_cbs) {
-                            if (img.attached_cbs.on_img)
-                                img.attached_cbs.on_img(impath);
-                        }
-                    }
-                    else {
-                        
-                        nsfwjs.load()
-                            .then(model => model.classify(img))
-                            .catch(() => {
-                                console.log("cant run nsfw")
-                            })
-                            .then(predictions => {
-                                if (predictions && (predictions[0].className ==  'Hentai' || predictions[0].className ==  'Porn')) {
-                                        impath = "nsfw_" + Math.random();
-                                }
-                                if (img.attached_cbs) {
-                                    if (img.attached_cbs.on_img)
-                                        img.attached_cbs.on_img(impath);
-                                }
-                            });
-                    }
+                if(this.attached_cbs){
+                    if(this.attached_cbs.on_img)
+                        this.attached_cbs.on_img(impath);
                 }
             }
 

electron_app/src/background.js

@@ -26,8 +26,8 @@ protocol.registerSchemesAsPrivileged([
 ])
 
 
-import {menu_template} from "./menu_template"
-Menu.setApplicationMenu(Menu.buildFromTemplate(menu_template))
+// import {menu_template} from "./menu_template"
+// Menu.setApplicationMenu(Menu.buildFromTemplate(menu_template))
 
 start_bridge();
 

electron_app/src/components/Settings.vue

@@ -4,7 +4,7 @@
         <div  v-if="!is_custom_model_loading">
             <h1>Settings</h1>
             <br>
-            <h2>General Settings</h2>
+            <!-- <h2>General Settings</h2>
             <br>
             <div class="setting_box">
             <div class="settings_left">
@@ -19,7 +19,7 @@
             </label>
             </div>
             </div>
-            <hr>
+            <hr> -->
             <div class="l_button button_colored" style="float:right" @click="add_model"  >Add New Model</div>
             <h2>Custom Models</h2>