- {{proxyUser.description}}
+ {{proxyUser.description | stripTags | truncate(30)}}
diff --git a/frontend/src/components/FancyInput.vue b/frontend/src/components/FancyInput.vue
index e0c16d1..39125b8 100644
--- a/frontend/src/components/FancyInput.vue
+++ b/frontend/src/components/FancyInput.vue
@@ -53,42 +53,42 @@
@import '../assets/scss/variables.scss';
.fancy_input {
- display: inline-flex !important;
- flex-direction: column !important;
- position: relative !important;
- margin-top: 0.25rem !important;
- margin-bottom: 0.5rem !important;
+ display: inline-flex ;
+ flex-direction: column ;
+ position: relative ;
+ margin-top: 0.25rem ;
+ margin-bottom: 0.5rem ;
@at-root #{&}__input {
- transition: border-color 0.2s !important;
- width: 100% !important;
+ transition: border-color 0.2s ;
+ width: 100% ;
@at-root #{&}--large {
- padding: 0.5rem !important;
+ padding: 0.5rem ;
}
@at-root #{&}--error {
- border-color: $color__red--primary !important;
+ border-color: $color__red--primary ;
}
}
@at-root #{&}__placeholder {
- position: absolute !important;
- top: 0.35rem !important !important;
+ position: absolute ;
+ top: 0.35rem ;
background-color: #fff;
- left: 0.35rem !important;
- color: $color__gray--darkest !important;
- pointer-events: none !important;
- transition: top 0.2s, font-size 0.2s !important;
+ left: 0.35rem ;
+ color: $color__gray--darkest ;
+ pointer-events: none ;
+ transition: top 0.2s, font-size 0.2s ;
@at-root #{&}--large {
- top: 0.55rem !important;
- left: 0.6rem !important;
+ top: 0.55rem ;
+ left: 0.6rem ;
}
@at-root #{&}--active {
- top: -0.5rem !important;
- font-size: 0.75rem !important;
- transition: top 0.2s, font-size 0.2s !important;
+ top: -0.5rem ;
+ font-size: 0.75rem ;
+ transition: top 0.2s, font-size 0.2s ;
}
}
}
diff --git a/frontend/src/components/FancyTextarea.vue b/frontend/src/components/FancyTextarea.vue
index 4ccde8e..1cbad7d 100644
--- a/frontend/src/components/FancyTextarea.vue
+++ b/frontend/src/components/FancyTextarea.vue
@@ -90,7 +90,7 @@
padding: 0.1rem 0.25rem;
top: -1.75rem;
right: 0;
-
+
&:first-letter{ text-transform: capitalize; }
opacity: 0;
@@ -122,8 +122,8 @@
@media (max-width: 420px) {
.fancy_textarea {
@at-root #{&}__container {
- width: 100% !important;
+ width: 100% ;
}
}
}
-
\ No newline at end of file
+
diff --git a/frontend/src/components/InputEditorCore.vue b/frontend/src/components/InputEditorCore.vue
index a74ce9f..ac76779 100644
--- a/frontend/src/components/InputEditorCore.vue
+++ b/frontend/src/components/InputEditorCore.vue
@@ -322,7 +322,6 @@
@include user-select(none);
@include text($font--role-default, 1rem, 600);
color: $color__darkgray--primary;
- border: thin solid $color__gray--primary;
transition: background-color 0.2s;
&:hover {
diff --git a/frontend/src/components/LoadingIcon.vue b/frontend/src/components/LoadingIcon.vue
index 4062bba..b52652e 100644
--- a/frontend/src/components/LoadingIcon.vue
+++ b/frontend/src/components/LoadingIcon.vue
@@ -41,7 +41,7 @@
@at-root #{&}--dark {
span {
- background-color: $color__darkgray--primary !important;
+ background-color: $color__darkgray--primary ;
}
}
diff --git a/frontend/src/components/MoreThreads.vue b/frontend/src/components/MoreThreads.vue
index ab94602..765b9c9 100644
--- a/frontend/src/components/MoreThreads.vue
+++ b/frontend/src/components/MoreThreads.vue
@@ -55,12 +55,10 @@
@import '../assets/scss/variables.scss';
.more_threads {
- background-color: #fff;
border-radius: 0.25rem;
width: 80%;
padding: 1rem;
margin-top: 1.5rem;
- border: thin solid $color__gray--darker;
@at-root #{&}__header {
font-size: 1.5rem;
@@ -78,28 +76,17 @@
border-bottom: thin solid $color__gray--darker;
transition: all 0.2s;
- &:hover {
- background-color: $color__lightgray--primary;
- }
- &:active {
- background-color: $color__lightgray--darker;
- }
-
@at-root #{&}--header {
cursor: default;
font-size: 1rem;
font-weight: 500;
- border-bottom: 0.125rem solid $color__gray--darker;
-
- &:hover { background-color: #fff; }
- }
+ }
}
@at-root #{&}__name {
word-break: break-all;
padding-right: 0.5rem;
}
@at-root #{&}__date_created {
- color: $color__text--secondary;
font-size: 1rem;
flex-shrink: 0;
}
diff --git a/frontend/src/components/NotificationButton.vue b/frontend/src/components/NotificationButton.vue
index 92ba9bb..5114fb9 100644
--- a/frontend/src/components/NotificationButton.vue
+++ b/frontend/src/components/NotificationButton.vue
@@ -424,7 +424,7 @@
.notification_button__menu {
width: 100%;
left: unset;
- right: unset !important;
+ right: unset ;
}
}
diff --git a/frontend/src/components/PostScrubber.vue b/frontend/src/components/PostScrubber.vue
index 8368372..e833f55 100644
--- a/frontend/src/components/PostScrubber.vue
+++ b/frontend/src/components/PostScrubber.vue
@@ -4,7 +4,7 @@
{
+ window.addEventListener('mouseup', () => {
if(this.dragging) {
this.dragging = false
this.$emit('input', this.currentPost-1)
@@ -143,12 +143,11 @@
margin-left: 0.25rem;
@at-root #{&}--no_top_transition {
- transition: background-color 0.2s !important;
+ transition: background-color 0.2s ;
}
@at-root #{&}__line {
height: 100%;
- background-color: $color__gray--darker;
border-radius: 1rem;
width: 0.125rem;
}
@@ -193,14 +192,11 @@
width: 10rem;
margin-top: calc(-1.5rem / 2 - 0.125rem);
pointer-events: none;
- background-color: #fff;
left: 1rem;
font-size: 0.9rem;
border-radius: 0.125rem;
padding: 0.25rem;
transition: top 0.3s;
-
- @extend .shadow_border;
- }
+ }
}
-
\ No newline at end of file
+
diff --git a/frontend/src/components/SelectButton.vue b/frontend/src/components/SelectButton.vue
index 54bbe5b..e957888 100644
--- a/frontend/src/components/SelectButton.vue
+++ b/frontend/src/components/SelectButton.vue
@@ -98,7 +98,7 @@
}
@at-root #{&}__button--selected {
- color: $color__blue--darker !important;
+ color: $color__blue--darker ;
}
@at-root #{&}__option {
diff --git a/frontend/src/components/SelectFilter.vue b/frontend/src/components/SelectFilter.vue
index b664a14..76bdec4 100644
--- a/frontend/src/components/SelectFilter.vue
+++ b/frontend/src/components/SelectFilter.vue
@@ -95,7 +95,7 @@
transition: transform 0.2s;
}
@at-root #{&}--selected {
- color: $color__blue--darker !important;
+ color: $color__blue--darker ;
}
}
diff --git a/frontend/src/components/ThreadDisplay.vue b/frontend/src/components/ThreadDisplay.vue
index 8dadb09..75572d2 100644
--- a/frontend/src/components/ThreadDisplay.vue
+++ b/frontend/src/components/ThreadDisplay.vue
@@ -86,7 +86,6 @@
@import '../assets/scss/variables.scss';
.thread_display {
- background-color: #fff;
border: thin solid $color__gray--darker;
border-radius: 0.25rem;
cursor: pointer;
diff --git a/frontend/src/components/ThreadPost.vue b/frontend/src/components/ThreadPost.vue
index e94b2dd..8b1bc52 100644
--- a/frontend/src/components/ThreadPost.vue
+++ b/frontend/src/components/ThreadPost.vue
@@ -262,7 +262,6 @@
border-radius: 0.25rem;
@at-root #{&}--highlighted {
- background-color: $color__lightgray--darkest;
animation-name: shake;
animation-iteration-count: 5;
animation-timing-function: linear;
diff --git a/frontend/src/components/ThreadPostNotification.vue b/frontend/src/components/ThreadPostNotification.vue
index 4bd7f64..ccf8089 100644
--- a/frontend/src/components/ThreadPostNotification.vue
+++ b/frontend/src/components/ThreadPostNotification.vue
@@ -15,7 +15,7 @@
@import '../assets/scss/variables.scss';
.slide-fade-enter-active, .slide-fade-leave-active {
- transition: all 0.4s cubic-bezier(0.18, 0.89, 0.32, 1.28) !important;
+ transition: all 0.4s cubic-bezier(0.18, 0.89, 0.32, 1.28) ;
}
.slide-fade-enter, .slide-fade-leave-to {
transform: translateX(25rem);
@@ -65,7 +65,7 @@
transition: background-color 0.2s;
width: 1rem;
height: 1rem;
-
+
@include user-select(none);
&:hover {
@@ -87,4 +87,4 @@
name: 'ThreadPostNotification',
props: ['post']
}
-
\ No newline at end of file
+
diff --git a/frontend/src/components/UserDisplay.vue b/frontend/src/components/UserDisplay.vue
index ccdbaf6..3f320c8 100644
--- a/frontend/src/components/UserDisplay.vue
+++ b/frontend/src/components/UserDisplay.vue
@@ -6,6 +6,28 @@
{{user.username}}
+
+
+ SYSTEM
+
+
+
+ BOT
+
+
+
+ ADMIN
+
+
+
+ HIDDEN
+
+
+
+ BOOSTER
+
+
+
@@ -78,8 +84,8 @@
HIDDEN
-
- BOOSTER
+
+ BOOSTER
diff --git a/frontend/src/components/routes/HomeAuthenticated.vue b/frontend/src/components/routes/HomeAuthenticated.vue
index b486868..eaf4908 100644
--- a/frontend/src/components/routes/HomeAuthenticated.vue
+++ b/frontend/src/components/routes/HomeAuthenticated.vue
@@ -1,3 +1,5 @@
- Unused
+
+
+
diff --git a/frontend/src/components/routes/Index.vue b/frontend/src/components/routes/Index.vue
index 20eac82..a8055e2 100644
--- a/frontend/src/components/routes/Index.vue
+++ b/frontend/src/components/routes/Index.vue
@@ -43,8 +43,27 @@
+
+
+ Leaderboard:
+
+
+
+
+ {{user.postCount}} post posts
+
+ {{user.username}}
+
+
+
+
+
+
+ Something went wrong while loading the users, check your internet connection, or check the Service Status
+
+
+
Kaverti v{{this.$store.state.clientVersion}}
diff --git a/frontend/src/components/routes/SettingsAccount.vue b/frontend/src/components/routes/SettingsAccount.vue
index 8f60d3c..5d0b0a7 100644
--- a/frontend/src/components/routes/SettingsAccount.vue
+++ b/frontend/src/components/routes/SettingsAccount.vue
@@ -1,9 +1,9 @@
diff --git a/frontend/src/components/routes/SettingsExperiments.vue b/frontend/src/components/routes/SettingsExperiments.vue
index 4852b81..24cf5eb 100644
--- a/frontend/src/components/routes/SettingsExperiments.vue
+++ b/frontend/src/components/routes/SettingsExperiments.vue
@@ -1,9 +1,135 @@
-
+
-
+ Experiments
+
+ Dark Theme
+
+ Theme
+
+
+
+
+ Save experiment preferences
+
+
-
+
+
+
+ Please enable Integration Developer Mode to gain access to experiments.
+ It's easy! Just go to Settings > General, flip the switch and save!
+
+
+
+ Preferences
+ Developer Mode and get beta features first
+
+ Save preferences
+
+
-
+
Remove Friend
-
+
Send friend request
diff --git a/frontend/src/components/routes/UserWall.vue b/frontend/src/components/routes/UserWall.vue
index fae9355..ad29fe1 100644
--- a/frontend/src/components/routes/UserWall.vue
+++ b/frontend/src/components/routes/UserWall.vue
@@ -407,7 +407,7 @@ export default {
width: 100%;
> div, input {
- width: 100% !important;
+ width: 100% ;
}
}
}
diff --git a/frontend/src/components/routes/UsersList.vue b/frontend/src/components/routes/UsersList.vue
index ff5dc29..a7cf304 100644
--- a/frontend/src/components/routes/UsersList.vue
+++ b/frontend/src/components/routes/UsersList.vue
@@ -43,11 +43,13 @@
- {{user.description | truncate(200)}}
-
+ {{user.description | truncate(200)}}
- No description set.
+ No description set.
+
+
+ Post count: {{user.postCount}}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index d23db13..be5a056 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -31,7 +31,7 @@ import { faBell, faComment } from '@fortawesome/free-regular-svg-icons'
import VueMatomo from 'vue-matomo'
import { VueSpinners } from '@saeris/vue-spinners'
import moment from 'moment'
-
+import VueSkipTo from '@vue-a11y/skip-to'
import {
faBars, faPlus, faGrin, faLink, faCode,
faTimes, faUnlockAlt, faReply, faHome, faTh,
@@ -57,6 +57,7 @@ Vue.component('font-awesome-icon', FontAwesomeIcon);
const Index = () => import('./components/routes/Index')
const CategorySelect = () => import('./components/routes/CategorySelect')
const HomeUnauthenticated = () => import('./components/routes/HomeUnauthenticated')
+const HomeAuthenticated = () => import('./components/routes/HomeAuthenticated')
const P = () => import('./components/routes/P')
const Thread = () => import('./components/routes/Thread')
@@ -124,6 +125,7 @@ Vue.use(linkExpander)
Vue.use(Buefy, { defaultIconPack: 'fas' })
Vue.use(VPaginator)
Vue.use(VueSpinners)
+Vue.use(VueSkipTo)
Sentry.init({
dsn: "https://287b35aa71b54ffea9e66b5ce03d2e29@o444992.ingest.sentry.io/5420646",
@@ -145,6 +147,7 @@ Vue.use({
const router = new VueRouter({
routes: [
{ path: '/', component: HomeUnauthenticated },
+ { path: '/dashboard', component: HomeAuthenticated },
{ path: '/category/select', component: CategorySelect },
{ path: '/category/:category', component: Index },
{ path: '/p/:id', component: P },
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 5bdffe3..a27efd0 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -25,9 +25,10 @@ export default new Vuex.Store({
koins: '',
email: '',
emailVerified: true,
- clientVersion: '0.171-stable',
+ clientVersion: '0.172-stable',
latestClientVersion: '',
developerMode: false,
+ theme: '',
token: null,
passkey: "register",
@@ -94,6 +95,9 @@ export default new Vuex.Store({
setPassKey(state, passkey) {
state.passkey = passkey
},
+ setTheme(state, theme) {
+ state.theme = theme
+ },
set404Page(state, value) {
state.show404Page = value
},
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index d1740fa..850f707 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1520,6 +1520,11 @@
resolved "https://npm.open-registry.dev/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
+"@vue-a11y/skip-to@^2.1.1":
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/@vue-a11y/skip-to/-/skip-to-2.1.1.tgz#122fe02a589947f5c4afef66957ffd844bcbda39"
+ integrity sha512-/N7NVd9hy/oxmvaae8AUZo2IWcgZWjtNgkt/A+rwNqDeCFOREbCLEyzPWqcWvHO1ubzpGVoShGWuICGDqJr9xA==
+
"@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
version "1.0.0"
resolved "https://npm.open-registry.dev/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
diff --git a/lib/errors.js b/lib/errors.js
index 500cfc6..21d0be6 100644
--- a/lib/errors.js
+++ b/lib/errors.js
@@ -19,6 +19,10 @@ let Errors = {
'Due to the nature of this action, a login is required.',
401
],
+ deniedExperiments: [
+ 'Please enable integration developer mode to access experiments.',
+ 401
+ ],
reCAPTCHA: [
'Oh uh! You failed the reCAPTCHA score, please try again or contact support! This could be caused because you are operating the API through an unofficial client, CLI application, or reCAPTCHA is blocked by your network administrator or ISP.',
400
diff --git a/models/user.js b/models/user.js
index a59860e..4121969 100644
--- a/models/user.js
+++ b/models/user.js
@@ -78,7 +78,12 @@ module.exports = (sequelize, DataTypes) => {
},
theme: {
type: DataTypes.STRING,
- defaultValue: 'light'
+ defaultValue: 'light',
+ values: ['light', 'dark'],
+ isIn: {
+ args: [['light', 'dark']],
+ msg: "Theme can only be one of the pre-defined options"
+ },
},
lastRewardDate: {
type: DataTypes.DATE
@@ -108,7 +113,12 @@ module.exports = (sequelize, DataTypes) => {
},
developerMode: {
type: DataTypes.BOOLEAN,
- defaultValue: false
+ defaultValue: false,
+ validate: {
+ isBoolean: {
+ msg: 'Developer mode can only be true or false.'
+ }
+ }
},
experimentMode: {
type: DataTypes.BOOLEAN,
diff --git a/preview.html b/preview.html
index 8682ffa..caf32b3 100644
--- a/preview.html
+++ b/preview.html
@@ -23,16 +23,16 @@
diff --git a/routes/admin.js b/routes/admin.js
index a5f920d..e5edf62 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -37,7 +37,7 @@ router.put('/user/scrub', async (req, res, next) => {
if(user.admin) {
throw Errors.modifyAdminUser
}
- let userUpdate = await User.update({ description: "Scrambled by Admin: " + Math.random().toString(36).substring(2)}, { where: {
+ let userUpdate = await User.update({ description: "Description was removed by an administrator"}, { where: {
username: req.autosan.body.user
}})
res.status(200)
@@ -74,6 +74,7 @@ router.put('/user/modify', async (req, res, next) => {
let user = await User.findOne({ where: {
username: req.body.username
}})
+ if(!user) throw Errors.accountDoesNotExist
if(user.admin) {
throw Errors.modifyAdminUser
}
diff --git a/routes/user.js b/routes/user.js
index 685a6c0..85bd91f 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -271,118 +271,55 @@ router.get('/:username/picture', async (req, res, next) => {
}
} catch (e) { next(e) }
})
-router.get('/', async function(req, res) {
+
+router.get('/', async (req, res, next) => {
try {
let sortFields = {
createdAt: 'X.id',
username: 'X.username',
threadCount: 'threadCount',
- postCount: 'postCount',
- description: 'description'
+ postCount: 'postCount'
};
let offset = Number.isInteger(+req.query.offset) ? +req.query.offset : 0;
let havingClause = '';
-
- if (req.query.role === 'admin') {
+ if(req.query.role === 'admin') {
havingClause = 'HAVING Users.admin = true';
- } else if (req.query.role === 'user') {
+ } else if(req.query.role === 'user') {
havingClause = 'HAVING Users.admin = false';
} else {
havingClause = '';
}
-
- if (req.query.search) {
+ if(req.query.search) {
//I.e. if there is not already a HAVING clause
- if (!havingClause.length) {
+ if(!havingClause.length) {
havingClause = 'HAVING ';
} else {
havingClause += ' AND ';
}
-
havingClause += 'Users.username LIKE $search';
}
-
- let sql = `
- SELECT X.username, X.admin, X.level, X.levelProgress, X.bot, X.booster, X.description, X.koins, X.bodyColor, X.headColor, X.leftLegColor, X.rightLegColor, X.leftArmColor, X.rightArmColor, X.hidden, X.system, X.createdAt, X.contributor, X.postCount, COUNT(Threads.id) as threadCount
- FROM (
- SELECT Users.*, COUNT(Posts.id) as postCount
- FROM Users
- LEFT OUTER JOIN Posts
- ON Users.id = Posts.UserId
- GROUP BY Users.id
- ${havingClause}
- ) as X
- LEFT OUTER JOIN Threads
- ON X.id = Threads.UserId
- GROUP BY X.id
- ORDER BY ${sortFields[req.query.sort] || 'X.id'}
- LIMIT 9999
- OFFSET ${offset}
+ let sql = `
+ SELECT X.username, X.admin, X.level, X.levelProgress, X.bot, X.booster, X.description, X.bodyColor, X.headColor, X.leftLegColor, X.rightLegColor, X.leftArmColor, X.rightArmColor, X.hidden, X.system, X.createdAt, X.contributor, X.postCount, COUNT(Threads.id) as threadCount
+ FROM (
+ SELECT Users.*, COUNT(Posts.id) as postCount
+ FROM Users
+ LEFT OUTER JOIN Posts
+ ON Users.id = Posts.UserId
+ GROUP BY Users.id
+ ${havingClause}
+ ) as X
+ LEFT OUTER JOIN threads
+ ON X.id = Threads.UserId
+ GROUP BY X.id
+ ORDER BY ${sortFields[req.query.sort] || 'X.id'} ${req.query.order === 'asc' ? 'ASC' : 'DESC'}
+ LIMIT 2000
+ OFFSET ${offset}
`;
-
let users = await sequelize.query(sql, {
model: User,
- attributes: {exclude: ['hash', 'email', 'emailVerified', 'koins', 'currency2', 'emailToken', 'passwordResetExpiry', 'passwordResetToken', 'experimentMode', 'developerMode']},
- bind: {search: req.query.search + '%'}
+ bind: { search: req.query.search + '%' }
});
-
res.json(users)
- } catch (e) {
- }
-})
-
-router.all('*', (req, res, next) => {
- if(req.session.username) {
- next()
- } else {
- res.status(401)
- res.json({
- errors: [Errors.requestNotAuthorized]
- })
- }
-})
-
-router.put('/:username', async (req, res, next) => {
- try {
- if(req.session.username !== req.params.username) {
- throw Errors.requestNotAuthorized
- }
- await Ban.ReadOnlyMode(req.session.username)
-
- if(req.autosan.body.description !== undefined) {
- let user = await User.update({ description: req.autosan.body.description }, { where: {
- username: req.session.username
- }})
-
- res.json({ success: true })
-
- } else if(
- req.body.currentPassword !== undefined &&
- req.body.newPassword !== undefined
- ) {
- let user = await User.findOne({
- where: {
- username: req.session.username
- }
- })
-
- await user.updatePassword(req.body.currentPassword, req.body.newPassword)
- res.json({success: true})
- } else if(
- req.body.emailCurrentPassword !== undefined &&
- req.body.newEmail !== undefined
- ) {
- let user = await User.findOne({where: {
- username: req.session.username
- }})
-
- await user.updateEmail(req.body.emailCurrentPassword, req.body.newEmail)
- res.json({ success: true })
-
- } else {
- res.json({ success: false })
- }
} catch (e) { next(e) }
})
-
module.exports = router;
diff --git a/routes/userutils.js b/routes/userutils.js
index f246317..6fb62f5 100644
--- a/routes/userutils.js
+++ b/routes/userutils.js
@@ -97,6 +97,58 @@ router.post('/', async (req, res, next) => {
res.json(user.toJSON())
} catch (e) { next(e) }
})
+
+router.get('/leaderboard', async (req, res, next) => {
+ try {
+ let sortFields = {
+ createdAt: 'X.id',
+ username: 'X.username',
+ threadCount: 'threadCount',
+ postCount: 'postCount'
+ };
+ let offset = Number.isInteger(+req.query.offset) ? +req.query.offset : 0;
+ let havingClause = '';
+ if(req.query.role === 'admin') {
+ havingClause = 'HAVING Users.admin = true';
+ } else if(req.query.role === 'user') {
+ havingClause = 'HAVING Users.admin = false';
+ } else {
+ havingClause = '';
+ }
+ if(req.query.search) {
+ //I.e. if there is not already a HAVING clause
+ if(!havingClause.length) {
+ havingClause = 'HAVING ';
+ } else {
+ havingClause += ' AND ';
+ }
+ havingClause += 'Users.username LIKE $search';
+ }
+ let sql = `
+ SELECT X.username, X.postCount, COUNT(Threads.id) as threadCount
+ FROM (
+ SELECT Users.*, COUNT(Posts.id) as postCount
+ FROM Users
+ LEFT OUTER JOIN Posts
+ ON Users.id = Posts.UserId
+ GROUP BY Users.id
+ ${havingClause}
+ ) as X
+ LEFT OUTER JOIN threads
+ ON X.id = Threads.UserId
+ GROUP BY X.id
+ ORDER BY ${sortFields[req.query.sort] || 'X.id'} ${req.query.order === 'asc' ? 'ASC' : 'DESC'}
+ LIMIT 5
+ OFFSET ${offset}
+ `;
+ let users = await sequelize.query(sql, {
+ model: User,
+ bind: { search: req.query.search + '%' }
+ });
+ res.json(users)
+ } catch (e) { next(e) }
+})
+
router.post('/job-application', async (req, res, next) => {
try {
let userParams = {
@@ -405,4 +457,84 @@ router.get('/email-verify/:token', async (req, res) => {
}
});
+router.put('/preferences', async (req, res, next) => {
+ try {
+ if(!req.session.username) {
+ throw Errors.requestNotAuthorized
+ }
+ await Ban.ReadOnlyMode(req.session.username)
+
+ if(req.autosan.body.description !== undefined) {
+ let user = await User.update({ description: req.autosan.body.description }, { where: {
+ username: req.session.username
+ }})
+
+ res.json({ success: true })
+
+ } else if(
+ req.body.currentPassword !== undefined &&
+ req.body.newPassword !== undefined
+ ) {
+ let user = await User.findOne({
+ where: {
+ username: req.session.username
+ }
+ })
+
+ await user.updatePassword(req.body.currentPassword, req.body.newPassword)
+ res.json({success: true})
+ } else if(
+ req.body.emailCurrentPassword !== undefined &&
+ req.body.newEmail !== undefined
+ ) {
+ let user = await User.findOne({where: {
+ username: req.session.username
+ }})
+
+ await user.updateEmail(req.body.emailCurrentPassword, req.body.newEmail)
+ res.json({ success: true })
+ } else if(
+ req.body.developerMode !== undefined) {
+ let user = await User.update({developerMode: req.autosan.body.developerMode}, {
+ where: {
+ username: req.session.username
+ }
+ })
+
+ res.json({success: true})
+ } else {
+ res.json({ success: false })
+ }
+ } catch (e) { next(e) }
+})
+
+router.put('/experiments', async (req, res, next) => {
+ try {
+ if(!req.session.username) {
+ throw Errors.requestNotAuthorized
+ }
+ let queryObj = {
+ attributes: {include: ['developerMode']},
+ where: { username: req.session.username }
+ }
+ let user = await User.findOne(queryObj)
+ if(!user.developerMode) {
+ throw Errors.deniedExperiments
+ }
+ if(req.body.theme !== undefined) {
+ {
+ let user = await User.update({theme: req.autosan.body.theme}, {
+ where: {
+ username: req.session.username
+ }
+ })
+
+ res.json({success: true})
+ }
+ } else {
+ res.json({ success: false })
+ }
+ } catch (e) { next(e) }
+})
+
module.exports = router;
|