From ca09f3295bee7ff75d3e5c5f47c34a1558ab43c5 Mon Sep 17 00:00:00 2001 From: some weird guy <120821766+Mistake35@users.noreply.github.com> Date: Wed, 23 Aug 2023 16:47:28 -0700 Subject: [PATCH] Login page moved to forms.py, New warning and ban system, a bunch of other shit. - Change password page from profile settings has been moved over to forms.py - Login page has been moved over to forms.py. There is no JavaScript right now, however it is still functional. -Profile_tools_Form has been altered to remove a few unneeded fields that administrators don't need to mess with. - warned_reason and warned fields are gone from User_tools_Form and will be removed from models.py at a later point. - a new ban system has been implemented. While bans are still incomplete and lack capabilities to ban IP addresses as of right now, the groundwork is now here and those features can be added later. - manage_bans page was added. - A new warning system has been implemented. If a Warning is created, a notification is created automatically with it. A warning notification replaces the "new announcement" notification type. - Warning notifications are larger and stand out compared to normal notifications - When posting, commenting or messaging someone, a check is performed to make sure you've seen the warning notification. - manage_warnings page was added. This page will also show you the warning history. - help_text was added to a bunch of fields. --- README.foreskin | 42 ++- closedverse/settings.py | 60 +--- closedverse_main/admin.py | 83 +++-- closedverse_main/forms.py | 94 ++++- closedverse_main/middleware.py | 27 ++ closedverse_main/models.py | 163 +++++---- .../closedverse_main/change-password.html | 19 +- .../closedverse_main/community_all.html | 14 +- .../closedverse_main/community_list.html | 16 +- .../closedverse_main/community_tools.html | 10 +- .../closedverse_main/community_view.html | 10 - .../elements/discordapp-spinner.html | 1 + .../elements/file-button.html | 2 +- .../closedverse_main/elements/message.html | 2 +- .../elements/user-notification.html | 8 +- .../elements/user-sidebar.html | 33 +- .../closedverse_main/help/my-data.html | 1 - .../closedverse_main/login_page.html | 12 +- .../closedverse_main/man/manage_bans.html | 25 ++ .../closedverse_main/man/manage_warnings.html | 49 +++ .../closedverse_main/man/usertools.html | 8 +- .../closedverse_main/man/usertoolsmeta.html | 1 - .../closedverse_main/profile-settings.html | 2 +- closedverse_main/templatetags/__init__.py | 1 + closedverse_main/urls.py | 3 +- closedverse_main/util.py | 22 +- closedverse_main/views.py | 322 +++++++----------- static/closedverse.css | 21 ++ static/closedverse.js | 6 +- static/img/administrator.png | Bin 601 -> 0 bytes static/img/badgedes.png | Bin 1153 -> 0 bytes static/img/cool.png | Bin 381 -> 0 bytes static/img/developer.png | Bin 760 -> 0 bytes static/img/jack.png | Bin 519 -> 0 bytes static/img/menu-logo-old.png | Bin 12105 -> 0 bytes static/img/menu-logo.png | Bin 5636 -> 0 bytes static/img/menu-logo.svg | 138 ++++---- static/img/moderator.png | Bin 600 -> 0 bytes static/img/open-dev.png | Bin 605 -> 0 bytes static/img/open-zsdev.png | Bin 3088 -> 0 bytes static/img/sign-in.png | Bin 6924 -> 5232 bytes static/img/special.png | Bin 603 -> 0 bytes static/img/tester.png | Bin 599 -> 0 bytes static/img/verified.png | Bin 600 -> 0 bytes 44 files changed, 652 insertions(+), 543 deletions(-) create mode 100644 closedverse_main/templates/closedverse_main/elements/discordapp-spinner.html create mode 100644 closedverse_main/templates/closedverse_main/man/manage_bans.html create mode 100644 closedverse_main/templates/closedverse_main/man/manage_warnings.html delete mode 100644 static/img/administrator.png delete mode 100644 static/img/badgedes.png delete mode 100644 static/img/cool.png delete mode 100644 static/img/developer.png delete mode 100644 static/img/jack.png delete mode 100644 static/img/menu-logo-old.png delete mode 100644 static/img/menu-logo.png delete mode 100644 static/img/moderator.png delete mode 100644 static/img/open-dev.png delete mode 100644 static/img/open-zsdev.png delete mode 100644 static/img/special.png delete mode 100644 static/img/tester.png delete mode 100644 static/img/verified.png diff --git a/README.foreskin b/README.foreskin index 6817326..6ab0629 100644 --- a/README.foreskin +++ b/README.foreskin @@ -1,21 +1,39 @@ Stuff that is done: - Disable comments button -- merge with closedverse-video-support (mostly) - Prevent users from posting in communities created by blocked users. - Hide email password reset form if no SMTP server is set up. (done by Arian Kordi) -- Fix icon and banner uploads. - Icons and banners use util.image_upload now, at the cost of having to set them all again. Stuff that is in progress -- Removing shitty code. -- Adding help_text, and placeholders for clarity, this will be seen on the admin panel and even forms too. -- moving to forms.py - So far, user_tools and community_tools have been moved over. +- New Warning system. + Warnings are here, And there's an interface for warning users. + When a warning is made, a notification is also made. + Replaced the 5th notification type with warnings instead of announcements. + A check is made to make sure request.user does not have unread warnings before they can post. + There's no javascript for the form page yet. + Audit logs are not set up, but the Warning model shows who warned each user. -Stuff that I want +- User friendly interface for admins + Admins should be able to manage users quickly and effectively without having to worry about a clusterfuck interface. + Primary actions like warning users, banning users, and whatnot should be an easy few clicks away. + +- New Ban system. + Bans are here also with its own interface. + Instead of entering a datetime field manually, Admins are provided with choises for different ban lengths when using the frontend. + IP bans and range bans are not added yet. + A proper ban page is not added yet and simply shows a 403 error. + If a ban page is added, it should show the reason, and when the ban will expire. + There's no javascript for the form page yet. + Audit logs are not set up, but the Ban model shows who banned each user. + +- Removing shitty code. +- moving to forms.py. + The login page, admin tools, and community tools are using forms.py. + +Ideas: - Image and video file boxes in one. -- Pinning posts???? - Not needed at all if I'm being honest. +- A new user metadata page that does not suck. +- Make it, so you need to enter your current password to change your email address. - Ways for mods to view who invited who. -- Full ImageField integration -- remove the useless feedback thing. (You can just make a bug reporting community) +- Full ImageField integration. +- Filefield may have to be used for both photos and videos. +- remove the useless feedback thing. (You can just make a bug reporting community) \ No newline at end of file diff --git a/closedverse/settings.py b/closedverse/settings.py index f6d5b96..6ce42ee 100644 --- a/closedverse/settings.py +++ b/closedverse/settings.py @@ -29,7 +29,7 @@ DEBUG = False # Do not include 127.0.0.1 or localhost # in production for security reasons. ALLOWED_HOSTS = [ - '127.0.0.1', + '', ] DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' @@ -63,10 +63,8 @@ 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', + 'closedverse_main.middleware.CheckForBanMiddleware', ] if not DEBUG: MIDDLEWARE += ['whitenoise.middleware.WhiteNoiseMiddleware'] @@ -103,30 +101,6 @@ DATABASES = { } } - -""" -# log errors. -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'handlers': { - 'file': { - 'level': 'ERROR', - 'class': 'logging.FileHandler', - 'filename': 'logs/errors.log', - }, - }, - 'loggers': { - 'django': { - 'handlers': ['file'], - 'level': 'ERROR', - 'propagate': True, - }, - }, -} -""" - - # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators @@ -168,15 +142,6 @@ USE_L10N = False USE_TZ = True -# You can use Mailtrap to get the email system working. Mailtrap is free and will work well for what you'll be doing with this. -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_HOST = None -EMAIL_HOST_USER = None -EMAIL_HOST_PASSWORD = None -EMAIL_PORT = None -EMAIL_USE_TLS = True -DEFAULT_FROM_EMAIL = None - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ @@ -246,7 +211,7 @@ RECAPTCHA_PUBLIC_KEY = None RECAPTCHA_PRIVATE_KEY = None # Key for IPHub service for Closedverse, which detects proxies. -IPHUB_KEY = "" +IPHUB_KEY = None # If this is set to True, then users will receive an error # upon trying to sign up for the site behind a proxy. # Uses IPHub service and requires an API key defined above. @@ -282,25 +247,17 @@ invite_only = False # Minimum level required to view IP addresses and user agents. (default: 10) # Mods under this level will still be able to manage users, however will not be able to view any sensitive data. -min_lvl_metadata_perms = 100 +# Set this to 0 to prevent anyone from viewing data. +min_lvl_metadata_perms = 0 -# if someone's level is equal or above this, they can edit most community on your clone. +# if someone's level is equal or above this, they can edit the most communities on your clone. level_needed_to_man_communities = 5 # if someone's level is equal or above this, they can edit any user with a lower level on your clone. level_needed_to_man_users = 5 -<<<<<<< Updated upstream -# file size limits in megabytes! only applies when using the community tools. -max_icon_size = .5 -max_banner_size = 1 +# minimum_password_length is removed as the AUTH_PASSWORD_VALIDATORS work as of 08/2023 -# The minimum length required for a user's password. This is to save the users from themselves in the event of a data breach. The longer and more complex the password is, the harder it is to be cracked. (default: 7) -# This will definitely miss a few people off who just want to sign up without worrying about long passwords. -minimum_password_length = 7 - -======= ->>>>>>> Stashed changes # The hard limit for uploading, Will cause an error if this is exceeded. This is set to 15MB by default (15728640) DATA_UPLOAD_MAX_MEMORY_SIZE = 52428800 @@ -323,7 +280,8 @@ memo_msg = """

Cedar

what

Why is this person rehosting it?

-

im bored

""" +

im bored

+""" # This option enables some production-specific pages # and routines, such as HTTPS scheme redirection and diff --git a/closedverse_main/admin.py b/closedverse_main/admin.py index 445bb3e..9dd48d8 100644 --- a/closedverse_main/admin.py +++ b/closedverse_main/admin.py @@ -21,12 +21,12 @@ class UserForm(ModelForm): 'password': PasswordInput(), } """ -@admin.action(description='Hide selected items') -def Hide_Memo(modeladmin, request, queryset): - queryset.update(show = False) -@admin.action(description='Show selected items') -def Show_Memo(modeladmin, request, queryset): - queryset.update(show = True) +@admin.action(description='Void selected Invites') +def Void_invite(modeladmin, request, queryset): + queryset.update(void = True) +@admin.action(description='Restore selected Invites') +def Restore_invite(modeladmin, request, queryset): + queryset.update(void = False, used = False) @admin.action(description='Hide selected items') def Hide_content(modeladmin, request, queryset): queryset.update(is_rm = True) @@ -60,7 +60,7 @@ def Enable_user(modeladmin, request, queryset): class UserAdmin(admin.ModelAdmin): - search_fields = ('id', 'unique_id', 'username', 'nickname', 'email', ) + search_fields = ('id', 'username', 'nickname', 'email', ) list_display = ('id', 'username', 'nickname', 'warned', 'level', 'staff', 'active', ) exclude = ('addr', 'signup_addr', 'password', ) actions = [Disable_user, Enable_user] @@ -68,20 +68,27 @@ class UserAdmin(admin.ModelAdmin): # Not yet #form = UserForm class ProfileAdmin(admin.ModelAdmin): - search_fields = ('id', 'unique_id', 'origin_id', ) - raw_id_fields = ('user', 'favorite', ) - list_display = ('id', 'user', 'comment', 'let_freedom', ) + search_fields = ('id', 'user__username__icontains', 'comment', 'origin_id',) + raw_id_fields = ('user', 'favorite',) + list_display = ('id', 'user', 'comment', 'let_freedom',) + +class InvitesAdmin(admin.ModelAdmin): + search_fields = ('creator__username', 'used_by__username', 'code', ) + raw_id_fields = ('creator', 'used_by', ) + list_display = ('creator', 'used_by', 'code', 'used', 'void', ) + actions = [Void_invite, Restore_invite] class ComplaintAdmin(admin.ModelAdmin): - search_fields = ('id', 'unique_id', 'body', ) + search_fields = ('id', 'body', ) raw_id_fields = ('creator', ) + class ConversationAdmin(admin.ModelAdmin): - search_fields = ('id', 'unique_id', ) + search_fields = ('id', ) raw_id_fields = ('source', 'target', ) class PostAdmin(admin.ModelAdmin): raw_id_fields = ('creator', 'poll', ) - search_fields = ('id', 'unique_id', 'body', 'creator__username', ) + search_fields = ('id', 'body', 'creator__username', ) list_display = ('id', 'creator', 'body', 'is_rm', ) actions = [Hide_content, Show_content, Disable_comments, Enable_comments] def get_queryset(self, request): @@ -89,7 +96,7 @@ class PostAdmin(admin.ModelAdmin): class CommentAdmin(admin.ModelAdmin): raw_id_fields = ('creator', 'original_post', ) - search_fields = ('id', 'unique_id', 'body', 'creator__username', ) + search_fields = ('id', 'body', 'creator__username', ) list_display = ('id', 'creator', 'body', 'original_post', 'is_rm', ) actions = [Hide_content, Show_content] def get_queryset(self, request): @@ -98,45 +105,42 @@ class CommentAdmin(admin.ModelAdmin): class CommunityAdmin(admin.ModelAdmin): raw_id_fields = ('creator', ) list_display = ('id', 'name', 'description', 'type', 'creator', 'popularity', 'is_rm', 'is_feature', 'require_auth') - search_fields = ('id', 'unique_id', 'name', 'description', ) + search_fields = ('id', 'name', 'description', ) actions = [Hide_content, Show_content, Feature_community, Unfeature_community, force_login, unforce_login] def get_queryset(self, request): return models.Community.real.get_queryset() class MessageAdmin(admin.ModelAdmin): raw_id_fields = ('creator', 'conversation', ) - search_fields = ('id', 'unique_id', 'body', 'creator__username', ) + search_fields = ('id', 'body', 'creator__username', ) list_display = ('id', 'creator', 'conversation', 'body', ) actions = [Hide_content, Show_content] def get_queryset(self, request): return models.Message.real.get_queryset() class NotificationAdmin(admin.ModelAdmin): - raw_id_fields = ('to', 'source', 'context_post', 'context_comment', ) - search_fields = ('unique_id', ) - list_display = ('id', 'to', 'source', 'context_post', 'context_comment', ) + raw_id_fields = ('to', 'source', 'context_post', 'context_comment',) + search_fields = ('to__username', 'source__username', 'context_post__body', 'context_comment__body',) + list_display = ('id', 'to', 'source', 'context_post', 'context_comment',) class AuditAdmin(admin.ModelAdmin): - raw_id_fields = ('by', 'user', 'post', 'comment', 'reversed_by', ) - search_fields = ('by__username', 'user__username', ) + raw_id_fields = ('by', 'user', 'post', 'comment', 'community', 'reversed_by', ) + search_fields = ('by__username', 'user__username', 'post__body', 'comment__body', 'community__name', ) class AdsAdmin(admin.ModelAdmin): - raw_id_fileds = ('id', 'created', 'url', 'imageurl') - -class InvitesAdmin(admin.ModelAdmin): - raw_id_fileds = ('id', 'created', 'creator') + raw_id_fileds = ('id', 'created', 'url', 'imageurl') class YeahAdmin(admin.ModelAdmin): - raw_id_fields = ('by', 'post', 'comment', ) - list_display = ('by', 'post', 'comment', ) - search_fields = ('by__username', 'post__body', 'comment__body', ) + raw_id_fields = ('by', 'post', 'comment', ) + list_display = ('by', 'post', 'comment', ) + search_fields = ('by__username', 'post__body', 'comment__body', ) class HistoryAdmin(admin.ModelAdmin): - raw_id_fields = ('user',) - list_display = ('id', 'user') + raw_id_fields = ('user',) + list_display = ('id', 'user') class RoleAdmin(admin.ModelAdmin): - exclude = ('is_static', ) + exclude = ('is_static', ) #class BlockAdmin(admin.ModelAdmin) @@ -145,11 +149,13 @@ admin.site.unregister(Group) admin.site.register(models.Role, RoleAdmin) admin.site.register(models.User, UserAdmin) admin.site.register(models.Profile, ProfileAdmin) +admin.site.register(models.Invites, InvitesAdmin) admin.site.register(models.Community, CommunityAdmin) admin.site.register(models.Complaint, ComplaintAdmin) admin.site.register(models.Message, MessageAdmin) admin.site.register(models.Conversation, ConversationAdmin) admin.site.register(models.Notification, NotificationAdmin) +#admin.site.register(models.LoginAttempt, LoginAdmin) admin.site.register(models.UserBlock) admin.site.register(models.AuditLog, AuditAdmin) admin.site.register(models.ProfileHistory, HistoryAdmin) @@ -157,17 +163,9 @@ admin.site.register(models.ProfileHistory, HistoryAdmin) admin.site.register(models.Post, PostAdmin) admin.site.register(models.Comment, CommentAdmin) -<<<<<<< Updated upstream -admin.site.register(models.Ads, AdsAdmin) -admin.site.register(models.welcomemsg, WelcomemsgAdmin) -admin.site.register(models.Yeah, YeahAdmin) -admin.site.register(models.Follow) -admin.site.register(models.FriendRequest) -admin.site.register(models.Friendship, ConversationAdmin) -admin.site.register(models.Invites, InvitesAdmin) -admin.site.register(models.Poll) -admin.site.register(models.PollVote) -======= + +admin.site.register(models.Ban) +admin.site.register(models.Warning) if settings.DEBUG: admin.site.register(models.Yeah) @@ -178,4 +176,3 @@ if settings.DEBUG: admin.site.register(models.Poll) admin.site.register(models.PollVote) admin.site.register(models.Ads, AdsAdmin) ->>>>>>> Stashed changes diff --git a/closedverse_main/forms.py b/closedverse_main/forms.py index 6ccdc3d..e5a4260 100644 --- a/closedverse_main/forms.py +++ b/closedverse_main/forms.py @@ -1,6 +1,9 @@ from django import forms from .models import * +from django.contrib.auth.password_validation import validate_password from django.core.exceptions import ValidationError +from django.utils.timezone import timedelta +from closedverse import settings # I do want to move each and every form over to here. Not only will this trivialize making new forms, this will also make it more secure or something. class CommunitySettingForm(forms.ModelForm): @@ -20,21 +23,62 @@ class CommunitySettingForm(forms.ModelForm): 'community_icon', 'community_banner' ) - + +class Settomgs_Change_Password(forms.Form): + Old_Password = forms.CharField(widget=forms.PasswordInput(attrs={'class': 'auth-input', 'placeholder': 'Old Password'})) + New_Password = forms.CharField(widget=forms.PasswordInput(attrs={'class': 'auth-input', 'placeholder': 'New Password'})) + Confirm_Password = forms.CharField(widget=forms.PasswordInput(attrs={'class': 'auth-input', 'placeholder': 'Confirm Password'})) + + def clean(self): + cleaned_data = super().clean() + old = cleaned_data.get('Old_Password') + new = cleaned_data.get('New_Password') + confirm = cleaned_data.get('Confirm_Password') + if not old or not new or not confirm: + raise forms.ValidationError('Please fill out all the fields.') + if old == new: + raise forms.ValidationError('The old password and new password can\'t be the same.') + if new != confirm: + raise forms.ValidationError('Passwords do not match.') + try: + validate_password(new) + except forms.ValidationError as error: + raise forms.ValidationError("your password fucking sucks!") + return cleaned_data class PurgeForm(forms.Form): purge_posts = forms.BooleanField(required=False, label='Purge all posts', help_text='Purge all posts from this user.') purge_comments = forms.BooleanField(required=False, label='Purge all comments', help_text='Purge all comments from this user.') restore_all = forms.BooleanField(required=False, label='Restore purged content', help_text='Restore everything that was purged, this will not apply to posts deleted manually.') -class UserForm(forms.ModelForm): +class LoginForm(forms.Form): + username = forms.CharField(max_length=255, widget=forms.TextInput(attrs={'class': 'auth-input', 'placeholder': 'Username'})) + password = forms.CharField(widget=forms.PasswordInput(attrs={'class': 'auth-input', 'placeholder': 'Password'})) + + def clean(self): + cleaned_data = super(LoginForm, self).clean() + username = cleaned_data.get('username') + password = cleaned_data.get('password') + + user = User.objects.authenticate(username=username, password=password) + + if user is None: + raise forms.ValidationError("The user doesn't exist.") + elif user[1] == False: + raise forms.ValidationError("Invalid password.", code='invalid') + elif user[1] == 2: + raise forms.ValidationError("This account's password needs to be reset. Contact an admin or reset by email.", code='required_reset') + elif not user[0].is_active(): + raise forms.ValidationError("This account was disabled.", code='disabled') + return cleaned_data + +class User_tools_Form(forms.ModelForm): username = forms.CharField(max_length = 64, required = True, help_text = 'Usernames are used when signing in, so be sure to let this user know if you change this.') - c_tokens = forms.IntegerField(min_value = 0, max_value = 100, required = False, help_text = 'The remaining C-Tokens this user has.') - has_mh = forms.BooleanField(required = False, label='Use Mii', help_text='Don\'t fuck with this please.') - avatar = forms.CharField(required = False, help_text = 'If \"Use Mii\" is turned on, The Mii ID should reside here, otherwise any good old URL will do.') + has_mh = forms.BooleanField(required = False, label='Use Mii', help_text='Turn this on to use Mii Hashes instead of normal profile pictures.') + avatar = forms.CharField(required = False, help_text = 'If \"Use Mii\" is turned on, The Mii Hash should reside here, otherwise any good old URL will do.') class Meta: model = User - fields = ['username', 'nickname', 'role', 'c_tokens', 'hide_online', 'active', 'can_invite', 'warned', 'has_mh', 'avatar', 'warned_reason'] + fields = ['username', 'nickname', 'role', 'c_tokens', 'hide_online', 'active', 'can_invite', 'has_mh', 'avatar'] def clean_username(self): username = self.cleaned_data.get('username') @@ -42,11 +86,43 @@ class UserForm(forms.ModelForm): raise forms.ValidationError("The username contains invalid characters.") return username - -class ProfileForm(forms.ModelForm): +class Profile_tools_Form(forms.ModelForm): # applying classes is super weird. comment = forms.CharField(required=False, widget=forms.Textarea(attrs={'class': 'textarea'})) let_freedom = forms.BooleanField(required=False, label='Let this user upload images?', help_text='If you disable this, This user will not be able to post images, videos or make a new account.') class Meta: model = Profile - fields = ['comment', 'country', 'whatareyou', 'weblink', 'external', 'let_freedom', 'limit_post', 'cannot_edit', 'pronoun_is', 'id_visibility', 'let_friendrequest', 'yeahs_visibility', 'comments_visibility'] \ No newline at end of file + fields = ['comment', 'country', 'whatareyou', 'weblink', 'external', 'let_freedom', 'limit_post', 'cannot_edit'] + +class Give_warning_form(forms.ModelForm): + reason = forms.CharField(required=True, widget=forms.Textarea(attrs={'class': 'textarea'})) + # Super simple, does not need to be it's own form but whatever. + class Meta: + model = Warning + fields = ['reason'] + +class Give_Ban_Form(forms.ModelForm): + BAN_OPTIONS = [ + (1, '1 Day'), + (2, '2 Days'), + (3, '3 Days'), + (7, '1 Week'), + (14, '2 Weeks'), + (30, '1 Month'), + (60, '2 Months'), + (365, '1 Year'), + (None, 'Forever'), + ] + # In the future we can add options for IP bans and shit. + reason = forms.CharField(required=True, widget=forms.Textarea(attrs={'class': 'textarea'})) + expiry_date = forms.ChoiceField(required=False, choices=BAN_OPTIONS, initial=1) + + def clean_expiry_date(self): + expiry_choice = self.cleaned_data['expiry_date'] + if expiry_choice: + return timezone.now() + timedelta(days=int(expiry_choice)) + else: + return timezone.now() + timedelta(days=365.25*100) # same exact thing done in indigo. + class Meta: + model = Ban + fields = ['reason', 'expiry_date'] \ No newline at end of file diff --git a/closedverse_main/middleware.py b/closedverse_main/middleware.py index 88a3927..20554b0 100644 --- a/closedverse_main/middleware.py +++ b/closedverse_main/middleware.py @@ -2,6 +2,8 @@ from django.http import HttpResponseForbidden from closedverse import settings from django.shortcuts import redirect from django.contrib.auth import logout +from .models import Ban +from django.utils import timezone from re import compile # Taken from https://python-programming.com/recipes/django-require-authentication-pages/ @@ -10,6 +12,31 @@ if settings.FORCE_LOGIN: if hasattr(settings, 'LOGIN_EXEMPT_URLS'): EXEMPT_URLS += [compile(expr) for expr in settings.LOGIN_EXEMPT_URLS] +class CheckForBanMiddleware: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + response = self.get_response(request) + return response + + def process_view(self, request, view_func, view_args, view_kwargs): + + # If the user is not authenticated, there's no need to check for bans + if not request.user.is_authenticated: + return None + + # Get one active ban that is not expired + active_ban = Ban.objects.filter( + to=request.user, + active=True, + expiry_date__gte=timezone.now() + ).first() + + if active_ban: + return HttpResponseForbidden('You are banned from this site. Reason: ' + active_ban.reason) + return None + class ClosedMiddleware(object): def __init__(self, get_response): self.get_response = get_response diff --git a/closedverse_main/models.py b/closedverse_main/models.py index 6ce19e6..5173edf 100644 --- a/closedverse_main/models.py +++ b/closedverse_main/models.py @@ -42,13 +42,12 @@ class UserManager(BaseUserManager): user.save(using=self._db) return user - def closed_create_user(self, username, password, email, addr, signup_addr, user_agent, nick, nn, gravatar): + def closed_create_user(self, username, password, email, addr, signup_addr, nick, nn, gravatar): user = self.model( username = username, nickname = util.filterchars(nick), addr = addr, signup_addr = signup_addr, - user_agent = user_agent, email = email, ) profile = Profile.objects.model() @@ -125,7 +124,7 @@ class Role(models.Model): id = models.AutoField(primary_key=True) # determines whether to fetch role from static or media, for built-in roles is_static = models.BooleanField(default=False) - image = models.ImageField(upload_to='roles/', max_length=100, help_text='Upload an icon that will show on the top right of one\'s profile.') + image = models.ImageField(upload_to='roles/', max_length=100, help_text='Upload an icon that will show on the top left of one\'s profile. A 22x22 image works best!') organization = models.CharField(max_length=255, blank=True, null=True, help_text='Text that shows above one\'s username') def __str__(self): @@ -143,39 +142,26 @@ class User(AbstractBaseUser): nickname = models.CharField(max_length=64, null=True) password = models.CharField(max_length=128) email = models.EmailField(null=True, blank=True, default='') - has_mh = models.BooleanField(default=False) + has_mh = models.BooleanField(default=False, help_text='Don\'t touch this. This is if the user\'s avatar is set to a Mii.') avatar = models.CharField(max_length=1200, blank=True, default='') theme = ColorField(blank=True, null=True) # LEVEL: 0-1 is default, everything else is just levels - level = models.SmallIntegerField(default=0) - # ROLE: This doesn't have anything -<<<<<<< Updated upstream - role = models.SmallIntegerField(default=0, choices=((0, 'normal'), (1, 'bot'), (2, 'administrator'), (3, 'moderator'), (4, 'openverse'), (5, 'donator'), (6, 'cool'), (7, 'urapp'), (8, 'owner'), (9, 'badgedes'), (10, 'jack'), (11, 'verified'),)) -======= - #role = models.SmallIntegerField(default=0, choices=((0, 'normal'), (1, 'bot'), (2, 'administrator'), (3, 'moderator'), (4, 'openverse'), (5, 'donator'), (6, 'cool'), (7, 'urapp'), (8, 'owner'), (9, 'badgedes'), (10, 'jack'), (11, 'verified'),)) + level = models.SmallIntegerField(default=0, help_text='The rank of the user, \"0\" is by default. Users with a high enough rank will be able to manage users.') role = models.ForeignKey(Role, blank=True, null=True, on_delete=models.SET_NULL, help_text='This will show a funny badge and text on this user\'s profile. This does not grant the user any additional power and is only visual.') ->>>>>>> Stashed changes addr = models.CharField(max_length=64, null=True, blank=True) signup_addr = models.CharField(max_length=64, null=True, blank=True) - user_agent = models.TextField(null=True, blank=True) # C Tokens are things that let you make communities and shit. -<<<<<<< Updated upstream - c_tokens = models.IntegerField(default=1) - protect_data = models.BooleanField(default=False) -======= c_tokens = models.IntegerField(default=1, help_text='How many communities should this user be allowed to make?') - protect_data = models.BooleanField(default=False, null=True, help_text='Prevent people from lookin\' at private data for this user.') ->>>>>>> Stashed changes # Things that don't have to do with auth lol - hide_online = models.BooleanField(default=False) + hide_online = models.BooleanField(default=False, help_text='If this is ticked, the user has opted to hide their online status.') color = ColorField(default='', null=True, blank=True) - staff = models.BooleanField(default=False) - active = models.BooleanField(default=True) - can_invite = models.BooleanField(default=True) - warned = models.BooleanField(default=False) - warned_reason = models.CharField(blank=True, null=True, max_length=600) + staff = models.BooleanField(default=False, help_text='Allow this user to access the admin panel you\'re using right now?') + active = models.BooleanField(default=True, help_text='If this is off, the user is basically banned and can\'t do shit here') + can_invite = models.BooleanField(default=True, help_text='Can this user invite new users? This does not matter unless the invite system is turned on.') + warned = models.BooleanField(default=False, help_text='Shows an annoying fucking warning box on the front page.') + warned_reason = models.CharField(blank=True, null=True, max_length=600, help_text='This string will show if the user is banned, or warned.') bg_url = models.CharField(max_length=300, null=True, blank=True) is_anonymous = False @@ -209,12 +195,6 @@ class User(AbstractBaseUser): return self.warned def get_warned_reason(self): return self.warned_reason - """ - def set_password(self, raw_password): - self.password = bcrypt_sha256.using(rounds=13).hash(raw_password) - def check_password(self, raw_password): - return bcrypt_sha256.using(rounds=13).verify(raw_password, hash=self.password) - """ def profile(self, thing=None): # If thing is specified, that field is retrieved if thing: @@ -236,6 +216,8 @@ class User(AbstractBaseUser): except: return None return infodecode[0] + def unread_warning(self): + return Notification.objects.filter(type=5, to=self, read=False).exists() def has_plain_avatar(self): if not self.has_mh and '/' in self.avatar and not 'gravatar.com' in self.avatar: return True @@ -261,25 +243,8 @@ class User(AbstractBaseUser): return int(limit) - recent_posts def get_class(self): - """ - first = { - 1: '/s/img/bot.png', - 2: '/s/img/administrator.png', - 3: '/s/img/moderator.png', - 9: '/s/img/badgedes.png', - }.get(self.role, '') - second = { - 1: "Bot", - 2: "Administrator", - 3: "Moderator", - 9: "Badge Designer", - }.get(self.role, '') - """ - #if first: - # first = 'official ' + first if not self.role: return [None, None] - #first = self.role.image second = self.role.organization first = self.role.image.url if self.role.is_static: @@ -429,7 +394,7 @@ class User(AbstractBaseUser): def notification_read(self): return self.notification_to.filter(read=False).update(read=True) def get_notifications(self): - return self.notification_to.select_related('context_post').select_related('context_comment').select_related('source').filter().order_by('-latest')[0:64] + return self.notification_to.select_related('context_post').select_related('context_comment').select_related('context_warning').select_related('source').filter().order_by('-latest')[0:64] def notifications_clean(self): """ Broken - gives OperationError on MySQL notif_get = self.notification_to.all().values_list('id', flat=True) @@ -616,7 +581,44 @@ class User(AbstractBaseUser): except: return False return user - + +# This will be a fucking pain in the ass! +class Ban(models.Model): + id = models.AutoField(primary_key=True) + created = models.DateTimeField(auto_now_add=True) + by = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE, related_name='banned_by') + to = models.ForeignKey(User, on_delete=models.CASCADE, related_name='banned_user') + reason = models.TextField(null=True, blank=True) + expiry_date = models.DateTimeField(help_text='The date and time on which this ban will expire, Set this way off into the future if this ban should be permanent') + active = models.BooleanField(default=True, help_text='Untick this to disable this ban') + + def is_expired(self): + if timezone.now() > self.expiry_date: + return True + return False + def __str__(self): + return "Ban for " + str(self.to) + +# The new warning system, Warnings do not contribute to bans, they just show as warnings. +# Can also be used as a means of reporting incident history. +class Warning(models.Model): + id = models.AutoField(primary_key=True) + created = models.DateTimeField(auto_now_add=True) + by = models.ForeignKey(User, on_delete=models.CASCADE, related_name='Warned_by', help_text="This is not shown to the recipient") + to = models.ForeignKey(User, on_delete=models.CASCADE, related_name='Warned_user') + reason = models.TextField(null=True, blank=True) + + def save(self, *args, **kwargs): + # check if the object is being created or updated + is_new = self.pk is None + super().save(*args, **kwargs) + # create new notification only after new warning is created + if is_new: + Notification.give_notification(user=self.by, type=5, to=self.to, warning=self) + + def __str__(self): + return "Warning for " + str(self.to) + # An invite system, for closed off communities or for whatever reason. class Invites(models.Model): id = models.AutoField(primary_key=True) @@ -640,21 +642,20 @@ class Invites(models.Model): class Community(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) - description = models.TextField(blank=True, default='') - ico = models.ImageField(upload_to='icon/%y/%m/%d/', max_length=100, blank=True, null=True) - banner = models.ImageField(upload_to='banner/%y/%m/%d/', max_length=100, blank=True, null=True) + description = models.TextField(blank=True) + ico = models.ImageField(null=True, blank=True) + banner = models.ImageField(null=True, blank=True) # Type: 0 - general, 1 - game, 2 - special - type = models.SmallIntegerField(default=0, choices=((0, 'General'), (1, 'Game'), (2, 'Special'), (3, 'User Community'), (4, 'Hide'))) - # Platform - 0/none, 1/3DS, 2/Wii U, 3/both + type = models.SmallIntegerField(default=0, help_text='The category the community belongs in, setting this to None will remove the community.', choices=((0, 'General'), (1, 'Game'), (2, 'Special'), (3, 'User Community'), (4, 'Hide'))) platform = models.SmallIntegerField(default=0, choices=((0, 'none'), (1, '3ds'), (2, 'wii u'), (3, 'switch'), (4, 'both'), (5, 'PC'), (6, 'Xbox'), (7, 'Playstation'))) - tags = models.CharField(blank=True, null=True, max_length=255, choices=(('announcements', 'main announcement community'), ('changelog', 'main changelog'), ('activity', 'Activity Feed posting community'), ('general', 'General Discussion Community'))) + tags = models.CharField(blank=True, help_text='Provides special functionality for specific communities.', null=True, max_length=255, choices=(('announcements', 'main announcement community'), ('changelog', 'main changelog'), ('activity', 'Activity Feed posting community'), ('general', 'General Discussion Community'))) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) - is_rm = models.BooleanField(default=False) - is_feature = models.BooleanField(default=False) - require_auth = models.BooleanField(default=False) - rank_needed_to_post = models.IntegerField(default=0) - creator = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE) + is_rm = models.BooleanField(default=False, help_text='Tick this on to remove the community.') + is_feature = models.BooleanField(default=False, help_text='Feature this community on the front page where everyone can see it.') + require_auth = models.BooleanField(default=False, help_text='Force your users to sign in to view this community.') + rank_needed_to_post = models.IntegerField(default=0, help_text='Make admin only communities.') + creator = models.ForeignKey(User, blank=True, null=True, help_text='Who owns this community? It\'s highly recommended to not fill this on for general communities. Keep in mind that owners can block others from using communities they own.', on_delete=models.CASCADE) objects = PostManager() real = models.Manager() @@ -668,7 +669,7 @@ class Community(models.Model): def __str__(self): return self.name def icon(self): - if self.ico and hasattr(self.ico, 'url'): + if self.ico: return self.ico.url else: return settings.STATIC_URL + "img/title-icon-default.png" @@ -802,6 +803,8 @@ class Community(models.Model): return 6 if not request.user.is_active(): return 6 + if request.user.unread_warning(): + return 13 if len(request.POST['body']) > 2200 or (len(request.POST['body']) < 1 and not request.POST.get('_post_type') == 'painting'): return 1 upload = None @@ -866,14 +869,14 @@ class Post(models.Model): url = models.URLField(max_length=1200, null=True, blank=True, default='') spoils = models.BooleanField(default=False) disable_yeah = models.BooleanField(default=False) - lock_comments = models.SmallIntegerField(default=0, choices=((0, 'Not locked'), (1, 'Locked by user'), (2, 'Locked by mod'))) + lock_comments = models.SmallIntegerField(default=0, choices=((0, 'Not locked'), (1, 'Locked by user'), (2, 'Locked by mod')), help_text='People will not be able to comment on posts that are locked.') created = models.DateTimeField(auto_now_add=True) edited = models.DateTimeField(auto_now=True) - befores = models.TextField(null=True, blank=True) - poll = models.ForeignKey('Poll', null=True, blank=True, on_delete=models.CASCADE) + befores = models.TextField(null=True, blank=True, help_text='If this post gets edited, the old body will be here.') + poll = models.ForeignKey('Poll', null=True, blank=True, on_delete=models.CASCADE, help_text='A busted ass poll feature that does not work.') has_edit = models.BooleanField(default=False) - is_rm = models.BooleanField(default=False) - status = models.SmallIntegerField(default=0, choices=post_status) + is_rm = models.BooleanField(default=False, help_text='Tick this to hide this post') + status = models.SmallIntegerField(default=0, choices=post_status, help_text='Used to distinguish how a post was removed. Our purging feature uses this to determine what posts to restore and what not to.') creator = models.ForeignKey(User, on_delete=models.CASCADE) objects = PostManager() @@ -1044,6 +1047,8 @@ class Post(models.Model): return 6 if len(request.POST['body']) > 2200 or (len(request.POST['body']) < 1 and not request.POST.get('_post_type') == 'painting'): return 1 + if request.user.unread_warning(): + return 13 upload = None drawing = None if request.FILES.get('screen'): @@ -1145,8 +1150,8 @@ class Comment(models.Model): edited = models.DateTimeField(auto_now=True) befores = models.TextField(null=True, blank=True) has_edit = models.BooleanField(default=False) - is_rm = models.BooleanField(default=False) - status = models.SmallIntegerField(default=0, choices=post_status) + is_rm = models.BooleanField(default=False, help_text='Tick this to hide this comment') + status = models.SmallIntegerField(default=0, choices=post_status, help_text='Used to distinguish how a comment was removed. Our purging feature uses this to determine what comments to restore and what not to.') creator = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE) objects = PostManager() @@ -1278,8 +1283,8 @@ class Profile(models.Model): #birthday = models.DateField(null=True, blank=True) id_visibility = models.SmallIntegerField(default=0, choices=visibility) - pronoun_is = models.IntegerField(default=0, choices=( - (0, "I don't know"), (1, "He/him"), (2, "She/her"), (3, "He/she"), (4, "It"), (5, "They/Them") + pronoun_is = models.IntegerField(default=0, help_text='haha attack helicopter.', choices=( + (0, "Not specified"), (1, "He/him"), (2, "She/her"), (3, "He/she"), (4, "It"), (5, "They/Them") )) let_friendrequest = models.SmallIntegerField(default=0, choices=visibility) @@ -1292,11 +1297,11 @@ class Profile(models.Model): favorite = models.ForeignKey(Post, blank=True, null=True, on_delete=models.SET_NULL) let_yeahnotifs = models.BooleanField(default=True) - let_freedom = models.BooleanField(default=True) + let_freedom = models.BooleanField(default=True, help_text='Restrict this user from posting images, videos, URLs, and even making new accounts.') # Todo: When you see this, implement it; make it a bool that determines whether the user should be able to edit their avatar; if this is true and #let_avatar = models.BooleanField(default=False) # Post limit, 0 for none - limit_post = models.SmallIntegerField(default=0) + limit_post = models.SmallIntegerField(default=0, help_text='Great for spammers, set to \"0\" to remove the restriction.') # If this is true, the user can't change their avatar or nickname cannot_edit = models.BooleanField(default=False, help_text='Make it so this user cannot change settings.') email_login = models.SmallIntegerField(default=1, choices=((0, 'Do not allow'), (1, 'Okay'), (2, 'Only allow'))) @@ -1389,11 +1394,12 @@ class Notification(models.Model): (2, 'Comment on my post'), (3, 'Comment on others\' post'), (4, 'Follow to me'), - (5, 'New Announcement'), + (5, 'Warning received'), )) merges = models.TextField(blank=True, default='') context_post = models.ForeignKey(Post, null=True, blank=True, on_delete=models.CASCADE) context_comment = models.ForeignKey(Comment, null=True, blank=True, on_delete=models.CASCADE) + context_warning = models.ForeignKey(Warning, null=True, blank=True, on_delete=models.CASCADE) created = models.DateTimeField(auto_now_add=True) latest = models.DateTimeField(auto_now=True) @@ -1401,6 +1407,8 @@ class Notification(models.Model): def __str__(self): return "Notification from " + str(self.source) + " to " + str(self.to) + " with type \"" + self.get_type_display() + "\"" def url(self): + if self.type == 5: + return None what_type = { 0: 'main:post-view', 1: 'main:comment-view', @@ -1462,11 +1470,13 @@ class Notification(models.Model): self.source.is_following = False # In the future, please put giving notifications for classes into their respective classes (right now they're in views) @staticmethod - def give_notification(user, type, to, post=None, comment=None): + def give_notification(user, type, to, post=None, comment=None, warning=None): # Just keeping this simple for now, might want to make it better later # If the user sent a notification to this user at least 5 seconds ago, return False # Or if user is to # Or if yeah notifications are off and this is a yeah notification + if type == 5: + return user.notification_sender.create(type=type, to=to, context_warning=warning) user_is_self_unk = (not type == 3 and user == to) is_notification_too_fast = (user.notification_sender.filter(created__gt=timezone.now() - timedelta(seconds=5), type=type).exclude(type=4) and not type == 3) user_no_yeahnotif = (not to.let_yeahnotifs() and (type == 0 or type == 1)) @@ -1606,6 +1616,8 @@ class Conversation(models.Model): return 3 if len(request.POST['body']) > 50000 or (len(request.POST['body']) < 1 and not request.POST.get('_post_type') == 'painting'): return 1 + if request.user.unread_warning(): + return 4 upload = None drawing = None if request.FILES.get('screen'): @@ -1771,10 +1783,11 @@ class UserBlock(models.Model): class AuditLog(models.Model): id = models.AutoField(primary_key=True) created = models.DateTimeField(auto_now_add=True) - type = models.SmallIntegerField(choices=((0, "Post delete"), (1, "Comment delete"), (2, "User edit"), (3, "Disable comments"), (4, "User delete"), (5, "Image delete"), (6, "Purge 1"), (7, "Purge 2"), (8, "Purge 3"), (9, "Purge 4"), (10, "Purge 5"), (11, "Un-purge 1"), (12, 'Changed server settings'), )) + type = models.SmallIntegerField(choices=((0, "Post delete"), (1, "Comment delete"), (2, "User edit"), (3, "Disable comments"), (4, "Community edit"), )) post = models.ForeignKey(Post, related_name='audit_post', null=True, on_delete=models.CASCADE) comment = models.ForeignKey(Comment, related_name='audit_comment', null=True, on_delete=models.CASCADE) user = models.ForeignKey(User, related_name='audit_user', null=True, on_delete=models.CASCADE) + community = models.ForeignKey(Community, related_name='audit_community', null=True, on_delete=models.CASCADE) reasoning = models.TextField(null=True, blank=True, default="") by = models.ForeignKey(User, related_name='audit_by', on_delete=models.CASCADE) reversed_by = models.ForeignKey(User, null=True, related_name='audit_reverse_by', on_delete=models.CASCADE) diff --git a/closedverse_main/templates/closedverse_main/change-password.html b/closedverse_main/templates/closedverse_main/change-password.html index de81a5e..4885285 100644 --- a/closedverse_main/templates/closedverse_main/change-password.html +++ b/closedverse_main/templates/closedverse_main/change-password.html @@ -4,21 +4,12 @@

Change password

-
+

You can change your password here

-
  • -

    Old Password:

    -
    - -
    -

    New Password:

    -
    - -
    -

    Confirm Password:

    -
    - -
    +
  • + {% for field in form %} +

    {{ field }}

    + {% endfor %}
    • {% csrf_token %}
    diff --git a/closedverse_main/templates/closedverse_main/community_all.html b/closedverse_main/templates/closedverse_main/community_all.html index c2e4b15..f6b2160 100644 --- a/closedverse_main/templates/closedverse_main/community_all.html +++ b/closedverse_main/templates/closedverse_main/community_all.html @@ -4,15 +4,15 @@
    -

    Community creation Q&A

    +

    Community creation

    Why?

    -

    I have no idea, I guess it's cool to have. You can have your own little corner of this site now...

    -

    What can I do with my own community?

    -

    You can edit it, and that's basically it.

    +

    Maybe there's a community that's missing which should be here, or you just want a corner of the site to call your own.

    +

    How can I make my own community?

    +

    Assuming you haven't already made one, A button should be visible below that will allow you to create a community. Don't worry, you'll be able to set the icon and banner when editing a community after it has been made. Just keep in mind that creating inappropriate, or shitty communities can result in them getting taken down, if this does happen you will not be refunded your C-Token, and you're shit out of luck.

    What are C-Tokens, and how do I get them?

    -

    Community tokens are a stupid and overcomplicated method of preventing 200,000 communities from being made by one person. You get one when signing up, and you can use it to make your own community. Please do not ask staff for more C-Tokens unless you believe the communities you are going to make are really that good.

    -

    Any future plans?

    -

    no

    +

    Community tokens are a stupid and overcomplicated method of preventing a bunch of communities from being made by one person. You get one when signing up, and you can use it to make your own community. Please do not ask staff for more C-Tokens, you probably won't be given any, and let's be honest here, one community is enough for one person.

    +

    Okay great... Now what can I do with my community?

    +

    Whatever you want, really... So long as your community isn't so shitty that we take it down. You are able to edit your community, set your banner, icon and whatnot. And you can ban people from posting and replying in your community if you block someone. Just keep in mind that blocks work both ways, they cannot fuck with you, nor can you fuck with them.

    {% if request.user.c_tokens > 0 %}Create a community{% endif %}
    diff --git a/closedverse_main/templates/closedverse_main/community_list.html b/closedverse_main/templates/closedverse_main/community_list.html index c03a474..2c5b9da 100644 --- a/closedverse_main/templates/closedverse_main/community_list.html +++ b/closedverse_main/templates/closedverse_main/community_list.html @@ -7,22 +7,7 @@
    - - {% if user.is_warned and user.is_active %} -
    -

    WARNING: You have been issued a warning by an administrator. -

    - {% if user.get_warned_reason %} -

    Reason: "{{ user.get_warned_reason }}"

    - {% endif %} -
    -
    - {% endif %} {% if not user.is_active and user.is_authenticated %}

    Oops: You've been smacked by an admin. Better luck next time. @@ -44,6 +29,7 @@ {% endif %} {% if announcements and request.user.is_authenticated %} + Skip to communities

    Latest Announcements

    diff --git a/closedverse_main/templates/closedverse_main/community_tools.html b/closedverse_main/templates/closedverse_main/community_tools.html index 1594603..1dac816 100644 --- a/closedverse_main/templates/closedverse_main/community_tools.html +++ b/closedverse_main/templates/closedverse_main/community_tools.html @@ -20,23 +20,19 @@ {% if request.user.has_freedom %}
    • -<<<<<<< Updated upstream - {% endif %} -======= {% endif %} ->>>>>>> Stashed changes

  •  

    Require login: diff --git a/closedverse_main/templates/closedverse_main/community_view.html b/closedverse_main/templates/closedverse_main/community_view.html index 5852a10..e086746 100644 --- a/closedverse_main/templates/closedverse_main/community_view.html +++ b/closedverse_main/templates/closedverse_main/community_view.html @@ -1,16 +1,6 @@ {% extends "closedverse_main/layout.html" %}{% block main-body %}{% load closedverse_community %} {% community_sidebar community request %}
    - {% if user.is_warned %} -
    -

    WARNING: You have been issued a warning by an administrator. -

    - {% if user.get_warned_reason %} -

    Reason: "{{ user.get_warned_reason }}"

    - {% endif %} -
    -
    - {% endif %}

    {{ community.name }}

    {% if request.user.is_authenticated and community.post_perm %} diff --git a/closedverse_main/templates/closedverse_main/elements/discordapp-spinner.html b/closedverse_main/templates/closedverse_main/elements/discordapp-spinner.html new file mode 100644 index 0000000..53d1e9c --- /dev/null +++ b/closedverse_main/templates/closedverse_main/elements/discordapp-spinner.html @@ -0,0 +1 @@ +

    I'm loading it !

    diff --git a/closedverse_main/templates/closedverse_main/elements/file-button.html b/closedverse_main/templates/closedverse_main/elements/file-button.html index f1a04d1..7c9861a 100644 --- a/closedverse_main/templates/closedverse_main/elements/file-button.html +++ b/closedverse_main/templates/closedverse_main/elements/file-button.html @@ -16,7 +16,7 @@
    - Video MP4s and WEBMs are allowed. (50MB size limit) + Video MP4s and WEBMs are allowed.
    diff --git a/closedverse_main/templates/closedverse_main/elements/message.html b/closedverse_main/templates/closedverse_main/elements/message.html index 23b6243..6729e2b 100644 --- a/closedverse_main/templates/closedverse_main/elements/message.html +++ b/closedverse_main/templates/closedverse_main/elements/message.html @@ -8,7 +8,7 @@ {% if message.drawing %}

    {% else %} -
    {{ message.body|markdown }}
    +
    {{ message.body }}
    {% endif %} {% if message.screenshot %}
    diff --git a/closedverse_main/templates/closedverse_main/elements/user-notification.html b/closedverse_main/templates/closedverse_main/elements/user-notification.html index 7e6a790..659dad8 100644 --- a/closedverse_main/templates/closedverse_main/elements/user-notification.html +++ b/closedverse_main/templates/closedverse_main/elements/user-notification.html @@ -1,5 +1,5 @@ -{% load closedverse_tags %}
    - {% user_icon_container notification.source %} +{% load closedverse_tags %}
    + {% if not notification.type == 5 %}{% user_icon_container notification.source %}{% endif %}
    {% if notification.type == 0 %} {% print_names notification.all_users %} gave your post ({{ notification.context_post.trun|truncatechars:30 }}) a Yeah. @@ -11,6 +11,10 @@ {% print_names notification.all_users %} commented on {{ notification.source.nickname }}'s post ({{ notification.context_post.trun|truncatechars:30 }}). {% elif notification.type == 4 %} Followed by {% print_names notification.all_users %}. + {% elif notification.type == 5 %} +

    You've received a warning from an administrator!

    +{% if notification.context_warning.reason %}

    Reason: {{ notification.context_warning.reason }}

    {% endif %} +

    To avoid seeing this in the future, it's a good idea to catch up on the rules. Continuous violations of our rules may result in your account getting restricted.

    {% endif %} {% time notification.latest %} {% if notification.type == 4 and not notification.source.is_following and not notification.all_users|length > 1 %} diff --git a/closedverse_main/templates/closedverse_main/elements/user-sidebar.html b/closedverse_main/templates/closedverse_main/elements/user-sidebar.html index 559c09c..a4ce615 100644 --- a/closedverse_main/templates/closedverse_main/elements/user-sidebar.html +++ b/closedverse_main/templates/closedverse_main/elements/user-sidebar.html @@ -11,17 +11,6 @@
    {% endif %} - - {% if user.is_warned and user.is_active %} -
    -

    Notice: This user has received a warning by an administrator.

    -
    - {% if user.get_warned_reason %} -

    Reason: "{{ user.get_warned_reason }}"

    - {% endif %} -
    -
    - {% endif %}
    {% if profile.favorite.screenshot %} @@ -50,13 +39,10 @@ {% endif %} {% endif %} - {% if not has_authority and request.user.can_manage %} - - {% endif %} - {% if not general and not user.is_me and profile.can_block %} + {% if not user.is_me %}
    - + {% if profile.can_block %}{% endif %}
    {% endif %}
    @@ -124,6 +110,21 @@ {% endif %}
    + {% if not has_authority and request.user.can_manage %} +
    +
    + + User Settings + + + Warn User + + + Ban User + +
    +
    + {% endif %}
    {% if profile.comment %} diff --git a/closedverse_main/templates/closedverse_main/help/my-data.html b/closedverse_main/templates/closedverse_main/help/my-data.html index cc4abfa..b9d24ff 100644 --- a/closedverse_main/templates/closedverse_main/help/my-data.html +++ b/closedverse_main/templates/closedverse_main/help/my-data.html @@ -9,7 +9,6 @@

    General account information:

    IP address: {% if user.addr %}{{ user.addr }}{% else %}Data missing{% endif %}

    Signup IP address: {% if user.signup_addr %}{{ user.signup_addr }}{% else %}Data missing{% endif %}

    -

    User agent: {% if user.user_agent %}{{ user.user_agent }}{% else %}Data missing{% endif %}

    Rank: {% if user.staff %}You are a staff member.{% elif not user.level <= 0 %}You are a moderator. (Level {{ user.level }}){% else %}You are a regular user.{% endif %}

    My content:

    Your account has existed for {{ age }} days! During that time, we've collected:

    diff --git a/closedverse_main/templates/closedverse_main/login_page.html b/closedverse_main/templates/closedverse_main/login_page.html index cf8ec1c..00c694f 100644 --- a/closedverse_main/templates/closedverse_main/login_page.html +++ b/closedverse_main/templates/closedverse_main/login_page.html @@ -7,12 +7,18 @@

    Log In

    Sign in to access this instance of {{ brand_name }}

    {% csrf_token %} -

    +

    + {% for field, errors in form.errors.items %} + {% for error in errors %} + {{ error }}
    + {% endfor %} + {% endfor %} +

    diff --git a/closedverse_main/templates/closedverse_main/man/manage_bans.html b/closedverse_main/templates/closedverse_main/man/manage_bans.html new file mode 100644 index 0000000..2902b1a --- /dev/null +++ b/closedverse_main/templates/closedverse_main/man/manage_bans.html @@ -0,0 +1,25 @@ +{% extends "closedverse_main/layout.html" %} +{% block main-body %}{% load closedverse_user %}{% load closedverse_tags %} +{% user_sidebar request user profile 9 False %} +
    +

    Ban {{ user.username }}

    +
    + {% if not banned %} +
  • +

    Reasoning:

    + {{ form.reason }} +

    Expiry:

    + {{ form.expiry_date }} +

    {{ user.username }} will be banned from {{ brand_name }} until the time is right.

    +
    • + {% csrf_token %} +
    + +
    + {% else %} +

    This user is banned already.

    +

    The ban will expire on: {{ active_ban.expiry_date }}

    +

    Time remaining: {{ active_ban.expiry_date|timeuntil }}

    + {% endif %} +
    +{% endblock %} \ No newline at end of file diff --git a/closedverse_main/templates/closedverse_main/man/manage_warnings.html b/closedverse_main/templates/closedverse_main/man/manage_warnings.html new file mode 100644 index 0000000..f757bd6 --- /dev/null +++ b/closedverse_main/templates/closedverse_main/man/manage_warnings.html @@ -0,0 +1,49 @@ +{% extends "closedverse_main/layout.html" %} +{% block main-body %}{% load closedverse_user %}{% load closedverse_tags %} +{% user_sidebar request user profile 8 False %} +
    +

    Send a warning to {{ user.username }}

    +
    +
  • +

    Reasoning:

    + {{ form.reason }} +

    Warnings will show as notifications. {{ user.username }} will not be able to post, comment, or message another user until this notification is seen. {{ user.username }} will not see who sent this warning.

    +
    • +
    + {% if unread_warnings %}
  • +

    Warnings that have not been read yet:

    + + + + + + {% for Notifications in unread_warnings %} + + + + + {% endfor %} +
    TimeIncident
    {{ Notifications.created }}{{ Notifications.context_warning.reason }}
    {% endif %} +

    • {% if all_warnings %} +

    Incident history:

    + + + + + + + {% for Warning in all_warnings %} + + + + + + {% endfor %} +
    TimeIssued byIncident
    {{ Warning.created }}{{ Warning.by }}{{ Warning.reason }}
    {% endif %} +

    + {% csrf_token %} +
    + +
    +
    +{% endblock %} \ No newline at end of file diff --git a/closedverse_main/templates/closedverse_main/man/usertools.html b/closedverse_main/templates/closedverse_main/man/usertools.html index 387a467..e1f1e87 100644 --- a/closedverse_main/templates/closedverse_main/man/usertools.html +++ b/closedverse_main/templates/closedverse_main/man/usertools.html @@ -1,12 +1,9 @@ {% extends "closedverse_main/layout.html" %} {% block main-body %}{% load closedverse_user %}{% load closedverse_tags %} +{% user_sidebar request user profile 7 False %}

    Change settings for {{ user.username }}

    -

    Yes, this form is now ugly, but it's way more powerful.

    -
  • - {% user_sidebar_info user %} - {% for field in user_form %}
  • {% if field.field.widget.input_type == 'checkbox' %} @@ -38,8 +35,6 @@

    {{ field.help_text }}

    • {% endfor %} - -

  • Purge content:

    {% for field in purge_form %} @@ -51,7 +46,6 @@

    Metadata:

    -

    User agent: {% if user.user_agent %}{{ user.user_agent }}{% else %}Data missing{% endif %}

    Rank: {% if user.staff %}Staff member.{% elif not user.level <= 0 %}Moderator. (Level {{ user.level }}){% else %}Regular user.{% endif %}

     

    diff --git a/closedverse_main/templates/closedverse_main/man/usertoolsmeta.html b/closedverse_main/templates/closedverse_main/man/usertoolsmeta.html index 0464a03..7df12af 100644 --- a/closedverse_main/templates/closedverse_main/man/usertoolsmeta.html +++ b/closedverse_main/templates/closedverse_main/man/usertoolsmeta.html @@ -10,7 +10,6 @@

    General account information:

    IP address: {% if user.addr %}{{ user.addr }}{% else %}Data missing{% endif %}

    Signup IP address: {% if user.signup_addr %}{{ user.signup_addr }}{% else %}Data missing{% endif %}

    -

    User agent: {% if user.user_agent %}{{ user.user_agent }}{% else %}Data missing{% endif %}

    Email: {% if user.email %}{{ user.email }}{% else %}Data missing{% endif %}

    Rank: {% if user.staff %}Staff member.{% elif not user.level <= 0 %}Moderator. (Level {{ user.level }}){% else %}Regular user.{% endif %}

    diff --git a/closedverse_main/templates/closedverse_main/profile-settings.html b/closedverse_main/templates/closedverse_main/profile-settings.html index aa1c9a4..54b5775 100644 --- a/closedverse_main/templates/closedverse_main/profile-settings.html +++ b/closedverse_main/templates/closedverse_main/profile-settings.html @@ -78,7 +78,7 @@

  • Discord Username

    - +

    Actually, you don't have to put a Discord username here, you can put anything here, such as your Threads username or X username. Discord sure is popular though.

    • diff --git a/closedverse_main/templatetags/__init__.py b/closedverse_main/templatetags/__init__.py index e69de29..0519ecb 100644 --- a/closedverse_main/templatetags/__init__.py +++ b/closedverse_main/templatetags/__init__.py @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/closedverse_main/urls.py b/closedverse_main/urls.py index b7518b7..24eb697 100644 --- a/closedverse_main/urls.py +++ b/closedverse_main/urls.py @@ -41,6 +41,8 @@ urlpatterns = [ url(r'users/'+ username +'/tools/set$', views.user_tools_set, name='user-tools-set'), url(r'users/'+ username +'/tools$', views.user_tools, name='user-tools'), url(r'users/'+ username +'/tools/meta$', views.user_tools_meta, name='user-tools-meta'), + url(r'users/'+ username +'/tools/warn$', views.user_tools_warnings, name='user-tools-warnings'), + url(r'users/'+ username +'/tools/ban$', views.user_tools_bams, name='user-tools-bans'), url(r'users/'+ username +'/block$', views.user_addblock, name='user-addblock'), url(r'users/'+ username +'/block_rm$', views.user_rmblock, name='user-rmblock'), url(r'my_blacklist$', views.user_blocklist, name='block-list'), @@ -100,7 +102,6 @@ urlpatterns = [ url(r'invite/create$', views.create_invite, name='create-invite'), url(r'mydata$', views.my_data, name='my-data'), url(r'changepassword$', views.change_password, name='change-password'), - url(r'changepassword/set$', views.change_password_set, name='change-password-set'), url(r'server$', views.server_stat, name='server-stat'), url(r'help/rules/?$', views.help_rules, name='help-rules'), url(r'help/faq/?$', views.help_faq, name='help-faq'), diff --git a/closedverse_main/util.py b/closedverse_main/util.py index 05926ce..44cb758 100644 --- a/closedverse_main/util.py +++ b/closedverse_main/util.py @@ -105,7 +105,10 @@ def video_upload(video): return settings.MEDIA_URL + fname ImageFile.LOAD_TRUNCATED_IMAGES = True -def image_upload(img, stream=False, drawing=False, avatar=False): +def image_upload(img, stream=False, drawing=False, avatar=False, icon=False, banner=False): + Imagefield = False + if banner or icon: + Imagefield = True if stream: decodedimg = img.read() else: @@ -137,7 +140,8 @@ def image_upload(img, stream=False, drawing=False, avatar=False): } if orientation in rotations: im = im.transpose(rotations[orientation]) - if avatar: + if avatar or icon: + tiny = True # crop 1:1 width, height = im.size min_dimension = min(width, height) @@ -149,6 +153,7 @@ def image_upload(img, stream=False, drawing=False, avatar=False): im = im.crop((left, top, right, bottom)) im.thumbnail((256, 256)) else: + tiny = False im.thumbnail((1280, 1280)) # Let's check the aspect ratio and see if it's crazy @@ -174,11 +179,20 @@ def image_upload(img, stream=False, drawing=False, avatar=False): im = im.convert('RGB') elif 'webp' in img.content_type: target = 'webp' - floc = imhash + '.' + target + # Janky goofy ahh solution to a stupid problem! + if tiny: + floc = imhash + '_tiny' + '.' + target + else: + floc = imhash + '.' + target # If the file exists, just use it, that's what hashes are for. + if not os.path.exists(settings.MEDIA_ROOT + floc): im.save(settings.MEDIA_ROOT + floc, target, optimize=True) - return settings.MEDIA_URL + floc + if not Imagefield: + return settings.MEDIA_URL + floc + # Not compatible with imagefield otherwise, if this is not here, Images uploaded will not show due to an incorrect URL. + # yes it's a crack den solution but it works. + else: return floc # Todo: Put this into post/comment delete thingy method def image_rm(image_url): diff --git a/closedverse_main/views.py b/closedverse_main/views.py index 3325de3..24526ca 100644 --- a/closedverse_main/views.py +++ b/closedverse_main/views.py @@ -1,4 +1,4 @@ -from django.http import HttpResponse, HttpResponseNotFound, HttpResponseBadRequest, HttpResponseServerError, HttpResponseForbidden, JsonResponse +from django.http import HttpResponse, HttpResponseNotFound, HttpResponseBadRequest, HttpResponseServerError, HttpResponseForbidden, JsonResponse from django.template import loader from django.shortcuts import render, redirect, get_object_or_404 from django.http import Http404 @@ -13,6 +13,7 @@ from django.contrib.auth import update_session_auth_hash from django.db.models import Q, Count, Exists, OuterRef from django.db.models.functions import Now from .models import * +from .forms import * from .util import * from closedverse import settings import re @@ -183,69 +184,33 @@ def community_favorites(request): }) def login_page(request): - """Login page! using our own user objects.""" - # Redirect the user to / if they're logged in, forcing them to log out - location = '/' + # rn the password form does not take into account if you have the old password format or not. if request.user.is_authenticated: - return redirect(location) + return redirect('/') if request.method == 'POST': - # If we don't have all of the POST parameters we want.. - if not (request.POST['username'] and request.POST['password']): - # then return that. - return HttpResponseBadRequest("You didn't fill in all of the fields.") - # Now let's authenticate. - # Wait, first check if the user exists. Remove spaces from the username, because some people do that. - # Hold up, first we need to check proxe. - - # Uncomment this if you want users to be forbidden from logging in with a proxy. - #if settings.CLOSEDVERSE_PROD and settings.DISALLOW_PROXY and iphub(request.META['REMOTE_ADDR']): - # return HttpResponseNotFound("The user doesn't exist.") - user = User.objects.authenticate(username=request.POST['username'], password=request.POST['password']) - # None = doesn't exist, False = invalid password. - if user is None: - return HttpResponseNotFound("The user doesn't exist.") - else: - # Todo: I might want to do some things relating to making models take care of object stuff like this instead of the view, it's totally messed up now. - successful = False if user[1] is False or not user[0].is_active() else True - LoginAttempt.objects.create(user=user[0], success=successful, user_agent=request.META.get('HTTP_USER_AGENT'), addr=request.META.get('REMOTE_ADDR')) - if user[1] == False: - # check if a hasher could not be identified due to moving from passlib - try: - # will throw a ValueError if no hasher is found - identify_hasher(user[0].password) - except ValueError as e: - # error says "Unknown password hashing algorithm ''......", meaning that the password is not converted - if '\'\'' in str(e): - return HttpResponseBadRequest("The password is either encoded in an unsupported format, or the passwords haven't been updated yet. As part of a recent update, passwords need to be converted - sorry about that. If password resets work, you can use that to make your account usable immediately.") - else: - return HttpResponseBadRequest("The password is either encoded in an unsupported format, or the settings haven't been updated yet. Please add - or direct the server owner to add - hashers_passlib.bcrypt_sha256 to settings.PASSWORD_HASHERS, and then install django-hashers-passlib. I'm sorry for the inconvenience! If password resets work, you can use that immediately.") - else: - return HttpResponse("Invalid password.", status=401) - elif user[1] == 2: - return HttpResponse("This account's password needs to be reset. Contact an admin or reset by email.", status=400) - elif not user[0].is_active(): - return HttpResponseForbidden("This account was disabled.") - request.session['passwd'] = user[0].password - login(request, user[0]) - - # Then, let's get the referrer and either return that or the root. - # Actually, let's not for now. - #if request.META['HTTP_REFERER'] and "login" not in request.META['HTTP_REFERER'] and request.META['HTTP_HOST'] in request.META['HTTP_REFERER']: - # location = request.META['HTTP_REFERER'] - #else: - if request.GET.get('next'): - location = request.GET['next'] - if request.headers.get('x-requested-with') == 'XMLHttpRequest': - # because if you respond to an ajax with a redirect, the response will just be the page, you can't get the redirect value from js - return HttpResponse(location) - return redirect(location) + incorrect_password = False + form = LoginForm(request.POST) + if form.is_valid(): + user = User.objects.get(username__iexact=form.cleaned_data['username']) + # no longer logs failed logins + # do I really want to fix that? + LoginAttempt.objects.create(user=user,success=True, user_agent=request.META.get('HTTP_USER_AGENT'),addr=request.META.get('REMOTE_ADDR')) + request.session['passwd'] = user.password + login(request, user) + location = request.GET.get('next', '/') + if request.headers.get('x-requested-with') == 'XMLHttpRequest': + return HttpResponse(location) + return redirect(location) else: - return render(request, 'closedverse_main/login_page.html', { - 'title': 'Log in', - 'allow_signups': settings.allow_signups, - 'reset_supported': hasattr(settings, 'DEFAULT_FROM_EMAIL'), - #'classes': ['no-login-btn'] - }) + form = LoginForm() + + return render(request, 'closedverse_main/login_page.html', { + 'title': 'Log in', + 'form': form, + 'allow_signups': settings.allow_signups, + 'reset_supported': hasattr(settings, 'DEFAULT_FROM_EMAIL'), + }) + def signup_page(request): """Signup page, lots of checks here""" # Redirect the user to / if they're logged in, forcing them to log out @@ -280,7 +245,6 @@ def signup_page(request): if not re.compile(r'^[A-Za-z0-9-._]{1,32}$').match(request.POST['username']) or not re.compile(r'[A-Za-z0-9]').match(request.POST['username']): return HttpResponseBadRequest("Your username either contains invalid characters or is too long (only letters + numbers, dashes, dots and underscores are allowed") - # forbidden keywords groups = [ [ @@ -305,15 +269,6 @@ def signup_page(request): if keyword in request.POST['username'].lower() or keyword in request.POST['nickname'].lower(): # perhaps warn admins at a later time return HttpResponseForbidden(messages[id]) - - # this is such a miniscule amount of NNIDs that either an admin or a person could - # claim all of them, in which case they could not be reused - #for keyword in ['windowscj', 'gabalt']: - # if keyword in request.POST['origin_id'].lower(): - # return HttpResponseForbidden("You're very funny. Unfortunately your funniness blah blah blah fuck off.") - - # end of forbidden keywords - conflicting_user = User.objects.filter(Q(username__iexact=request.POST['username']) | Q(username__iexact=request.POST['username'].replace(' ', ''))) if conflicting_user: return HttpResponseBadRequest("A user with that username already exists.") @@ -369,7 +324,7 @@ def signup_page(request): nick = request.POST['nickname'] mii = None gravatar = True - make = User.objects.closed_create_user(username=request.POST['username'], password=request.POST['password'], email=request.POST.get('email'), addr=request.META['REMOTE_ADDR'], user_agent=request.META['HTTP_USER_AGENT'], signup_addr=request.META['REMOTE_ADDR'], nick=nick, nn=mii, gravatar=gravatar) + make = User.objects.closed_create_user(username=request.POST['username'], password=request.POST['password'], email=request.POST.get('email'), addr=request.META['REMOTE_ADDR'], signup_addr=request.META['REMOTE_ADDR'], nick=nick, nn=mii, gravatar=gravatar) if invited == True: invite.used = True invite.used_by = make @@ -400,19 +355,11 @@ def forgot_passwd(request): try: user = User.objects.get(email=request.POST['email']) except (User.DoesNotExist, ValueError): -<<<<<<< Updated upstream - return HttpResponseNotFound("There isn't a user with that email address.") - try: - user.password_reset_email(request) - except: - return HttpResponseBadRequest("There was an error submitting that.") -======= return HttpResponseNotFound("The email address could not be found.") try: user.password_reset_email(request) except Exception as error: return HttpResponseBadRequest("There was an error submitting that, sorry! Here's why: " + str(error)) ->>>>>>> Stashed changes return HttpResponse("Success! Check your emails, it should have been sent from \"{0}\".".format(settings.DEFAULT_FROM_EMAIL)) if request.GET.get('token'): user = User.get_from_passwd(request.GET['token']) @@ -488,7 +435,7 @@ def user_view(request, username): nickname_old = user.nickname if profile.cannot_edit: return json_response("Not allowed.") - if request.POST.get('screen_name') is None or len(request.POST['screen_name']) > 32: + if len(request.POST.get('screen_name')) is 0 or len(request.POST['screen_name']) > 32: return json_response('Nickname is too long or too short (length '+str(len(request.POST.get('screen_name')))+', max 32)') if len(request.POST.get('profile_comment')) > 2200: return json_response('Profile comment is too long (length '+str(len(request.POST.get('profile_comment')))+', max 2200)') @@ -1044,6 +991,7 @@ def community_favorite_rm(request, community): def community_tools(request, community): the_community = get_object_or_404(Community, id=community) + activity_feed = True if the_community.type == 4 else False if not request.user.is_authenticated: raise Http404() can_edit = the_community.can_edit_community(request) @@ -1052,77 +1000,17 @@ def community_tools(request, community): return render(request, 'closedverse_main/community_tools.html', { 'title': 'Community tools', 'community': the_community, - 'max_icon_size': settings.max_icon_size, - 'max_banner_size': settings.max_banner_size, + 'activity_feed': activity_feed, }) - + def community_tools_set(request, community): if request.method == 'POST': the_community = get_object_or_404(Community, id=community) - #do the checks if not request.user.is_authenticated: return HttpResponseForbidden() can_edit = the_community.can_edit_community(request) if not can_edit: return HttpResponseForbidden() -<<<<<<< Updated upstream - if len(request.POST.get('community_name')) == 0 or len(request.POST.get('community_name')) >= 100: - return json_response('Your community name is either too short or too long.') - if len(request.POST.get('community_description')) >= 1024: - return json_response('Your community description is too long.') - if int(request.POST.get('community_platform')) >= 8: - return json_response('Invalid Platform type.') - if the_community.is_rm: - return json_response('Community is removed') - if the_community.type == 4: - return json_response('Community is removed') - #do the settings - the_community.name = request.POST.get('community_name') - the_community.description = request.POST.get('community_description') - the_community.platform = (request.POST.get('community_platform') or 0) - the_community.require_auth = False if request.POST.get('force_login') is None else True - ico = request.FILES.get('community_icon') - banner = request.FILES.get('community_banner') - #if icon is not set, ignore it - if ico != None: - #make sure it's an image. - if 'image' in ico.content_type: - # Set the upload limit in megabytes - upload_limit = settings.max_icon_size - - max_size = upload_limit * 1024 * 1024 - current_size = ico.size - max_mb = max_size / 1024 / 1024 - if current_size > max_size: - return json_response('Your icon is too big! Please upload an image under ' + str(max_mb) + 'MB. (' + str(round(current_size / 1024 / 1024, 3)) + 'MB)') - the_community.ico = ico - else: - return json_response('bad image') - - if banner != None: - if 'image' in banner.content_type: - # Set the upload limit in megabytes - upload_limit = settings.max_banner_size - max_size = upload_limit * 1024 * 1024 - current_size = banner.size - max_mb = max_size / 1024 / 1024 - if current_size > max_size: - # i hate this fucking shit - return json_response('Your banner is too big! Please upload an image under ' + str(max_mb) + ' MB. (' + str(round(current_size / 1024 / 1024, 3)) + 'MB)') - the_community.banner = banner - else: - return json_response('bad image') - - ''' - if request.FILES.get('community_icon') != None: - if - the_community.ico = request.FILES.get('community_icon') - if request.FILES.get('community_banner') != None: - the_community.banner = request.FILES.get('community_banner') - ''' - the_community.save() - #AuditLog.objects.create(type=2, user=user, by=request.user, reasoning=request.POST) -======= form = CommunitySettingForm(request.POST, request.FILES, request , instance=the_community) if not form.is_valid(): return json_response(form.errors.as_text()) @@ -1139,7 +1027,6 @@ def community_tools_set(request, community): community.banner = upload community.save() AuditLog.objects.create(type=4, community=community, user=community.creator, by=request.user) ->>>>>>> Stashed changes return HttpResponse() else: raise Http404() @@ -1202,6 +1089,7 @@ def post_create(request, community): 10: "No mr white, you can't make a post entirely consistant of spaces", 11: "The video you've uploaded is invalid.", 12: "Please don't post Zalgo text.", + 13: "Please check your notifications.", }.get(new_post)) # Render correctly whether we're posting to Activity Feed if community.is_activity(): @@ -1335,6 +1223,7 @@ def post_comments(request, post): 3: "You're making comments too fast, wait a few seconds and try again.", 6: "Not allowed.", 12: "Please don't post Zalgo text.", + 13: "Please check your notifications.", }.get(new_post)) # Give the notification! if post.is_mine(request.user): @@ -1670,6 +1559,7 @@ def messages_view(request, username): 1: "Your message is too long ("+str(len(request.POST['body']))+" characters, 2200 max).", 2: "The image you've uploaded is invalid.", 3: "Sorry, but you're sending messages too fast.", + 4: "Please check your notifications.", 6: "Not allowed.", }.get(new_post)) friendship.update() @@ -1742,18 +1632,19 @@ def prefs(request): arr = [profile.let_yeahnotifs, lights, request.user.hide_online] return JsonResponse(arr, safe=False) +@login_required def user_tools(request, username): - if not request.user.is_authenticated: - raise Http404() if not request.user.can_manage(): return HttpResponseForbidden() user = get_object_or_404(User, username__iexact=username) profile = user.profile() + profile.setup(request) + # check if the requesting user is allowed to change someone if user.has_authority(request.user): return HttpResponseForbidden() - user_form = UserForm(instance=user) - profile_form = ProfileForm(instance=profile) + user_form = User_tools_Form(instance=user) + profile_form = Profile_tools_Form(instance=profile) purge_form = PurgeForm() seen_by = MetaViews.objects.filter(target_user=user).distinct().order_by('-id')[:10] has_seen = MetaViews.objects.filter(from_user=user).distinct().order_by('-id')[:10] @@ -1774,18 +1665,15 @@ def user_tools(request, username): 'accountmatch': accountmatch, 'min_lvl_metadata_perms': settings.min_lvl_metadata_perms, }) - +@login_required def user_tools_meta(request, username): - if not request.user.is_authenticated: - raise Http404() if not request.user.can_manage(): return HttpResponseForbidden() - if request.user.level < settings.min_lvl_metadata_perms: + if request.user.level < settings.min_lvl_metadata_perms or settings.min_lvl_metadata_perms == 0: return HttpResponseForbidden() user = get_object_or_404(User, username__iexact=username) profile = user.profile() - if user.protect_data: - return HttpResponseForbidden() + profile.setup(request) # check if the requesting user is allowed to view someone if user.has_authority(request.user): return HttpResponseForbidden() @@ -1821,7 +1709,69 @@ def user_tools_meta(request, username): 'profile': profile, 'min_lvl_metadata_perms': settings.min_lvl_metadata_perms, }) - + +@login_required +def user_tools_warnings(request, username): + user = get_object_or_404(User, username__iexact=username) + profile = user.profile() + profile.setup(request) + if not request.user.can_manage(): + return HttpResponseForbidden() + if user.has_authority(request.user): + return HttpResponseForbidden() + if request.method == 'POST': + form = Give_warning_form(request.POST) + if form.is_valid(): + warning = form.save(commit=False) + warning.to = user + warning.by = request.user + warning.save() + return redirect('main:user-view', user) + unread_warnings = Notification.objects.filter(type=5, to=user, read=False)[:3] + all_warnings = Warning.objects.filter(to=user)[:8] + form = Give_warning_form() + return render(request, 'closedverse_main/man/manage_warnings.html', { + 'user': user, + 'unread_warnings': unread_warnings, + 'all_warnings': all_warnings, + 'profile': profile, + 'form': form, + }) + +@login_required +def user_tools_bams(request, username): + user = get_object_or_404(User, username__iexact=username) + profile = user.profile() + profile.setup(request) + active_bans = user.banned_user.filter(active=True).exclude(expiry_date__lte=timezone.now()) + if active_bans: + banned = True + active_ban = active_bans.first() + else: + banned = False + active_ban = None + if not request.user.can_manage(): + return HttpResponseForbidden() + if user.has_authority(request.user): + return HttpResponseForbidden() + if request.method == 'POST': + form = Give_Ban_Form(request.POST) + if form.is_valid(): + ban = form.save(commit=False) + ban.to = user + ban.by = request.user + ban.save() + return redirect('main:user-view', user) + if not banned: + form = Give_Ban_Form() + else: form = None + return render(request, 'closedverse_main/man/manage_bans.html', { + 'user': user, + 'banned': banned, + 'active_ban': active_ban, + 'profile': profile, + 'form': form, + }) def user_tools_set(request, username): if request.method == 'POST': @@ -1835,8 +1785,8 @@ def user_tools_set(request, username): if user.has_authority(request.user): return HttpResponseForbidden() - user_form = UserForm(request.POST, instance=user) - profile_form = ProfileForm(request.POST, instance=profile) + user_form = User_tools_Form(request.POST, instance=user) + profile_form = Profile_tools_Form(request.POST, instance=profile) purge_form = PurgeForm(request.POST) if purge_form.is_valid(): @@ -1967,50 +1917,26 @@ def my_data(request): }) @login_required def change_password(request): - if not request.user.is_authenticated: - raise Http404() user = request.user - return render(request, 'closedverse_main/change-password.html', { - 'user': user, - 'title': 'Change Password', - }) -def change_password_set(request): if request.method == 'POST': - if not request.user.is_authenticated: - raise Http404() - user = request.user - old = request.POST.get('old-password') - new = request.POST.get('new-password') - confirm = request.POST.get('confirm-password') - # make sure they are filled out - # a bit inefficient but who cares? - if not old: - return json_response('Please specify your old password.') - if not new: - return json_response('Please specify your new password.') - if not confirm: - return json_response('Please specify your new password again.') - if not new == confirm: - return json_response('Passwords do not match') - if old == new: - return json_response('The old password and new password can\'t be the same.') - if not user.check_password(old): - return json_response('The old password specified does not match the user\'s password. Enter the password you use as of right now.') - # do the length check - #if len(new) < settings.minimum_password_length: - # return json_response('The new password must be at least ' + str(settings.minimum_password_length) + ' characters long.') - try: - validate_password(new, user=user) - except ValidationError as error: - return json_response(error) - # do the thing - user.set_password(new) - user.save() - update_session_auth_hash(request, user) - return json_response("Success! Now you can log in with your new password!") + form = Settomgs_Change_Password(request.POST) + if form.is_valid(): + old = form.cleaned_data.get('Old_Password') + new = form.cleaned_data.get('New_Password') + if not user.check_password(old): + return json_response('The old password specified does not match the user\'s password. Enter the password you use as of right now.', "Invalid old password") + user.set_password(new) + user.save() + update_session_auth_hash(request, user) + return json_response("Success! Now you can log in with your new password!", "Finished") + return json_response(form.errors.as_text()) else: - raise Http404 - + form = Settomgs_Change_Password(request.POST) + return render(request, 'closedverse_main/change-password.html', { + 'user': user, + 'form': form, + 'title': 'Change Password', + }) def whatads(request): return render(request, 'closedverse_main/help/whatads.html', {'title': 'What are user-generated ads?'}) def help_rules(request): diff --git a/static/closedverse.css b/static/closedverse.css index 0b94b0a..16346ba 100644 --- a/static/closedverse.css +++ b/static/closedverse.css @@ -144,6 +144,12 @@ input.disabled { .green { color: green !important; } +.warning-reason { + margin-top: 6px; +} +.warning-note { + margin-top: 6px; +} body { font-size: 14px; text-align: center; @@ -1943,6 +1949,9 @@ font-size: 18px; .button-wiiu:hover { background: #1088b6; } +.list .bigger { + padding: 29px; +} .list > li, .list > div, .list > a, @@ -3386,6 +3395,18 @@ border-top: 1px solid var(--theme, #94ff3d); content: "e"; color: var(--theme, #5ac800); } +.sidebar-setting .sidebar-admin-settings:before { + content: "y"; + color: var(--theme, #5ac800); +} +.sidebar-setting .sidebar-admin-warnings:before { + content: "n"; + color: var(--theme, #5ac800); +} +.sidebar-setting .sidebar-admin-bans:before { + content: "x"; + color: var(--theme, #5ac800); +} .sidebar-setting .sidebar-menu-replies:before { content: "r"; color: var(--theme, #5ac800); diff --git a/static/closedverse.js b/static/closedverse.js index 4b8f6db..acb01d3 100644 --- a/static/closedverse.js +++ b/static/closedverse.js @@ -2021,7 +2021,9 @@ var Olv = Olv || {}; event.preventDefault(); }); - c.on("drop paste", handleFileChange); + c.on("drop", handleFileChange); + // upon choosing an image, and pasting plain text after, no image would be uploaded for some reason. + // yeah i got no fucking clue how to fix this shit. c.on("olv:entryform:post:done", function() { imageDimensions.text(b.EntryForm.tempPollutionButImageFormAllowedText); @@ -3221,7 +3223,7 @@ mode_post = 0; b.router.connect("^/users/[^\/]+/favorites$", function(a, c, d) { b.Content.autopagerize(".community-list", d) }), - b.router.connect("^/login/$|^/signup/$", function(c, d, e) { + b.router.connect("^/signup/$", function(c, d, e) { function lfinish(b) { window.location.href=b //a('body').attr('sess-usern', a('input[name=username]').val()) diff --git a/static/img/administrator.png b/static/img/administrator.png deleted file mode 100644 index e0e383a531168871e4cfb44908f7c994376cb40d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6KLdP1T!Hle|Nj|Ip`z3O8IJvD zI0_>V{%1JwpJ5LeZU4^zL>vDzZ2Hfz7K~Q>X8@wb{}~qjXP65{GyXG7|IaW9jC%hw z08z((hW7sq&Hovi{xj76XQ=tlQ1PFk{69kx80GwD$o&{CjvKudu(g6*>H+NTTjym3j8 zUoZnh)|n3Cq1FLf5pY*b_bLO`}9kIj~uy6;Ie`-Y1pGVL96miVsJ*fGz0iQBWvb-R~}-0l(FyZWfaM0t1w>{Ob+0SoV<)_Yb`Wnmp z+TPU>lVje#+IN1fNc^7{Ssvm2i|%XeniCZBwd(J`uUj6e^*z2VdGu~Vf&J^R-iu_JYD@<);T3K0RUO#DqH{n diff --git a/static/img/badgedes.png b/static/img/badgedes.png deleted file mode 100644 index 1448fcc2f45000aa3bdbc2e8989c9e30f8ebce86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1153 zcmV-{1b+L8P)@{{GZE`z|^jYT3Q-IGBY!IxV^m{^7He#Plt+wMgN&^1A?oh7|ItPIp@H7qPF zKt)9bjE;^%K|uiw3=F{D-X1hHHG$D+1iG;`OpIC0>G1obkB`qc0?8y#aBwhhURqj$ zkdP1v4-bc;q9Pa`9)_Kr9k#5nun_k5_n);!X&C~vcwD!ipWh#RDcmSiN0wzid}wG0 zl9G}jFfb7E^73GOd>l46H(_gQ3yO=287i!yx6&WN8b?P*Jx+ZJ3JUrnTp?|5Z<|38 z5fRYR(gL};xeQHBO@;aSd6=D@1(iz0dkhAHjdV)cuy4d=AHu@ImIQ<^wz09nAZpRk z(R|3v%nVFTO#uZ&Wo0FgmzS5r+S(f6ZOs-b{Xu=2L;2oe`%4L7kY2AhgJ>WjAp!31 z@1e7^6D}?;*k8WBzL1`t4jmmGfI$OzTeF|YF9dONax&su_4xQ`L}mW50j;jCGU)K| zkbOY6!o?Qrl+w|}*w`3^hK4eX){{>Vq(*>+To%$TE-uP9H#d--oz3IR%gY=HM@L71 zvO-;5oq7G_3S>mzp#^J zwd^0!Xf81^kpqI7R;wkD0lUA)$H#wt4Z;?o95OkdDuA+;l$5~W;2<FK%oe;{lT%EKV> zkc=WXC_m^S$9s5q=rGDYrlh3U_zz@Du)%Ud)r%d?oev_A*FmjR^p5Zf-`b>K`zfpUwE!0AgP1>gtk(6{ecS zav_9%9q;g0VN)ROJzTj?(r7dcGL;jCxVpM>fy9MI1lbhGH-WGs%NVj$PK4w2n2>7x zoBps|78bR&waLOK6kQ0^l$MtMkmLW$VyU&YRe*E|`Ha=!%_01fq!L+#QgMOA67!~H zw8v)*!rGO9<^Q`q8{V?U-{1eIe*s~Wkz06LMyUV*01jnXNoGw=04e|g00;m800000 T0Mb*F00000NkvXXu0mjf6oes1 diff --git a/static/img/cool.png b/static/img/cool.png deleted file mode 100644 index 6b43885ac2f563eb1684d2c4dbb1e836e260768a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP)10fU)3)v z1RGkIIidC~ysm!N>H|d5=KuR|&eV&K0lt&3)Sa`k$e3^x@;718xS$LL@mmED^b#m|e z+QFDBMhV}zk0Gat`$FHQ(3x_S@LjVXhpB3m@O^z4ll4%-5A|S7)JF+FR>K%?h7x`% zhcVV1CH!0rW3)Sz@T(ujaQ7(Tw>*qiZz$pSER3PvQNkY%#$Xtf@F!smghL5`$r$}% bQ3L+~*BO^Mwf8F~00000NkvXXu0mjf^@*k` diff --git a/static/img/developer.png b/static/img/developer.png deleted file mode 100644 index c7613b3392ffb1f1e95a8e12df957c05acc6a39d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmVPZyLe#q7%9L!U1#2w;d+V4fEpiMK)cR zAPNb?kV+ikMgjI%0=bq!U&ZKCA1UqyeUsZ+aKNbVrkLsNWvM+4L7ATF7OhqpjSZbG zB}N8|B(nw?0ZoGx4d6C}*1!OUIF3*gFvb$M&o0u_6(VYIT|-y4Ov0{EjfU*}K z?{a(1#Q{TWn4*7WkxcJ#Mzb57zfdOCsc5APp^sE6MC(4xmXNKWKI6RTWUkRII$%hJ zD_oxr=qmX1T~(4;Pzi~bO5nxtX&ssL;e8dW5Cf7Ioy+|x9u62pV4%20b}m8Om&7Wh z(bf{B zDoJhN$Lv=s;;D%4;r&AaG%21YMR)mNPylTcPuoOy_~1|g&4{NN(V7nj3ZPlp(yXXv q4-pEW15(uidBR~!hvgyvK|cWNDmpZ${TB8B0000eK@{oCO|{#S9GG z!XV7ZFl&wkP;h2|Plzj!{@=y$zY~ZU|93zT)BkobYGVS)wle>3VfnvK?SC`N|3=pT zjcorL*#6hE|G$~{zmDU7Eyw>F&i^(H|EoFwS9ATZ;`(37{l9|ye>o8G{4eGGU&8ml zi2r|~!2dkK|G7f{vxWbsi~UcL_@5y4KUU^{jLiQ?x&Pq`|HBmihba9IRQ~U;^50+e zzpq;7@r65p)*F`u`2{ol|Noy2h?#(xNU*5BVii#PI!_nJkcv6EXWE6D3c?uyrjc=ZvbCRVYv1HS()E8e%msx5^9onRkKZX6kw#+%M!m`>j z%M-58T{Xpt!*O0$%Z$R$A&N^?&WGzfO_F4psl?;_*D7Z1Vh?RInce=cHk}oNN@|+}g z^!MduKeoN%?bP0l+XkKw6E*= diff --git a/static/img/menu-logo-old.png b/static/img/menu-logo-old.png deleted file mode 100644 index 98f78158abaef6b60a97602a29b3930b39270c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12105 zcmb7~RZJaBuz=6ODO%j!DefHH-QC^YT}vs&-JRlY#ogWA-8s0^+dsJv_w{ZvJDYjf z$xgD_*_kgwNkJ0n3*Hw10DvSdC8qLEgZ~L19L&F2E09Yc03ZQKiwUcF8C?3qXA!73 zeYUFWZ#LAVn^C<$b*GvV;E_ZU3+FJypOo zf`bTVR?FEei+oDqy-P35q-KJUJerz!0GA^;azJ^1W;*@k32E3_V_6RFK1Z%vsO%fUz2Re_D?_F49l{iGMXaoLq z->{`Z5r40GL%QBPf16IAr@v0fi!a$;Tc{Ny((*OllWm!GoJ_|cj32%29Rh3GA*OoU zU-MnYvR2>sN7Q`U|J`Txe9Qjq3JmWOO!;4@{4hqP13&aAhH^wk1(#^Vi>0JD61IMr zYCwG}{Fdi(%aDxDsy;Hoa;sLIUULg!UQVOM_!8`rOia_ihY+zs#^BMwK8!4*Z`VDK z0it85GgVlzZtlMs@=~oNC34T`a|UTJ(HU4u7I6Z22$fuzm%hpOhoI&7M-2FQWPDyf zz|5WHwv@|ynUfJSOC4B)m=Q^Nj2tq@ z35d}s=G|n6DAATE)tnijZHywIw>rY*u?VJP9#<32OU2mxcP7m7kwudh$}O7cx_%dm zdQH4b@;QPUPco0f=qFR-_Iye^E{>t>6$j9j9p<`0=yeBfy*YoE&iTOa&t+^`t+GVj z$(+^!-o4eXQM5T-s;}+R0u7ZEbv90!)tOwhwLHz87{d3BZfLy6fea$k*3JPbJmC{Js@hlKlyu6pD2A zs;|R@raxIHl#7j{YbR!A^3qk2gRr#dFc9%t0Zv^9>68GcR@4C~W<%z_23M9kZp;bTqoK~%( z34+9*kd`~==gU*if##gcpDen{%iLX|+uM4k;$V9kUb1uu9C<-DPnG-B>}>bfgq|>& zh3RV^ugHM{u6WC zX6&+n@)Ux{gqOvqcl_d(wxtFvqjOS5O!xGVEwjO)S5-Jty8*2!|9km)|IJAV^s%&S z@za)~(Qnm!&`R%*s7yA}wt@!Nje5D;jD3wh&n$&7h5FD~W7Cr?_-QwzRgcXKAYBGj zLEAGW%NKl#G*wCs;Y6rHG9WnsRnmC<6`AcohGX6%aHzk)B}4^{9n~b0+pa=Pk1bnqD}}e+`mb zZ_+2Mtr-<^ZI~TimS9Ml6;Gw=YVNq=x&Mf7c1Y@A_cT#k-(TI&&JKnOa`e`hgVP#k zr%c07L0y;)f(L{r0w%^000Zyj@)m3_=PuK@2IFF10)AXAzVMFGW}U&OlyHVPKg7z z`)EjcT_`I=5wCS^3zj6c%4#I zKgNpkmSI@#B5x=6-t{W@v}`c7JLQ6A*e_9;(VY-snKo!yfHYbL9(n^oIQT-mKR>4#hiFqrStS z>oSbGvc0fEezq-^6f@2Mm%NNWbR4|{;x3NexmKb+v3(SW1fB^?$rS-S_x7XWO;LTB zirvHMj_%=`>X_i{l|v=;`P=e`pp17oT=l=#GUaxsXW%%T3{-Rkz6L$p%^I~^m!o)? zt4@_RV;KvnvTCEPEKFr{QD%^ow7pJ6Q3m%5Sy*dc?j#5z!emehKYC$X2oB;cbO3J0|`Bgd?`ffXz5oi2>G2N zM9)ooRBAGuCn33`FbC8cb6O{@4ie1IkkL2$lhT)opE|ZQglFkHPgerX{9TM2!tf** zqOhZS;A~wbXMUO%S%aHm)FsMq7zPM+TGNM|<^XqL8V@^LeVuU~U;Qq58i?x* zS}^BF&Et^V5)RH42%Ih1*?iApxN>g6j~!0levllh*o;s7`bqX0@GY^c!QRIMW`Wv3 zRTfD!TLGzoW@ViQ((3IfN=*;W-&In&Y%$fY&bAQ33W_*b9YyexbYo%-Y_U35i)iE{ z8zc54tn-i}-~>XPB#s?)Yldb1ZmWoGNi(n$7i=9;)mM=3;Wr2^q!_pzucuP1Y zuiD)bQS0x2k2=+<&dH%MuKN&aF1vpow<78OhDyO$)2?Y1cMp%$-*?U=9{gn#2?O5F zObT4<;LF}jjNrmm^rFFovBe0&-LjbRP&8 zShe?E=tR~}yzVxHihK&=`Kk012aiwk2)lB~kula*oR$Qv z9Rt54dsTZgzrd}>_Vo$q!*}niftAJd`)vF92DUr_b=3}HI>*(XkcMbFz#lSpv1AeT zf&nrd_zi%araUuH3^BRDtq9`>Nb=1(R_xIlyd?f41xY~;!33BqO@UJrFOyLH*xPOl zg_mDz9X5eI&}!6xjHo8>8V)sL3bHL@|9+ij4loE#nc?gWznkl9#6G*bN^$pr+}-ZT zDbM<<5_30e@p~xF7E9V7Ps}A+#FKzzyoF_jBn#do!PrTb^z58w;gr|gW|%+j0``HU zNVkO_^g-x*jss!+cQ{M><~TvO@3RxBUAJ%N3LY@6hxZ(0e@>FdMCuQIRlDo)F0Sf+ zo^b@*$h(XIdgfE0r$gS1zcp{W*7Ate+IQ#MY4do>nCTb0^7^N%(XO{aoKtI(4GALA z`^|Vj>@%b6=d~Z2cp9YGR42T3TSvT*YN?3MPNV8660v80plRwt=AYbk6Hzy%8=$NQ z)3-pxBoj|oFty>^|NbGIgaq7FGY6dk+?GDH-Vu&- zGJSFuuv0XDz#e5=XY0CD;lU+i1BUvTJk)g<9`wqj$VL|jne9Gu-7qLtoj$3rTAolSjE-tHa#hkrvr6BpZUL>-8tCIJ7 z!tY0ihithpoJhy{uyYBVPu2Qk$`0RtCkEi_ zMAVvKn@NOq)DR`k0uw znOmA>Dx-f_oO&U9Z7)sqsG*rp=dkp z9w@GFk_D*B2y}U8Ak;7MU-q&YF5@e-k@EmaFr|$2f6i9Usg8Y%&M!@XN?X=*H&p zbHXgAbQL{W3Q=I4I$ziYh@yuWSfD?CA3m0k*-EkbeBaHcSZJwxH-7qPqpk6_I}H~q zCz{QId<&I(`HJ%ddiT$#>AmK!3Rz~YyC}TmgODcruG8;S?du|fh(3GMvmy9Hwq+Av z6Wf3GqCMbhV1!up3G*2SaS-+ecX>b@Gxz%o57jKYcTVl>)(<59_@goh|4u~=I)|V# zlhE5~;3=D4yPuWpE2TzTm^7|L(-~YJktbJGqCH?q0bq+lfn=HC|5Yt?SLF<)y#?xw z;WsTM7jW9kvV1FPi}AdYWKyPSJ5A`@_ceL2AIc(^v~Y?SB>4*DYBmG>%c&nr5v4!Ov%6La9?`WKB4S9!YAOZ@FQ;JOA z5jUX;;b!`Y)_vWGjo#5se|jLV?&96(A3N}cs|Vkm{H5lTw9NT3HDBK*II74sPb#oXqb$u;)+8fXhI zS0*E*%JG{}2H#7p_r+(==NNIZ2IKv~<}7cnyiDNV4XEAy6ohfEG7JR= z2~j?LiSyP}-(>Ktc571j`#{BscW4I{!7wIi4C^{%lvWO*wWC)k(6 zeyV6h_0#+IRhFyUKzIA74F`YB+b{6-Jb#zY;(YLPgh!X{mc$Dxo8gT7j#`{q@XGn7 zn}V5y*tj?bs(l^1%N3h5dEiII^)6bZii4O-k?t+t&F7>2h2X&R)zKT26GD;0&wQ7S z*?$Q`^(G^u7uw5)^{box2+Ydw_Kc;Gv%gl=2d57kt2E=qStd7WXtmtAql523hy2GZV$>x7Olo{|MXXn_}y# zE?Y}@yOq&*z?=)>V`FlX(l*Fe9ioGXUU4b}b~#vZoHqUy4!avO68UuzdJm24!qpip zyt2A2#i5y$p%=*aiTno_(i*kqt%@hnl$T^U(dF~TdK87s;c_)q8QVt;Zm}zPR!RJU6>juctp68@)T+gGTQtMLF79KS!LJGa6 z+z?C$;24`G9#Jgjgs8RQt6X(=zPWY)a$an%goc0FE5d9Ph$;%3w`;dUobs$JHHy6B zC;b_Dc=7+ne$hW%2kzd`#pjAosBwdmo*(`TMOG>y6c}jyQ`ZNT2qw ze6|cQ_U1?qqQKp`l;R-{A`Lbi`qq7oy&p?a@OPOlK;uVmtvO2DE<8n$e}j>oVq7O z`IBDCb)}$FRJ3VeQ5c7hw5Lcoi&R#wJq@*(_lhWLjFtUd3NRl)R@Q`&3CD#26OYE%_Yom)57JIF;V%ni1`Vf+tVvF=%_2@dhS+^||zq*9%wK3T|&JW!WV4-zP7yx)H zx*oUkb#D7~=Fc6n?3Na9a^GagS2O?J zW)mUU=}95fF00sfx~6jj7yp%?bfRFGx98a-{C30xaK%jN(7b18=DUg^)wnpdMoEa-(z~M!9LhE zWFbs-|HEW8kURVX+~DEQP!|x~EjanoX58b+OZoO*Eo-;2ExuMpMZUnq8Td$Jk{8(m zj)d@Mhm?1Z*f}h4Y#^0>91wa`a^Eb3r<71(xs1KEqMm&+3~D*$yB9A`@7kg|xJM%? z)vpAKd88fhw9DEMmlhX7 zf~?Tg4r3NLd2pSG4D`5$d#$R6IsN4%lW#@_U}Bn9VqsmP99Da7h#rLSEP+z8;bb-<+F*Wipq;gs@^xh8QZgh$=TyDqb~n1o56;bK0)oJ_Bj4p zn5y)If8$@s9Ve<{`K0`_zuE5C)|0~`{tbrtUFomuUBsaK%(>Vx3P4Izeq#}Rcpe2< zPZ7Qdvxpcd_Ln~0h>8u|2_)&Vx<(@rS8Au#FEg1J*aUh`Ulli1SHPmheAb>ZQ0DDnb|;>(3Ki)pl_cU{5zhkl>;I3y3z@7q5qF5lWI=?P1a^kaN=l z@f)~Y#V3zybac%;0B|m@ZMvwx_4bGsNG4@T$KEZf9{(O;nW&@DxLq^Ulw8LD6);`N zStDGExHZCr3}JO{3AWc;984~=It8oj+|hv`3z70xBRl4NlZom zOkBm^Cq79$3XqeRzrk7{4ZG-u(bwayzY-Jn=mo*Pd>FrA_$YA3d=}weMk6i#+W2Ce z9welRh7+>nBno2?$GjFo0TJ@cCLD%x#r)H4Kl>{OG)F2O2R!5J&sN+SOuAHp22eSmuXp80WPH1WZc$d$kDOE!3i=499Yz&kv^}a zUbko#sljpCr88gppfbuCD5IZL(%)>b`B>w7O0Vy}tTe&8YaQGcF-iO=HW5?(Ok(%B;I z>)!CUo;Wyc`9rN;gZWM1hYa6&eokj7>?!sM^ytCN(So1VF@|k#B)jeCA@BqK#zm3O^cYfS2S7F66}xepiG~ARO=R#e5T}?={Iez>-8rL*!b@4L{X`&M28i9J;P{4m=SFzh<&1*~@u7e0G(UppshAhes zK0ITrTpeGEZ0X}7!XL#E_;UdM{83$9l{ssl>fvXM4L)$CCQxE={8uH3C>t$S#dCLg zZ$G$_&ZvHqL=e}TZD8UoD0(I;v`B)=JE34H*%z-xpukTd3+A;WBN~BKvSxLinQ}ey zAwBN)rd(lhbJ)^P_1N*I_~+Qcrv_0pmFhYl<^WhO~9z+;|MkpdK7&AZHht=ns=y*jq|p0s#D@~^D%S5F48;DzmobkGRz_d(?i z?e93D0WCo4^4RB1sYuipvo(BU;_{jpziNFF*x%by5!V*j|dbB-WvYmSVMgs58_`?g5F zzxDLq^dy&(r{XHX&T+UU6!0gLy$|;70D+>*v&)ma)=m^_v?xg`z|hb=-_RqeVtL0h zu=3v)IEGM}MR<{aN*!@uWvxW$=Z+xz2Y*A}&#O1y%Nk!leK*t|-4-UG%=waEL(72R zPbh9#@{K*0IIQDzFq<-#!Z4O8&xG(|LTu-4*f6;(#r#rWs;lp$LOyx7B}Ho;Y^qca z*QMrqFpbR>dK5=J)NH4UQqx^c(WtI3@~z+!EK)jPH!TK- zrrb1x>;{FUZY2g4pGWo#rxt5Ro~A8iyp1@ZXFmP226hTG0w;X%|i zxJcP4Vm^?HX~dt($H2{JjwbAQI?cVct!vV8p%v6Qh`$!bjGfaFW!(KeXl7~?%XJ|V zy5O0s2cM^=pllIo)&WO`lpB#+SEMDfmEGzz1R(+L{Ck>Ztn<@nRO{`dpK2xNeeLFp zvtdfM+Y66{*tCbA1F{u^Mqi8y=cKsR^02bAQ{XX|{i^(DS}0FjCd;HEK$$ zuvn(qak6E3>{3&w%^5l(RyEac*br4#g(YN=JZM4uT!UPEVEe+f^c@cY=^`vemw*I{lI|4TAII~n?+!6K0nvLGA?y{#h`8h6A!i~aZ_bQ@w>?{ zSubcvy2A{j_*#B;javsmA)$W#YrcVfo8Ng5dO#0#>RExUGcKPPhEm4wQzN!swmoJ;?lBs}4KzuRvrgEnS>8`iRJ37nGX}a;n)Ou_wMG zF>bs)x#JZ~RmlR(n7bq(%ZN*Ou>AaBKY&FEwUNCo1Ll<=>AOD1^5zG9M=xw?@y@Gm zoDwi8TI7`4=5K-7a+5GtmRA%g#hno!2%xX~*U$E_n0;%?mi5R$>p*O(ZxMD*%)4I# zNXS=3D@}403?-&k=0reEaVOm(Ss7R5)O)53yt1i0xEUi6;ifJKryVr_oWfNEG@m|r z{gNGs9EvI3i`8LELK{OD5`?XH!XyVuhdX<|yPU-L{6151Zzu4S_yc>JZoI(kr%bRB~FASzLun2(jL(Hl$Na|HaO z-|V`~$6Y4tgk5zQrU8iXU*RE=7*J(s$4N#ccFlk*KP7UML;5^Ev`2K2!jsGtE=l#D z?IWA9wR4IQm35$aG%3|L)FuBG2oFi-4_tEFOxpmcv)UVj%j)aVp#2B?js7D4hWdd) z9i$Di(cWa!>3bR_q!PUyvhHRGmP<{>W|Uq`kNEq|>R4t><2X?^!FEx=?1%@-$+4vZ zrZAT+E?m7&U`jjk?T6=FpdDJz2#W+vvS>Fa9F(dd=v9UayW{j;(nLAg*r8PR zgIsHQn8xQ4bbt~m!dH0*y1r8j19V(Jvtm*k!5SWQ|4#p*^66Bln~pXte6JioDl#0> zcbB-pVJBN{;<7r-o-PtS1X>&B0!@?P!z1v1INx=HN3tQ%r}b6#?~ze**-Z8|1zCQZ z>ryQrG|f`l4UF)+(cJDuYMxS?xV^Q&qcBRIW(v0iLe6TEN>yjmIglewZtz;Vn5ld6 z7DXdD!oLf0=17>__jPWDb$Q|zH=rx_o-FlG|071Ge~|I?MXaw}V5o^%rvAcjx0~Ne zufA%|sMEUYhaiaH0BO-yu#@nF)%u1iX-*_4QF1Ew8v$D+#Eg0koTV^&JqG8YW$z(X z3cM(GdQUXMg)y8iAUlvn{0XUUbhNm=lprfrlWTD7dZ9kXHs;*`Fq_iCQcpg$%Weqv ze2*Doc?t7^a;H+#dhu*f((k3MVbQ(j9m}T$K)dNLBnQ>PeqRUgh2w#dIzKQ`@Lo7` z+r`ws(|L1mT`0}X9VUk({X7%oq$}U?7=T}w?DM@SjMr%=H5hjxUHhBzt5j;rMA-YZ ztTb@oI|PHi%3*igOMk;nStMCf)%79GIiOl|*p;f}eB+w2DieaqP_K#ikv$T6^Q5I4F9<@$y?)=QB9pWte^Za$eOI;{Mc z!_fsQKl>jAk^|)UP;bQxvBk*VTnT>dP5CBCpb=w!1QYU8g(M77=GO(AO+p>Uw@tnj zvN$9$%Aj>$W~ZPTDrJ7 z!U4^2YY%ZtPRXP>cmo;1Rq@)&PSm?+^7ylo9*8Ikkwg8?3mapijdICDI<_ZM4<8n% zQbit*@xH0Z#5|~kN*n91oEg*$+<~WQVj8mN`hyO47agN@ws~XxVOQt}nwHzWD>=dv zaUxE6-MFaXC{ z-Bg}%b`x?Ehzf0U-#-jz5R?uW>NF2>LCuAQGm-+SwG&hVHJXib+FKsK8-Tjeyi15ah;*C=oL=JPq{p-*ktnq;lOCeW&tdVY=23V)+) zM0^clU1d3P>)P}Qr4l2l<__9yvOYR2Erm8))PBH_Jl7Ui*x@54n;t;s0e6-GAwa1y za==QAa3AX}A`q(>c{OMa1qB~D$%mRdZA)>~+=LAdFyQrt6q<;bN(T{uqGI#|)7}Uo zUFc9aqzuafHK$St@$5;~^;Ptt3PM&te;VCc$rZs2_oJy)INFl5%7iK@n#>bX#5q!y zy!OjZq%mZDvhgkpGoWnBoKxFXl-h(_0%HM|-u^bo5r0lAvqp-3PXaYo+}_TDX9bWJ z;^EU)Hq`v!pX4un03;u{Vhzec=(;rS7&X+mm97m}qyVT8zH>h&yyVbjpXsGdW*#g4 z5?Ebj2;Y8$#d%8wSvLU7Kan<@E^!uuOW0Tyxy|)$`~{$#8to$W|Lpu&g4KGsSetlE z=|yzQ5swpwrOh}IC{e(KoJQ2J^@)s+%>YOH-sEMI5HTJdNl1AZl5gAr{75z)7>(gkwi9!gtNQ8P%NrjvBRJ}LBD@OOhjPk zOaw=r&p-1t~s!Q*a8zzOPzEnoki z_2bFw{Sa4do2kR_LDC>eVpQLMoU$WqkZ(Zwb~=%^*X3_no!rs2{t`dX+tsctzj@m^ zXB=x9?j|))%$so0ZT@ak+<;$AfGNI{E;!D9sI=;VcYw)@vkt}@q3EH9_0MID%s)TX z^7UA^@oRhrSgklRe8fYS;}RDv@L9dw4f6GD;Ogm~b>NPtztSqg$W%`mE2K6cm(G(H zG?nNAQx6cJb+q+RDj7pG1NxP3oL+D%j{V1e7j;yv3TM-?#X*D1TuK`D`Dp*6w-axh zEnwZtCxoziO2)FMV(yBv{?XxzW9u1&3;)lJ!QGzWzZx;Q`F8(-@W|#`(iZaa0J?u` WxPS8Bm{U#sPf3d_h*gUih5QeP159}U diff --git a/static/img/menu-logo.png b/static/img/menu-logo.png deleted file mode 100644 index cada68ad83d0954c56ee230d5ef579e4427e45b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5636 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 eB`o1;!~X#%k- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + aria-label="Cedar" /> diff --git a/static/img/moderator.png b/static/img/moderator.png deleted file mode 100644 index f32334cc195662c196cb2f0baf3b20ee5637e27b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6KLdP1T!Hle|Nj|Ip`z3O8IJvD zI0_>V{%1JwpJ5LeZU4^zL>vDzZ2Hfz7K~Q>X8@wb{}~qjXP65{GyXG7|IaW9jC%hw z08z((hW7sq&Hovi{xj76XQ=tlQ1PFk{69kx80GwD$o&{CjvKudu(g6*>H+NTTjym3j8 zUoZnh)|n3HPHS7PSvRxa>hcu( z%GZ@5ReP8JIC({XA1}k~+U^sZzO3llxadfZQqm`h&AG=;1#LWP`O@O~`8oO8N6$S_ zeb|^2uKle=K}f~Dv4=NXHX ge~;{H_xa1Z;;^xg@}}$FKyNa5y85}Sb4q9e05cmdDgXcg diff --git a/static/img/open-dev.png b/static/img/open-dev.png deleted file mode 100644 index 98ce98db8c4c430c70c79d8f243b43778459125c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)50X`wF45$91pws^uj{Rpi3L_8x zXE^YmVGkH>|IYwK8~-zG`p>Wyj8^<-0HVeJ85aF#mjmKSL21<@{&J{m+mNMoIq}fG8GbHPBw5?Ylu%0|ChD zZD6Z`4glJ|25j|mB-?>j1MQuRWGT=_pmjh?fz|;n1=yFc%CZP8jOM?7@862M7 zNCR<_yxm;OkH}&M25w;xW@MN(M*=9wUgGKN%KngpO<0?+yMFgwpwMGa z7sn8Z%e`kR{hJ*G+8@q$4-(ejBf3>9_`Nnq*|u!%O-=0EuDt)Bc_;S5v}^V?lW+RW z^JQa5OM89xYX2#sJniamxn5)C{RcuD&m0e$Mq)BgGJ#A}}YlY8|BRVZF zN?IaJx!jA6syv-MB|B{6J>C2rGUcVxOOuR?&LkQKisXlOy-lB9{Y}|((p>qY>w;3& zYb^a%C;G0tFX__ze;$PsW^K~(ms-{V_i8uP&1Q z_g_MR-O3#rU5|>q3Qc9={I&D;<^2!1bNBK8TIT!RdN&U6PB;YgE`z75pUXO@geCx- C%N3*m diff --git a/static/img/open-zsdev.png b/static/img/open-zsdev.png deleted file mode 100644 index e15d87b75dc7faae3eb4165ea119f47eeeb0b972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3088 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 literal 6924 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 diff --git a/static/img/verified.png b/static/img/verified.png deleted file mode 100644 index 9986514430ac4708ba7168cd5969fce4ceb23cdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6KLdP1T!Hle|Nj|Ip`z3O8IJvD zI0_>V{%1JwpJ5LeZU4^zL>vDzZ2Hfz7K~Q>X8@wb{}~qjXP65{GyXG7|IaW9jC%hw z08z((hW7sq&Hovi{xj76XQ=tlQ1PFk{69kx80GwD$o&{CjvKudu(g6*>H+NTTjym3j8 zUoZnh)|n3!f=Nb8S1&F68E*uRQq3X zY4(jQlY3VlfAK$S)^KLGYf9w9OQ}Ke~zPkP0@)VaJzrxF#Gq&&h|NM73ch~Q_dV`9H5F0kf4_lU0$nl*%-F0e()Z&Vj fM>St