From 05fd84e9f5bf699b57d7ff68e17ecb667fa57d38 Mon Sep 17 00:00:00 2001
From: dimden <admin@dimden.dev>
Date: Tue, 23 Aug 2022 22:25:37 +0300
Subject: [PATCH 1/7] Fix #405

Fixes #405
---
 views/site_files/text_editor.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 35c439e6..9a5f7a79 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -183,6 +183,7 @@
       editor.setBehavioursEnabled(false)
 
       editor.setValue(resp, -1)
+      editor.getSession().setUndoManager(new ace.UndoManager())
 
       editor.on('change', function(obj) {
         $('a#saveButton,a#saveAndExitButton').css('opacity', 1)

From 57c0424d3ca6943c914fd27eb84ec4ed533870fa Mon Sep 17 00:00:00 2001
From: dimden <admin@dimden.dev>
Date: Wed, 24 Aug 2022 02:27:49 +0300
Subject: [PATCH 2/7] Moving files to folder in Dashboard

Fixes #404
---
 views/dashboard.erb | 56 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/views/dashboard.erb b/views/dashboard.erb
index 8c865279..85f0e894 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -71,6 +71,11 @@
       <div id="progressBar" class="progress-bar" style="display: none"><div id="uploadingProgress" class="progress" style="width: 0%"></div></div>
     </div>
   </div>
+  <div id="movingOverlay" class="uploading-overlay" style="display: none">
+    <div class="uploading">
+        <p>Moving file, please wait...</p>
+    </div>
+  </div>
   <div class="header">
     <div class="btn-group" role="group" aria-label="...">
       <button type="button" class="btn btn-default iconview-button" title="Icon View" onclick="iconView()"><i class="fa fa-th"></i></button>
@@ -119,7 +124,7 @@
                 <div class="overlay"></div>
               </div>
             <% elsif file[:is_directory] %>
-              <div class="html-thumbnail folder fileimagehover">
+              <div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event)">
                 <div class="folder-icon"></div>
                 <div class="overlay"></div>
               </div>
@@ -272,6 +277,55 @@
 <script src="/js/dropzone.min.js"></script>
 <script>
 
+  var uploadForm = $('#uploadFilesButtonForm')[0];
+  var deleteForm = $('#deleteFilenameForm')[0];
+
+  function moveFileToFolder(event) {
+    var link = event.dataTransfer.getData("Text");
+    if(link) link = link.trim();
+    if(!link || link.startsWith('https://neocities.org/dashboard')) return;
+    event.preventDefault();
+    var name = link.split('.neocities.org/').slice(1).join('.neocities.org/');
+    var oReq = new XMLHttpRequest();
+    oReq.open("GET", "/site_files/download/" + name, true);
+    oReq.responseType = "arraybuffer";
+    
+    $('#movingOverlay').css('display', 'block')
+
+    oReq.onload = function() {
+      var newFile = new File([oReq.response], name);
+      var dataTransfer = new DataTransfer();
+      var currentFolder = new URL(location.href).searchParams.get('dir');
+      if(!currentFolder) currentFolder = '';
+      else currentFolder = currentFolder + '/';
+
+      dataTransfer.items.add(newFile);
+      $('#uploadFilesButtonForm > input[name="dir"]')[0].value = currentFolder + event.target.parentElement.parentElement.getElementsByClassName('title')[0].innerText.trim();
+      $('#uploadFiles')[0].files = dataTransfer.files;
+      $.ajax({
+        type: uploadForm.method,
+        url: uploadForm.action,
+        data: new FormData(uploadForm),
+        processData: false,
+        contentType: false,
+        success: function() {
+          let csrf = $('#uploadFilesButtonForm > input[name="csrf_token"]')[0].value;
+          var dReq = new XMLHttpRequest();
+          dReq.open(deleteForm.method, deleteForm.action, true);
+          dReq.onload = function() {
+            location.reload()
+          }
+          dReq.setRequestHeader("content-type", 'application/x-www-form-urlencoded');
+          dReq.send("csrf_token=" + encodeURIComponent(csrf) + "&filename=" + name.replace(/\s/g, '+'));
+        },
+        error: function() {
+          location.reload()
+        }
+      });
+    };
+    oReq.send();
+  }
+
   function confirmFileRename(path) {
     console.log(path)
     $('#renamePathInput').val(path);

From 959c13b735aa99160672def4ad6a03bd3230d9aa Mon Sep 17 00:00:00 2001
From: dimden <admin@dimden.dev>
Date: Wed, 24 Aug 2022 02:49:42 +0300
Subject: [PATCH 3/7] Make SVGs editable

Fix #387
---
 models/site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/site.rb b/models/site.rb
index cb46d0fb..42e2dfe0 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -47,7 +47,7 @@ class Site < Sequel::Model
   }
 
   VALID_EDITABLE_EXTENSIONS = %w{
-    html htm txt js css scss md manifest less webmanifest xml json opml rdf
+    html htm txt js css scss md manifest less webmanifest xml json opml rdf svg
   }
 
   MINIMUM_PASSWORD_LENGTH = 5

From 66bbbbcf057e409b7768c9b0fc0c81620ec279e5 Mon Sep 17 00:00:00 2001
From: dimden <admin@dimden.dev>
Date: Wed, 24 Aug 2022 16:55:22 +0300
Subject: [PATCH 4/7] Fix breaking editor

Fixes #413
---
 public/js/news/profile_comment.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/js/news/profile_comment.js b/public/js/news/profile_comment.js
index 13c7d533..21e535cc 100644
--- a/public/js/news/profile_comment.js
+++ b/public/js/news/profile_comment.js
@@ -1,7 +1,7 @@
 var ProfileComment = {
   displayEditor: function(eventId) {
-    var commentDiv = $('#event_'+eventId+' div.content')
-    var eventActions = $('#event_'+eventId+'_actions')
+    var commentDiv = $('#event_'+eventId+' div.content').first()
+    var eventActions = $('#event_'+eventId+'_actions').first()
 
     eventActions.find('a#editLink').css('display', 'none')
 
@@ -10,15 +10,14 @@ var ProfileComment = {
   },
 
   cancelEditor: function(eventId) {
-    var eventActions = $('#event_'+eventId+'_actions')
-    var commentDiv = $('#event_'+eventId+' div.content')
+    var eventActions = $('#event_'+eventId+'_actions').first()
+    var commentDiv = $('#event_'+eventId+' div.content').first()
     eventActions.find('a#editLink').css('display', 'inline')
     commentDiv.text(commentDiv.find('textarea').text())
   },
 
   update: function(eventId, csrfToken) {
-    var eventActions = $('#event_'+eventId+'_actions')
-    var commentDiv = $('#event_'+eventId+' div.content')
+    var commentDiv = $('#event_'+eventId+' div.content').first()
     var self = this
     console.log(commentDiv.find('textarea').val())
     $.post('/event/'+eventId+'/update_profile_comment', {

From 60b7180f979e6a743cff8121340d76acc1e0d9c3 Mon Sep 17 00:00:00 2001
From: Kiril Misnikov <56405352+lime360@users.noreply.github.com>
Date: Sat, 10 Sep 2022 20:27:34 +0300
Subject: [PATCH 5/7] added ungird and vuepress to resources list

---
 views/tutorials.erb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/views/tutorials.erb b/views/tutorials.erb
index bcd11835..c960252b 100644
--- a/views/tutorials.erb
+++ b/views/tutorials.erb
@@ -69,6 +69,9 @@
     <li>
       <a href="https://bulma.io/" title="Bulma: The Framework Built on Flexbox" target="_blank">Bulma</a>
     </li>
+    <li>
+      <a href="https://chrisnager.github.io/ungrid/" title="ungrid: the simplest responsive css grid">ungird</a>
+    </li>
   </ul>
 
   <h3>JavaScript</h3>
@@ -95,6 +98,10 @@
     </li>
     <li>
       <a href="https://www.gatsbyjs.org/">Gatsby</a>
+    </li>
+    <li>
+      <a href="https://v2.vuepress.vuejs.org/">VuePress</a>
+    </li>
   </ul>
 
   <h3>WebGL</h3>

From 3006486b22fdf3ec5db816b1102b0bafa9a9437c Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:40:22 -0700
Subject: [PATCH 6/7] docs(readme): use github fork link

The fork button at the top of github is https://github.com/OWNER/REPO/fork.

Using this link makes it slightly easier for newer contributors to do the right thing
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 880babb4..4cfcefe0 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Now you can access the running site from your browser: http://127.0.0.1:9292
 
 If you'd like to fix a bug, or make an improvement, or add a new feature, it's easy! Just send us a Pull Request.
 
-1. Fork it (<http://github.com/YOURUSERNAME/neocities/fork>)
+1. Fork it (https://github.com/neocities/neocities/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

From 6ea07df6a84c7cd5591f690ed75b7808ebd7a532 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sat, 12 Nov 2022 13:07:49 -0600
Subject: [PATCH 7/7] fix site unblocking

---
 app/browse.rb                  | 14 +++++++-------
 app/site.rb                    | 12 ++++++++++++
 models/site.rb                 |  9 +++++++++
 tests/acceptance/site_tests.rb | 15 ++++++++++-----
 views/site.erb                 |  2 +-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/app/browse.rb b/app/browse.rb
index 54113d5b..d24d686c 100644
--- a/app/browse.rb
+++ b/app/browse.rb
@@ -68,28 +68,28 @@ def browse_sites_dataset
       ds = ds.exclude featured_at: nil
       ds = ds.order :featured_at.desc
     when 'hits'
-      ds = ds.where{views > 100}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_VIEWS}
       ds = ds.order(:hits.desc, :site_updated_at.desc)
     when 'views'
-      ds = ds.where{views > 100}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_VIEWS}
       ds = ds.order(:views.desc, :site_updated_at.desc)
     when 'newest'
       ds = ds.order(:created_at.desc, :views.desc)
     when 'oldest'
-      ds = ds.where{views > 100}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_VIEWS}
       ds = ds.order(:created_at, :views.desc)
     when 'random'
-      ds = ds.where{views > 100}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_VIEWS}
       ds = ds.where 'random() < 0.01'
     when 'last_updated'
-      ds = ds.where{views > 100}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_VIEWS}
       params[:sort_by] = 'last_updated'
       ds = ds.exclude(site_updated_at: nil)
       ds = ds.order(:site_updated_at.desc, :views.desc)
     when 'tipping_enabled'
       ds = ds.where tipping_enabled: true
       ds = ds.where("(tipping_paypal is not null and tipping_paypal != '') or (tipping_bitcoin is not null and tipping_bitcoin != '')")
-      ds = ds.where{views > 10_000}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_FOLLOWER_VIEWS}
       ds = ds.group :sites__id
       ds = ds.order :follow_count.desc, :views.desc, :updated_at.desc
     when 'blocks'
@@ -100,7 +100,7 @@ def browse_sites_dataset
       ds = ds.order :total.desc
     else
       params[:sort_by] = 'followers'
-      ds = ds.where{views > 10_000}
+      ds = ds.where{views > Site::BROWSE_MINIMUM_FOLLOWER_VIEWS}
       ds = ds.order :follow_count.desc, :views.desc, :updated_at.desc
   end
 
diff --git a/app/site.rb b/app/site.rb
index 2537155c..18e2ce89 100644
--- a/app/site.rb
+++ b/app/site.rb
@@ -284,3 +284,15 @@ post '/site/:username/block' do |username|
     redirect request.referer
   end
 end
+
+get '/site/:username/unblock' do |username|
+  require_login
+  site = Site[username: username]
+
+  if site.nil? || current_site.id == site.id
+    redirect request.referer
+  end
+
+  current_site.unblock! site
+  redirect request.referer
+end
\ No newline at end of file
diff --git a/models/site.rb b/models/site.rb
index 55b8d85a..d96eb4a5 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -73,6 +73,9 @@ class Site < Sequel::Model
   ROOT_INDEX_HTML_REGEX  = /^\/?index.html$/
   MAX_COMMENT_SIZE       = 420 # Used to be the limit for Facebook.. no comment (PUN NOT INTENDED).
   MAX_FOLLOWS            = 1000
+  
+  BROWSE_MINIMUM_VIEWS   = 100
+  BROWSE_MINIMUM_FOLLOWER_VIEWS = 10_000
 
   SCREENSHOT_DELAY_SECONDS = 30
   SCREENSHOT_RESOLUTIONS   = ['540x405', '210x158', '100x100', '50x50']
@@ -629,6 +632,12 @@ class Site < Sequel::Model
     add_blocking site: site
   end
 
+  def unblock!(site)
+    block = blockings_dataset.filter(site_id: site.id).first
+    return true if block.nil?
+    block.destroy
+  end
+
   def is_blocking?(site)
     @blockings ||= blockings
     !@blockings.select {|b| b.site_id == site.id}.empty?
diff --git a/tests/acceptance/site_tests.rb b/tests/acceptance/site_tests.rb
index 1368fa2b..1656ddb4 100644
--- a/tests/acceptance/site_tests.rb
+++ b/tests/acceptance/site_tests.rb
@@ -63,11 +63,10 @@ describe 'site page' do
     _(page).must_have_content /#{site.username}/
   end
 
-=begin
-  it 'allows site blocking' do
-    Capybara.default_driver = :poltergeist
+
+  it 'allows site blocking and unblocking' do
     tag = SecureRandom.hex 10
-    blocked_site = Fabricate :site, new_tags_string: tag, created_at: 2.weeks.ago, site_changed: true
+    blocked_site = Fabricate :site, new_tags_string: tag, created_at: 2.weeks.ago, site_changed: true, views: Site::BROWSE_MINIMUM_FOLLOWER_VIEWS+1
     site = Fabricate :site
 
     page.set_rack_session id: site.id
@@ -88,8 +87,14 @@ describe 'site page' do
     site.reload
     _(site.blockings.length).must_equal 1
     _(site.blockings.first.site_id).must_equal blocked_site.id
+
+    visit "/site/#{blocked_site.username}"
+
+    click_link 'Unblock'
+
+    visit "/browse?tag=#{tag}"
+    _(page.find('.website-Gallery .username a')['href']).must_match /\/site\/#{blocked_site.username}/
   end
-=end
 
   it '404s if site is banned' do
     site = Fabricate :site
diff --git a/views/site.erb b/views/site.erb
index d2259eeb..b8df7627 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -105,7 +105,7 @@
       <div class="report">
         <% if signed_in? %>
           <% if current_site && current_site.is_blocking?(site) %>
-            <a href="#">Unblock</a>
+            <a href="/site/<%= site.username %>/unblock">Unblock</a>
           <% else %>
             <a href="#block" data-toggle="modal">Block Site</a>
           <% end %>