njum fix

resources/views/layout2/categories.blade.php

@@ -1,7 +1,7 @@
 @extends('profilelayout')
 @section('novidcontent')
     <div class="page-header">
-        <h4>Categories</h4>
+        <h3>Categories</h3>
     </div>
     <div class="" id="categories">
         @foreach($categories as $category)

resources/views/layout2/irc.blade.php

@@ -1,12 +1,25 @@
 @extends('profilelayout')
 @section('novidcontent')
 <div class="page-header">
-        <h3>IRC</h3>
-        <p>Don't forget to enable Dark Mode!</p>
+        <h3>IRC/[matrix]</h3>
 </div>
-<div class="box">
+<div class="irc-matrix-info">
+	<h5>IRC</h5>
+<h6>irc.n0xy.net +6697 (ssl only) #w0bm</h6>
+<p><a href="https://webirc.n0xy.net/?join=%23w0bm" target="about_blank">webirc.n0xy.net</a></p>
+<p>More information: <a href="https://n0xy.net">n0xy.net</a></p>
+<h5>[matrix]</h5>
+<h6>#w0bm on the [matrix] network</h6>
+<p><a href="https://matrix.to/#/#!w0bm:f0ck.it?via=f0ck.it&via=matrix.org&via=f0.gg">#!w0bm:f0ck.it</a></p>
+<p>Alternatively you can use the Element web client hosted at <a href="https://element.f0ck.it">f0ck.it</a> to connect to our channel, it has some modifications to make chatting more comfy: <br><small>Note: Registrations are disabled, you can still use this client with every homeserver you have an account on!</small></p>
+<ul>
+    <li>w0bm.com Stylesheet</li>
+    <li>Greentexting</li>
+</ul>
+<a href="https://spyware.neocities.org/articles/discord.html" target="_blank"><img src="/images/shitcord.gif" alt="discord-no-way"></a><br><a href="/matrix">Additional Redpill</a>
+</div>
+{{--<div class="box">
 <iframe src="https://webirc.n0xy.net?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe>
-</div>
-
+</div>--}}
 @endsection
 

resources/views/layout2/layout.blade.php

@@ -19,7 +19,7 @@
     	@include('partials.report')
         @include('partials.filterselect')
     @endif
-<canvas id="bg" class="hidden-xs slideDownReturn"></canvas>
+<canvas id="bg" class=""></canvas>
 <div class="container-fluid row p-0" id="wrapper">
     <div class="col-sm scrollable hidden-xs p-0"></div>
         <div class="container p-0">
@@ -40,13 +40,13 @@
     <div class="col-sm scrollable hidden-xs p-0"></div>
 </div>
 </body>
-<script type="text/javascript" defer src="/njum/js/jquery.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/jquery.timeago.js"></script>
-<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
+<script type="text/javascript" src="/njum/js/jquery.min.js"></script>
+<script type="text/javascript" src="/njum/js/jquery.timeago.js"></script>
+<script type="text/javascript" src="/njum/js/popper.min.js"></script>
+<script type="text/javascript" src="/njum/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="/njum/js/bootstrap-tagsinput.min.js"></script>
 <script type="text/javascript" src="/js/clipboard.min.js"></script>
-<script type="text/javascript" defer src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
+<script type="text/javascript" src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
     <script src="/njum/js/sticky_video.js"></script>
     <script>
       // Initialize

resources/views/layout2/partials/commentform.blade.php

@@ -1,16 +1,40 @@
 <div id="sticky">
-<div id="commentForm">
-<form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
-    {!! csrf_field() !!}
-    <div class="comment-panel panel-default">
-        <div class="comment-panel panel-body">
-            {!! Form::textarea('comment', null, ['placeholder' => 'Write something...', 'id' => 'cinput', 'class' => 'form-control text-light comment-entry-textarea', 'required' => 'required']) !!}
-        </div>
-        <div class="commentButton">
-                <div id="comment_tools" class="commentform-panel-footer"><button type="submit" class="btn btn-dark btn-sm">Post</button>
-        </div>
+    <div id="commentForm">
+        <form action="{{action('CommentController@store', ['id' => $video->id])}}" method="post">
+            {!! csrf_field() !!}
+                <div class="comment-panel panel-default">
+                    <div class="comment-panel panel-body">
+                        {!! Form::textarea('comment', null, ['placeholder' => 'Write something...', 'id' => 'cinput', 'class' => 'form-control text-light comment-entry-textarea', 'required' => 'required']) !!}
+                    </div>
+                    
+                    <div class="commentButton">
+                        <div id="comment_tools" class="commentform-panel-footer">
+                            <div class="commentToolsWrapper">
+                                <button type="submit" class="btn btn-dark btn-sm" onclick="commentBotScroll()">Post</button>
+                                <span class="emojiCollapser btn btn-dark btn-sm" data-toggle="collapse" href="#collapseEmojis" role="button" aria-expanded="false" aria-controls="collapseEmojis">🦦 Emoji Picker</span>
+                                <div class="textModifiers btn btn-dark btn-sm">
+                                    <a  class="rainbow" href="javascript:;" onclick="formatText ('rb');">[rb]</a>
+                                    <a  class="reich" href="javascript:;" onclick="formatText ('reich');">[reich]</a>
+                                    <a  class="krebs" href="javascript:;" onclick="formatText ('krebs');">[krebs]</a>
+                                    <a  class="spoiler" href="javascript:;" onclick="formatText ('spoiler');">[spoiler]</a>
+                                </div>
+                                <span onclick="bottomArrow()" class="btn btn-dark btn-sm" style="cursor: pointer;"><i class="fa fa-arrow-down" aria-hidden="true"></i></span> 
+                                <a href="#" class="scrollToTop btn btn-dark btn-sm" style=""><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                            </div>
+                            <div class="collapse" id="collapseEmojis">
+                                <div class="emojiWrapper emojis">
+                                    <?php
+                                        $files = glob(public_path() . DIRECTORY_SEPARATOR . 'images/comments/*.webp', GLOB_BRACE);
+                                        $files = array_map(function ($f) { return pathinfo($f); }, $files);
+                                    ?>
+                                    @foreach ($files as $file)
+                                        <a class="w0bm_emoji_anchor" title=":{{$file['filename']}}:" href="javascript:;" onclick="formatTextEmoji ('{{$file['filename']}}');"><img class="comment_emoji_small" src="//w0bm.com/images/comments/{{$file['basename']}}"></a>
+                                    @endforeach
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+        </form>
     </div>
-    </div>
-</form>
-</div>
 </div>

resources/views/layout2/partials/navigation.blade.php

@@ -19,7 +19,8 @@
         </button>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
   <div class="grid-menu">
-    <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
+      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
+      <a class="dropdown-item" href="{{url('user', Auth::user()->username)}}/favs"><span class=""><i class="fa fa-heart"></i></span></a>
       <a class="dropdown-item" href="{{url('messages')}}"><span class=""><i class="fa fa-envelope-square"></i> {{Auth::user()->messagesRecv()->unread()->count()}}</span></a>
       <a class="dropdown-item" href="#" data-toggle="modal" data-target="#filterselectmodal">Filter</a>
       <a class="dropdown-item" href="{{url('upload')}}">Upload</a>

resources/views/layout2/profilelayout.blade.php

@@ -25,7 +25,6 @@
         <div class="container">
             @include('partials.navigation')
             @yield('novidcontent')
-            <wip>v.1.{{ filemtime("njum/css/cstms.css") }} WIP</wip>
         </div>
     </div>
 </body>

resources/views/layout2/upload.blade.php

@@ -1,45 +1,55 @@
 @extends('profilelayout')
 @section('novidcontent')
-    <div class="container">
- <ul class="list-group">
-        <div class="uploadheader">
-        <h3 id="upheader">Upload</h3>
-    </div>
-        <li class="list-group-item">
-            @include('partials.flash')
-            <button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
-            <span class="" id="laz0r-fire"></span>
-            <span class="hidden-xs" id="shoop-laz0r"></span>
-            </button>
-        <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
-            <a id="dragndrop-link" href="#">
-                <span style="display: table; width: 100%; height: 100%;">
-                    <span id="dragndrop-text">
-                        <i class="fa fa-cloud-upload"></i>
-                        Drop or select WebM!
-                    </span>
-                </span>
-            </a>
-        </div>
-    </li>
-    <li class="list-group-item">{!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}</li>
-    <li class="list-group-item">{!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}</li>
-    <li class="list-group-item">{!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}</li>
-    <li class="list-group-item">{!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}</li>
-    <li class="list-group-item">
-        <?php 
-            $categories = [];
-            foreach(App\Models\Category::all() as $cat)
-            $categories[$cat->id] = $cat->name;
-        ?>
-        {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
-    </li>
-    <li class="list-group-item">
-            {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw" class="badge badge-danger">NSFW?</label>
-        {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'row', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}</li>
-    <li class="list-group-item">
-    </li>
-  </ul>
+
+<!-- later @include('partials.flash') -->
+
+<div class="page-header">
+    <h3>Upload</h3>
+</div>
+
+<div class="container">
+        <ul class="list-group">
+            <li class="list-group-item">
+                @include('partials.flash')
+                <div id="dragndrop" class="form-group col-md-3" data-uploadlimit="{{ isset($user) ? ($user->can('break_max_filesize') ? 'false' : 'true') : 'true' }}">
+                    <a id="dragndrop-link" href="#">
+                        <span style="display: table; width: 100%; height: 100%;">
+                            <span id="dragndrop-text">
+                                <i class="fa fa-cloud-upload"></i>
+                                    Drop or select WebM!
+                            </span>
+                        </span>
+                    </a>
+                </div>
+            </li>
+
+            <li class="list-group-item">{!! Form::text('videotitle', null, ['id' => 'videotitle', 'class' => 'form-control', 'placeholder' => 'Video Title']) !!}</li>
+            <li class="list-group-item">{!! Form::text('interpret', null, ['id' => 'interpret', 'class' => 'form-control', 'placeholder' => 'Artist']) !!}</li>
+            <li class="list-group-item">{!! Form::text('songtitle', null, ['id' => 'songtitle', 'class' => 'form-control', 'placeholder' => 'Songtitle']) !!}</li>
+            <li class="list-group-item">{!! Form::text('imgsource', null, ['id' => 'imgsource', 'class' => 'form-control', 'placeholder' => 'Video Source']) !!}</li>
+            <li class="list-group-item">
+                <?php 
+                    $categories = [];
+                    foreach(App\Models\Category::all() as $cat)
+                    $categories[$cat->id] = $cat->name;
+                ?>
+                {!! Form::select('category', $categories, 8, ['id' => 'category', 'class' => 'form-control']) !!}
+            </li>
+            <li class="list-group-item">
+                {!! Form::checkbox('nsfw', 'true', false, ['id' => 'nsfw']) !!} <label id="nsfw" for="nsfw" class="badge badge-danger">NSFW?</label>
+                {!! Form::text('tags', null, ['id' => 'tags_upload', 'class' => 'row', 'placeholder' => 'Input tags...', 'name' => 'tags', 'data-role' => 'tagsinput']) !!}
+            </li>
+            <li class="list-group-item">
+                <div class="uploadButton">
+                    <button id="btn-upload" type="button" class="btn btn-dark btn-sm"><span class="laz0r">Fire the laz0r</span>
+                        <span class="" id="laz0r-fire"></span>
+                        <span class="hidden-xs" id="shoop-laz0r"></span>
+                    </button>
+                    <p>Before you fire the laz0r make sure you have read the <a href="/rules">Rules</a>! <br><i>With great power comes great responsibility</i></p>
+		            <p><b>10</b> uploads <b>every 12 hours.</b> – Maximum filesize: <b>40MB.</b> – Only <b>.webm (vp8/vp9) with sound</b> allowed. Need <a href="/webm">help?</a></p>
+                </div>
+            </li>
+        </ul>
 </div>
 
         <input name="file" type="file" hidden accept=".webm"></input>

resources/views/layout2/webm.blade.php

@@ -1,56 +1,59 @@
 @extends('profilelayout')
-@section('content')
- <div class="page-header">
-         <h3>WebM Support</h3>
- </div>
-
-<div class="box">
-<h5>WebM how to</h5>
-<p>On this page you will find anything related to WebMs</p>
+@section('novidcontent')
+<div class="page-header">
+        <h3>WebM Support</h3>
+        <p>How 2 make a webm</p>
 </div>
-
 <div class="box">
-<h4>Useful tools for creating WebMs</h4>
-<p>There is a good documentation with various ffmpeg tools on github, you should definetly check it out and pick the one you like the most!</p>
+<h4>Chad <small>(not afraid of using the command line)</small></h4>
+<img src="/images/gigachad.png" style="float:left;width:150px;" alt="gigachad">
+<pre><code>#The based white man way
+
+ffmpeg -i virgin.mp4 chad.webm #single file, very simple
+
+#You can add this to your .bashrc
+
+function mkwebmbatch() {
+        for i in *.$1;
+                do name=`basename "$i" .$1`
+                echo "$name"
+                ffmpeg -i "$i" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$PWD/${name}.webm"
+        done
+}
+
+function mkwebm() {
+	filename=$(basename -- "$1")
+	extension="${filename##*.}"
+	filename="${filename%.*}"
+	name=`basename "$filename" .$extension`
+	echo "$name"
+	ffmpeg -i "$1" -c:v libvpx -c:a libvorbis -auto-alt-ref 0 -crf 5 "$HOME/Videos/converts/$name.webm"
+}
+
+function stillvid() {
+	#stillvid image.jpg music.mp3 $3.<webm>
+	ffmpeg -i "$1" -i "$2" -c:a libvorbis -auto-alt-ref 0 -c:v libvpx $3.webm 
+}
+
+#Notable mentions
+
+* https://github.com/ekisu/mpv-webm
+
+* https://github.com/Kagami/webm.py
+
+# If using webm.py a good line to get a high quality video would be
+
+# (assuming you have it in your path)
+webm -i virgin.mp4 -l 40 chad.webm #this will produce a vp9 webm with decent image quality
+</code></pre>
+</div>
+<h1 style="text-align:center;">VS</h1>
+<div class="box">
+<h4>Virgin</h4>
+<img src="/images/virgin.png" style="float:left;width:150px;" alt="gigachad">
 <ul>
-   <li><a href="https://github.com/Kagami/webm.py/wiki/Related-links">List of tools and information</a></li>
-   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a> Cross Platform Gui application for cutting, cropping and converting videos into WebM format, has integrated youtube-dl option, so you can directly download from any site that is supported by youtube-dl. Definetly the best choice if you want to have it quick and easy with a nice looking result!</li>
-   <li><a href="https://github.com/Kagami/webm.py">webm.py by Kagami</a> If you are more the CLI fan like me, this is something for you, it's a very easy cli tool and basically the best fucking tool if you want to create a WebM real quick by only using your shell.</li>
+   <li><a href="https://github.com/Kagami/boram">Boram by Kagami</a></li>
+   <li><a href="https://gitgud.io/nixx/WebMConverter">WebMConverter by nixx!</a></li>
 </ul>
-   <p>Sample lines for webm.py <code>python webm.py -i your.mp4 your.webm</code> will convert your mp4 into a vp9 webm with max filesize of 8MB! <code>python webm.py -l 4 -vp8 -i your.mp4|webm yourwebmfor4chan.webm</code> will set the maximum filesize to 4MB and convert it using the VP8 codec and vorbis audio codec.</p>
-</div>
-
-<div class="box">
-<h4>Get a WebM directly from YouTube</h4>
-<p>There are many ways on how to download videos from YouTube but most people don't know that you can grab a WebM directly from YouTube.</p>
-<p>The easiest and probably best way is jdownloader 2, all you need to do is copy a youtube link and jdownloader will add it to the link collector, from there you can select how jdownloader should download the video.</p>
-<img src="https://files.nogf.club/winfick/ad224c7e257a.png" />
-<p>Please note that HD WebM is not always available, there should always be a 360p version available.</p>
-</div>
-
-<div class="box">
-<h4>coub.com Downloader</h4>
-<p><a href="https://coub.com"target="_blank">coub.com</a> is a great place to explore some nice videos, I made this little script that helps you to grab the videos from their site and instantly convert it to <code>.webm</code></p>
-<p>Download <a href="https://gitfap.de/noxy/coubdl" target="_blank">the script</a> from my GitFap repo and just run it like this: <code>bash coubdl.sh URL</code> it will then ask you how long your video should be, it will show you the duration of just the loop and the duration of the audio file used for it.</p>
-<p>After that you can specify the output max size by just typing in a single number like <code>4</code> and the script will convert your video to 4MB</p>
-<p>Requirements: <code>yotube-dl, jq, ffmpeg, ffprobe, python & webm.py</code>
-</div>
-
-<div class="box">
-<h4>Some information about ffmpeg</h4>
-<p>If you want to learn more about FFmpeg check out <a href="https://de.wikipedia.org/wiki/FFmpeg">FFmpeg Wiki</a> and <a href="https://ffmpeg.org/">ffmpeg.org</a></p>
-<p>ffmpeg is able to convert your .mkv and/or .mp4 files in to .webm for example and it is really easy, you just need to type in one line of commands</p>
-</div>
-
-<div class="box">
-<h5>If your uploads fails and you see this: Erroneous File Encoding! Try reencoding it</h5>
-<code><s>ffmpeg -i problem.webm -map 0:0 -map 0:1 -c:v copy solved.webm</s> <b>(PATCHED)</b></code>
-</div>
-
-<div class="box">
-<h5>Windows</h5>
-<p>There are just like in Linux many ways to convert a WebM in Windows, you can even do it from the CLI like I described above, but many Windows users don't use the CMD very often, so in this section I will explain how to make a nice WebM in Windows using a GUI program!</p>
-<p>The best way is probably <a href="https://github.com/Kagami/boram">Boram by Kagami</a> it has a very user friendly GUI and works like a charm I can definetly recommend this!</p>
-<p>Or you can use <a href="https://gitgud.io/nixx/WebMConverter">WebMConverter</a> by nixx, it has all the things you need but it can't download videos directly from the internet to convert them on the fly, but it will still work!</p>
 </div>
 @endsection