diff --git a/ban/__init__.py b/ban/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ban/admin.py b/ban/admin.py
deleted file mode 100644
index a355558..0000000
--- a/ban/admin.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.contrib import admin
-from .models import UsersBan
-
-# Register your models here.
-
-class UsersBanModel(admin.ModelAdmin):
- list_display = ['user', 'ban', ]
- list_filter = ('ban', )
- search_fields = ('user__username', 'user__id', 'user__first_name', 'user__last_name')
-
-'''
-admin.site.register(UsersBan, UsersBanModel)
-'''
\ No newline at end of file
diff --git a/ban/apps.py b/ban/apps.py
deleted file mode 100644
index 9407187..0000000
--- a/ban/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class BanConfig(AppConfig):
- name = 'ban'
diff --git a/ban/middleware.py b/ban/middleware.py
deleted file mode 100644
index 4a69940..0000000
--- a/ban/middleware.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponseForbidden
-from .models import UsersBan
-
-class BanManagement():
- """Users Management"""
-
- def __init__(self, get_response):
- self.get_response = get_response
-
- def __call__(self, request):
- response = self.get_response(request)
-
- if(UsersBan.objects.all().filter(ban=True, user_id=request.user.id)):
- return HttpResponseForbidden('Commit suicide')
- elif request.user.is_authenticated:
- if not request.user.is_active():
- return HttpResponseForbidden(request.user.warned_reason)
- else:
- return response
- else:
- return response
diff --git a/ban/migrations/0001_initial.py b/ban/migrations/0001_initial.py
deleted file mode 100644
index 3c52bc7..0000000
--- a/ban/migrations/0001_initial.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 3.2.3 on 2022-02-28 20:18
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='UsersBan',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('ban', models.BooleanField(default=False, help_text='Users Bans', verbose_name='Ban')),
- ('user', models.ForeignKey(help_text='Choose Username', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User name')),
- ],
- options={
- 'verbose_name_plural': 'Ban Management',
- 'ordering': ('user',),
- },
- ),
- ]
diff --git a/ban/migrations/0002_usersban_reason.py b/ban/migrations/0002_usersban_reason.py
deleted file mode 100644
index da4314d..0000000
--- a/ban/migrations/0002_usersban_reason.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.3 on 2022-09-03 21:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('ban', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='usersban',
- name='reason',
- field=models.CharField(blank=True, max_length=1024, null=True),
- ),
- ]
diff --git a/ban/migrations/0003_remove_usersban_reason.py b/ban/migrations/0003_remove_usersban_reason.py
deleted file mode 100644
index e629295..0000000
--- a/ban/migrations/0003_remove_usersban_reason.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.2.3 on 2022-09-03 21:03
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('ban', '0002_usersban_reason'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='usersban',
- name='reason',
- ),
- ]
diff --git a/ban/migrations/__init__.py b/ban/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ban/migrations/__pycache__/0001_initial.cpython-310.pyc b/ban/migrations/__pycache__/0001_initial.cpython-310.pyc
deleted file mode 100644
index 7f0eb0c..0000000
Binary files a/ban/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ
diff --git a/ban/migrations/__pycache__/0002_usersban_reason.cpython-310.pyc b/ban/migrations/__pycache__/0002_usersban_reason.cpython-310.pyc
deleted file mode 100644
index f5fbf7a..0000000
Binary files a/ban/migrations/__pycache__/0002_usersban_reason.cpython-310.pyc and /dev/null differ
diff --git a/ban/migrations/__pycache__/0003_remove_usersban_reason.cpython-310.pyc b/ban/migrations/__pycache__/0003_remove_usersban_reason.cpython-310.pyc
deleted file mode 100644
index f5dd738..0000000
Binary files a/ban/migrations/__pycache__/0003_remove_usersban_reason.cpython-310.pyc and /dev/null differ
diff --git a/ban/migrations/__pycache__/__init__.cpython-310.pyc b/ban/migrations/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index 2a6d6cb..0000000
Binary files a/ban/migrations/__pycache__/__init__.cpython-310.pyc and /dev/null differ
diff --git a/ban/models.py b/ban/models.py
deleted file mode 100644
index afe9c1e..0000000
--- a/ban/models.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.db import models
-from django.conf import settings
-
-# Create your models here.
-
-class UsersBan(models.Model):
- user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name="User name", help_text="Choose Username", on_delete=models.CASCADE)
-
- ban = models.BooleanField(default=False, verbose_name="Ban", help_text="Users Bans")
-
- class Meta:
- verbose_name_plural = "Ban Management"
- ordering = ('user', )
-
- def __str__(self):
- return '{}'.format(self.user)
diff --git a/ban/templates/ban.html b/ban/templates/ban.html
deleted file mode 100644
index e104cf3..0000000
--- a/ban/templates/ban.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-commit suicide
-
-
\ No newline at end of file
diff --git a/ban/tests.py b/ban/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/ban/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/ban/views.py b/ban/views.py
deleted file mode 100644
index 91ea44a..0000000
--- a/ban/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/closedverse/settings.py b/closedverse/settings.py
index d37d1eb..a625ef3 100644
--- a/closedverse/settings.py
+++ b/closedverse/settings.py
@@ -59,9 +59,7 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'ban.middleware.BanManagement',
'closedverse_main.middleware.ClosedMiddleware',
- 'maintenance.middleware.MaintenanceManagement',
'whitenoise.middleware.WhiteNoiseMiddleware'
]
diff --git a/closedverse_main/models.py b/closedverse_main/models.py
index cb38e54..e021457 100644
--- a/closedverse_main/models.py
+++ b/closedverse_main/models.py
@@ -812,6 +812,15 @@ class Post(models.Model):
except:
return False
return thing
+ def discord_vid(self):
+ try:
+ thing = re.search('(https?://)?(www\.)?(cdn)?(discordapp)\.(com)/attachments/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)/(.+)', self.url).group(8)
+ if thing.endswith(".mp4") or thing.endswith(".webm"):
+ return thing
+ else:
+ return False
+ except:
+ return False
def has_line_trun(self):
if self.body and len(self.body.splitlines()) > 10:
return True
diff --git a/closedverse_main/templates/closedverse_main/elements/community_post.html b/closedverse_main/templates/closedverse_main/elements/community_post.html
index 301c540..dfe3fd1 100644
--- a/closedverse_main/templates/closedverse_main/elements/community_post.html
+++ b/closedverse_main/templates/closedverse_main/elements/community_post.html
@@ -31,6 +31,10 @@
{% if post.yt_vid %}

+ {% elif post.discord_vid %}
+
+
+
{% endif %}
{% if post.drawing %}

diff --git a/closedverse_main/templates/closedverse_main/elements/post-form.html b/closedverse_main/templates/closedverse_main/elements/post-form.html
index f5cbae8..fe068a2 100644
--- a/closedverse_main/templates/closedverse_main/elements/post-form.html
+++ b/closedverse_main/templates/closedverse_main/elements/post-form.html
@@ -41,7 +41,7 @@
{% if user.has_freedom %}
-
+
{% file_button %}
{% endif %}
@@ -66,4 +66,4 @@
{% if not user.is_active %}
Your account has been disabled.
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/closedverse_main/templates/closedverse_main/elements/profile-post.html b/closedverse_main/templates/closedverse_main/elements/profile-post.html
index a1c6e40..fcdfa34 100644
--- a/closedverse_main/templates/closedverse_main/elements/profile-post.html
+++ b/closedverse_main/templates/closedverse_main/elements/profile-post.html
@@ -22,7 +22,9 @@
{% if post.yt_vid %}
- {% endif %}
+ {% elif post.discord_vid %}
+
+ {% endif %}
{% if post.screenshot %}
{% endif %}
@@ -61,4 +63,4 @@
-
\ No newline at end of file
+
diff --git a/closedverse_main/templates/closedverse_main/post-view.html b/closedverse_main/templates/closedverse_main/post-view.html
index 3d373b6..b936996 100644
--- a/closedverse_main/templates/closedverse_main/post-view.html
+++ b/closedverse_main/templates/closedverse_main/post-view.html
@@ -84,6 +84,11 @@
{% if post.yt_vid %}
+ {% elif post.discord_vid %}
+
+
+
+ Discord embedded video
{% elif post.url %}
{{ post.url }}
{% endif %}
diff --git a/closedverse_main/tests.py b/closedverse_main/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/closedverse_main/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/closedverse_main/util.py b/closedverse_main/util.py
index 799a3d4..1587be5 100644
--- a/closedverse_main/util.py
+++ b/closedverse_main/util.py
@@ -157,12 +157,6 @@ def filterchars(str=""):
for char in forbid:
if char in str:
str = str.replace(char, " ")
- if str.isspace():
- try:
- girls = json.load(open(settings.BASE_DIR + '/girls.json'))
- except:
- girls = ['None']
- return choice(girls)
return str
# Check IP for proxy.
@@ -173,12 +167,3 @@ def iphub(addr):
return True
else:
return False
-
-# NNID blacklist check
-def nnid_blacked(nnid):
- blacklist = json.load(open(settings.nnid_forbiddens))
- # The NNID server omits dashes and dots from NNIDs, gotta make sure nobody gets through this
- nnid = nnid.lower().replace('-', '').replace('.', '')
- if nnid in blacklist:
- return True
- return False
diff --git a/closedverse_main/views.py b/closedverse_main/views.py
index 726696c..b4abd16 100644
--- a/closedverse_main/views.py
+++ b/closedverse_main/views.py
@@ -287,9 +287,6 @@ def signup_page(request):
else:
spamuser = True
if request.POST['origin_id']:
- if settings.nnid_forbiddens:
- if nnid_blacked(request.POST['origin_id']):
- return HttpResponseForbidden("You are very funny. Unfortunately, your funniness blah blah blah fuck off.")
if User.nnid_in_use(request.POST['origin_id']):
return HttpResponseBadRequest("That Nintendo Network ID is already in use, that would cause confusion.")
mii = get_mii(request.POST['origin_id'])
@@ -408,9 +405,6 @@ def user_view(request, username):
return json_response("Your e-mail address is invalid. Input an e-mail address, or input nothing.")
if User.nnid_in_use(request.POST.get('origin_id'), request):
return json_response("That Nintendo Network ID is already in use, that would cause confusion.")
- if settings.nnid_forbiddens:
- if nnid_blacked(request.POST['origin_id']):
- return json_response("You are very funny. Unfortunately, your funniness blah blah blah fuck off.")
if user.has_plain_avatar():
user.avatar = request.POST.get('avatar') or ''
if request.POST.get('avatar') == '1':
diff --git a/forbidden.json b/forbidden.json
deleted file mode 100644
index 41b42e6..0000000
--- a/forbidden.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]
diff --git a/girls.json b/girls.json
deleted file mode 100644
index 1b6c8fa..0000000
--- a/girls.json
+++ /dev/null
@@ -1,113 +0,0 @@
-[
-"Abigail",
-"Addison",
-"Alexa",
-"Alexis",
-"Alice",
-"Alyssa",
-"Amelia",
-"Amy",
-"Anna",
-"Annabelle",
-"Aubrey",
-"Audrey",
-"Aurelie",
-"Aurora",
-"Autumn",
-"Ava",
-"Avery",
-"Blake",
-"Brooke",
-"Brooklyn",
-"Callie",
-"Charlie",
-"Charlotte",
-"Chloe",
-"Claire",
-"Clara",
-"Eleanor",
-"Elena",
-"Elisabeth",
-"Elise",
-"Elizabeth",
-"Ella",
-"Ellie",
-"Eloise",
-"Emilia",
-"Emilie",
-"Emily",
-"Emma",
-"Eva",
-"Eve",
-"Evelyn",
-"Everly",
-"Florence",
-"Gabrielle",
-"Georgia",
-"Hannah",
-"Hazel",
-"Isabella",
-"Isabelle",
-"Isla",
-"Ivy",
-"Jade",
-"Jeanne",
-"Jessie",
-"Julie",
-"Juliette",
-"Kate",
-"Laura",
-"Layla",
-"Leah",
-"Leanne",
-"Lexie",
-"Lila",
-"Lillian",
-"Lily",
-"Lucy",
-"Luna",
-"Mackenzie",
-"Madelyn",
-"Madison",
-"Maely",
-"Maika",
-"Malika",
-"Maria",
-"Maya",
-"Megan",
-"Melodie",
-"Mia",
-"Mila",
-"Mya",
-"Naomi",
-"Natalie",
-"Nora",
-"Norah",
-"Nova",
-"Olivia",
-"Paige",
-"Paisley",
-"Penelope",
-"Peyton",
-"Piper",
-"Quinn",
-"Riley",
-"Rosalie",
-"Rose",
-"Ruby",
-"Samantha",
-"Sara",
-"Sarah",
-"Scarlett",
-"Sienna",
-"Simone",
-"Sophia",
-"Sophie",
-"Stella",
-"Taylor",
-"Victoria",
-"Violet",
-"Willow",
-"Zoe",
-"Zoey"
-]
\ No newline at end of file
diff --git a/maintenance/__init__.py b/maintenance/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/maintenance/__pycache__/__init__.cpython-310.pyc b/maintenance/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index 92a731a..0000000
Binary files a/maintenance/__pycache__/__init__.cpython-310.pyc and /dev/null differ
diff --git a/maintenance/__pycache__/admin.cpython-310.pyc b/maintenance/__pycache__/admin.cpython-310.pyc
deleted file mode 100644
index eb24510..0000000
Binary files a/maintenance/__pycache__/admin.cpython-310.pyc and /dev/null differ
diff --git a/maintenance/__pycache__/apps.cpython-310.pyc b/maintenance/__pycache__/apps.cpython-310.pyc
deleted file mode 100644
index 5cfd587..0000000
Binary files a/maintenance/__pycache__/apps.cpython-310.pyc and /dev/null differ
diff --git a/maintenance/__pycache__/middleware.cpython-310.pyc b/maintenance/__pycache__/middleware.cpython-310.pyc
deleted file mode 100644
index 2162189..0000000
Binary files a/maintenance/__pycache__/middleware.cpython-310.pyc and /dev/null differ
diff --git a/maintenance/__pycache__/models.cpython-310.pyc b/maintenance/__pycache__/models.cpython-310.pyc
deleted file mode 100644
index 0e35ec8..0000000
Binary files a/maintenance/__pycache__/models.cpython-310.pyc and /dev/null differ
diff --git a/maintenance/admin.py b/maintenance/admin.py
deleted file mode 100644
index 13be29d..0000000
--- a/maintenance/admin.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.contrib import admin
-
-# Register your models here.
diff --git a/maintenance/apps.py b/maintenance/apps.py
deleted file mode 100644
index 4262aa8..0000000
--- a/maintenance/apps.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.apps import AppConfig
-
-
-class MaintenanceConfig(AppConfig):
- name = 'maintenance'
diff --git a/maintenance/middleware.py b/maintenance/middleware.py
deleted file mode 100644
index 423973d..0000000
--- a/maintenance/middleware.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from django.shortcuts import render
-from closedverse_main.models import User
-from django.conf import settings
-
-in_maintenance = False
-
-class MaintenanceManagement():
- """Maintenance Management"""
-
- def __init__(self, get_response):
- self.get_response = get_response
-
- def __call__(self, request):
- response = self.get_response(request)
- current_url = request.path_info
- SURL = settings.STATIC_URL
-
- if(in_maintenance):
- if SURL in current_url:
- return response
- else:
- return render(request, 'mv.html')
- else:
- return response
- '''
- try:
- if SURL in current_url:
- return response
- elif not(User.is_staff(request.user)):
- return render(request, 'mv.html')
- else:
- return response
- except:
- return render(request, 'mv.html')
- else:
- return response
-'''
\ No newline at end of file
diff --git a/maintenance/models.py b/maintenance/models.py
deleted file mode 100644
index 1dfab76..0000000
--- a/maintenance/models.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models
-
-# Create your models here.
diff --git a/maintenance/templates/maintenance.html b/maintenance/templates/maintenance.html
deleted file mode 100644
index d398d89..0000000
--- a/maintenance/templates/maintenance.html
+++ /dev/null
@@ -1 +0,0 @@
-down for a few fixing stuffs rn brb i guess
\ No newline at end of file
diff --git a/maintenance/templates/msg.html b/maintenance/templates/msg.html
deleted file mode 100644
index 0fa8b4e..0000000
--- a/maintenance/templates/msg.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "closedverse_main/layout.html" %}
-{% load static %}
-{% load closedverse_tags %}{% block main-body %}
-{% nocontent "Website SUSpended by Cloudflare for (extreme) bullying and harassment!" %}
-{% endblock %}
\ No newline at end of file
diff --git a/maintenance/templates/mv.html b/maintenance/templates/mv.html
deleted file mode 100644
index 9d82359..0000000
--- a/maintenance/templates/mv.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-Cedar
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-
Thank you to everyone who used Cedar! Cedar service was hacked.
-
-
-
-
-
-
This mosaic was created with handwritten posts from Miiverse users. You can enlarge the image by clicking on it.
-
-
-
For users who requested their downloadable post history:
-
-- I have the Cedar database. Not even Cedar was safe from us!
-- Death to all Miiverse clones!
-{% if request.user.is_authenticated %}- {{ request.user.username }}, You're next!
{% endif %}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maintenance/tests.py b/maintenance/tests.py
deleted file mode 100644
index 5982e6b..0000000
--- a/maintenance/tests.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/maintenance/views.py b/maintenance/views.py
deleted file mode 100644
index e784a0b..0000000
--- a/maintenance/views.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.shortcuts import render
-
-# Create your views here.