From 170bff607afa0636f37f8b25410e132251bfacf8 Mon Sep 17 00:00:00 2001 From: Matty Date: Tue, 4 Jan 2022 19:08:33 -0500 Subject: [PATCH] added new report and settings feature Added report for being a faggot and Discord/Spreaker links in the settings. --- app/models/content-report.js | 2 +- app/views/admin/settings/editor.pug | 9 +++++++-- app/views/comment/components/report-form.pug | 1 + app/views/components/page-footer.pug | 12 ++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/models/content-report.js b/app/models/content-report.js index 6423f18..ac73386 100644 --- a/app/models/content-report.js +++ b/app/models/content-report.js @@ -8,7 +8,7 @@ const mongoose = require('mongoose'); const Schema = mongoose.Schema; const REPORT_STATUS_LIST = ['new','resolved','ignored']; -const REPORT_CATEGORY_LIST = ['spam','violence','threat','porn','doxxing','other']; +const REPORT_CATEGORY_LIST = ['spam','violence','threat','porn','doxxing','faggot','other']; const ContentReportSchema = new Schema({ created: { type: Date, default: Date.now, required: true, index: 1, expires: '30d' }, diff --git a/app/views/admin/settings/editor.pug b/app/views/admin/settings/editor.pug index eb63125..867c494 100644 --- a/app/views/admin/settings/editor.pug +++ b/app/views/admin/settings/editor.pug @@ -13,7 +13,6 @@ block content .uk-margin label(for="company").uk-form-label Company name input(id="company", name="company", type="text", maxlength="200", placeholder="Enter company name", value= site.company).uk-input - fieldset legend Featured Embed textarea(id="featured-embed", name="featuredEmbed", rows="4").uk-textarea.uk-resize-vertical= site.featuredEmbed @@ -43,9 +42,12 @@ block content div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl") label(for="instagram-url").uk-form-label Instagram URL input(id="instagram-url", name="instagramUrl", type="url", placeholder="Enter Instagram URL", value= site.instagramUrl).uk-input + div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl") + label(for="discord-url").uk-form-label Discord URL + input(id="discord-url", name="discordUrl", type="url", placeholder="Enter Discord URL", value= site.discordUrl).uk-input fieldset - legend Media links + legend Media Links div(uk-grid).uk-grid-small div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl") label(for="bitchute-url").uk-form-label BitChute URL @@ -65,5 +67,8 @@ block content div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl") label(for="dlive-url").uk-form-label DLive URL input(id="dlive-url", name="dliveUrl", type="url", placeholder="Enter DLive channel URL", value= site.dliveUrl).uk-input + div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl") + label(for="spreaker-url").uk-form-label Spreaker URL + input(id="spreaker-url", name="spreakerUrl", type="url", placeholder="Enter Spreaker URL", value= site.spreakerUrl).uk-input button(type="submit").uk-button.dtp-button-primary Save Settings \ No newline at end of file diff --git a/app/views/comment/components/report-form.pug b/app/views/comment/components/report-form.pug index 1789f5d..72bd9c7 100644 --- a/app/views/comment/components/report-form.pug +++ b/app/views/comment/components/report-form.pug @@ -18,6 +18,7 @@ include comment-review option(value="violence") Violence/Threats option(value="porn") Porn option(value="doxxing") Doxxing + option(value="faggot") Being a Faggot option(value="other") Other .uk-margin diff --git a/app/views/components/page-footer.pug b/app/views/components/page-footer.pug index 52e395f..14616d8 100644 --- a/app/views/components/page-footer.pug +++ b/app/views/components/page-footer.pug @@ -63,6 +63,18 @@ section.uk-section.uk-section-muted.uk-section-small.dtp-site-footer span img(src="/img/social-icons/dlive.svg", style="width: auto; height: 1em;") span.uk-margin-small-left DLive + if site.discordUrl + li + a(href= site.discordUrl).dtp-social-link + span + img(src="/img/social-icons/discord.svg", style="width: auto; height: 1em;") + span.uk-margin-small-left Discord + if site.spreakerUrl + li + a(href= site.spreakerUrl).dtp-social-link + span + img(src="/img/social-icons/spreaker.svg", style="width: auto; height: 1em;") + span.uk-margin-small-left Spreaker .uk-width-medium.uk-margin-auto hr