23 changed files with 84 additions and 275 deletions
--- a/RELEASE.md
+++ b/RELEASE.md
@ -12,19 +12,9 @@ If the answer to any of the above is yes, then the release MUST be a major or mi
 - [ ] Add a commit which adds a database upgrade script at `db/upgrade/[oldversion]-[newversion].sql`
  - ALWAYS use a transaction for the entirety of this file
  - At minimum, DB version must be bumped
-  - Test the upgrade script as follows:
-    ```
-    git checkout [previous release tag]
-    docker-compose down
-    docker-compose up
-    psql -h 0 -U postgres < db/upgrade/v[previous]-v[current].sql
-    ```
-    Update the version in `src/version.ts` and verify the app works as expected.
- [ ] Add a commit which bumps the version in `src/version.ts` and `db/00-version.sql`, entitled `Bump version to vMAJOR.MINOR`
+- [ ] Add a commit which bumps the version in `app/version.ts` and `db/00-version.sql`
 - [ ] Tag the latest commit with `vMAJOR.MINOR`
- [ ] Write release notes

 ## Patch Releases
- [ ] Add a commit which bumps the patch level in `src/version.ts`, entitled `Bump version to vMAJOR.MINOR.PATCH`
+- [ ] Add a commit which bumps the patch level in `app/version.ts`
 - [ ] Tag the latest commit with `vMAJOR.MINOR.PATCH`
- [ ] Write release notes
--- a/db/00-version.sql
+++ b/db/00-version.sql
@ -8,4 +8,4 @@ CREATE OR REPLACE FUNCTION get_version() RETURNS VARCHAR
 	AS $$SELECT major || '.' || minor FROM version $$
 	LANGUAGE SQL;

-INSERT INTO version (major,minor) VALUES (0,8);
+INSERT INTO version (major,minor) VALUES (0,6);
--- a/db/05-config.sql
+++ b/db/05-config.sql
@ -1,14 +1,12 @@
 CREATE TABLE config (
 	rowlock bool DEFAULT TRUE UNIQUE NOT NULL CHECK (rowlock = TRUE),
-	normaluservotepoints int NOT NULL DEFAULT 10,
-	followervotepoints int NOT NULL DEFAULT 50,
-	subscribervotepoints int NOT NULL DEFAULT 100,
-	normaluserratelimit int NOT NULL DEFAULT 1,
-	followerratelimit int NOT NULL DEFAULT 2,
-	subscriberratelimit int NOT NULL DEFAULT 3,
-	title varchar NOT NULL DEFAULT '{username}''s Learn Request Queue',
-	colors jsonb NOT NULL DEFAULT '{"bg": {"primary": "#444444","table": "#282828","navbar": "#666666","error": "#ff0000"},"fg": {"primary": "#dddddd","ahover": "#ffffff","title": "#eeeeee"}}',
+	normaluservotepoints int NOT NULL,
+	followervotepoints int NOT NULL,
+	subscribervotepoints int NOT NULL,
+	title varchar NOT NULL,
+	colors jsonb NOT NULL,
 	PRIMARY KEY (rowLock)
 );

-INSERT INTO config (rowlock) VALUES (true);
+INSERT INTO config (normalUserVotePoints,followerVotePoints,subscriberVotePoints,title,colors)
+	VALUES (10,50,100,'{username}''s Learn Request Queue','{"bg": {"primary": "#444444","table": "#282828","navbar": "#666666","error": "#ff0000"},"fg": {"primary": "#dddddd","ahover": "#ffffff","title": "#eeeeee"}}');
--- a/db/15-streamer.sql
+++ b/db/15-streamer.sql
@ -3,4 +3,4 @@ CREATE TABLE streamer (
 	tokenPair json,
 	PRIMARY KEY (userid),
 	FOREIGN KEY (userid) REFERENCES users(userid)
-);
+)
--- a/db/20-requests.sql
+++ b/db/20-requests.sql
@ -1,5 +1,5 @@
 CREATE TABLE requests (
-	url varchar NOT NULL,
+	url varchar NOT NULL UNIQUE,
 	requester int NOT NULL,
 	state varchar NOT NULL DEFAULT 'Requested',
 	reqTimestamp timestamptz NOT NULL DEFAULT NOW(),
--- a/db/30-votes.sql
+++ b/db/30-votes.sql
@ -1,6 +1,6 @@
 CREATE TABLE votes (
-	requestUrl varchar NOT NULL,
-	userId int NOT NULL,
+	requestUrl varchar,
+	userId int,
 	PRIMARY KEY (requestUrl,userId),
 	FOREIGN KEY (requestUrl) REFERENCES requests(url) ON DELETE CASCADE,
 	FOREIGN KEY (userId) REFERENCES users(userId) ON DELETE CASCADE
--- a/db/50-bans.sql
+++ b/db/50-bans.sql
@ -1,4 +1,4 @@
 CREATE TABLE bans (
 	userid integer,
 	PRIMARY KEY (userid)
-);
+)
--- a/db/50-follows.sql
+++ b/db/50-follows.sql
@ -1,4 +1,4 @@
 CREATE TABLE follows (
 	userid integer,
 	PRIMARY KEY (userid)
-);
+)
--- a/db/50-subscriptions.sql
+++ b/db/50-subscriptions.sql
@ -1,4 +1,4 @@
 CREATE TABLE subscriptions (
 	userid integer,
 	PRIMARY KEY (userid)
-);
+)
--- a/db/90-views.sql
+++ b/db/90-views.sql
@ -60,22 +60,3 @@ CREATE OR REPLACE VIEW streamer_user_vw AS
 	SELECT users.userid as userid, users.displayname as displayname, users.imageurl as imageurl FROM streamer
 		LEFT JOIN users
 			ON streamer.userid = users.userid;
-
-CREATE OR REPLACE VIEW ratelimit_vw AS
-	SELECT users.userid,COALESCE(count,0),ratelimit.reqcount AS max,COALESCE(count,0) >= ratelimit.reqcount AS status
-		FROM users
-		LEFT JOIN (SELECT requester,COUNT(url)
-			FROM requests
-			WHERE reqtimestamp > (now() - '24 hours'::interval)
-			GROUP BY requests.requester
-		) AS requests ON users.userid = requests.requester
-		LEFT JOIN follows ON requests.requester = follows.userid
-		LEFT JOIN subscriptions ON requests.requester = subscriptions.userid
-		CROSS JOIN config
-		CROSS JOIN LATERAL (VALUES (
-			CASE
-				WHEN follows.userid IS NULL AND subscriptions.userid IS NULL THEN config.normaluserratelimit
-				WHEN follows.userid IS NOT NULL AND subscriptions.userid IS NULL THEN config.followerratelimit
-				WHEN subscriptions.userid IS NOT NULL THEN config.subscriberratelimit
-			END
-		)) AS ratelimit(reqcount);
--- a/db/95-procedures.sql
+++ b/db/95-procedures.sql
@ -16,13 +16,6 @@ CREATE OR REPLACE PROCEDURE add_request(url varchar,requester int)
 		CALL update_scores();
 	$$;

-CREATE OR REPLACE PROCEDURE clear_zero_votes()
-	LANGUAGE SQL
-	AS $$
-		DELETE FROM requests WHERE NOT EXISTS
-			(SELECT FROM votes WHERE requests.url = votes.requesturl);
-	$$;
-
 CREATE OR REPLACE PROCEDURE add_vote(url varchar,voteuser int)
 	LANGUAGE SQL
 	AS $$
@ -35,7 +28,6 @@ CREATE OR REPLACE PROCEDURE delete_vote(url varchar,voteuser int)
 	AS $$
 		DELETE FROM votes WHERE requesturl = url AND userid = voteuser;
 		CALL update_scores();
-		CALL clear_zero_votes();
 	$$;

 CREATE OR REPLACE PROCEDURE update_request_score_modifier(updateurl varchar, scoreDiff int)
--- a/db/upgrade/v0.6-v0.7.sql
+++ b/db/upgrade/v0.6-v0.7.sql
@ -1,24 +0,0 @@
-BEGIN;
-
-UPDATE version SET minor = 7;
-
-ALTER TABLE votes
-	ALTER COLUMN requestUrl SET NOT NULL,
-	ALTER COLUMN userId SET NOT NULL;
-
-CREATE OR REPLACE PROCEDURE clear_zero_votes()
-	LANGUAGE SQL
-	AS $$
-		DELETE FROM requests WHERE NOT EXISTS
-			(SELECT FROM votes WHERE requests.url = votes.requesturl);
-	$$;
-
-CREATE OR REPLACE PROCEDURE delete_vote(url varchar,voteuser int)
-	LANGUAGE SQL
-	AS $$
-		DELETE FROM votes WHERE requesturl = url AND userid = voteuser;
-		CALL update_scores();
-		CALL clear_zero_votes();
-	$$;
-
-COMMIT;
--- a/db/upgrade/v0.7-v0.8.sql
+++ b/db/upgrade/v0.7-v0.8.sql
@ -1,35 +0,0 @@
-BEGIN;
-
-UPDATE version SET minor = 8;
-
-ALTER TABLE config
-	ALTER COLUMN normaluservotepoints SET DEFAULT 10,
-	ALTER COLUMN followervotepoints SET DEFAULT 50,
-	ALTER COLUMN subscribervotepoints SET DEFAULT 100,
-	ALTER COLUMN title SET DEFAULT '{username}''s Learn Request Queue',
-	ALTER COLUMN colors SET DEFAULT '{"bg": {"primary": "#444444","table": "#282828","navbar": "#666666","error": "#ff0000"},"fg": {"primary": "#dddddd","ahover": "#ffffff","title": "#eeeeee"}}',
-	ADD COLUMN normaluserratelimit int NOT NULL DEFAULT 1,
-	ADD COLUMN followerratelimit int NOT NULL DEFAULT 2,
-	ADD COLUMN subscriberratelimit int NOT NULL DEFAULT 3;
-
-CREATE OR REPLACE VIEW ratelimit_vw AS
-	SELECT users.userid,COALESCE(count,0),ratelimit.reqcount AS max,COALESCE(count,0) >= ratelimit.reqcount AS status
-		FROM users
-		LEFT JOIN (SELECT requester,COUNT(url)
-			FROM requests
-			WHERE reqtimestamp > (now() - '24 hours'::interval)
-			GROUP BY requests.requester
-		) AS requests ON users.userid = requests.requester
-		LEFT JOIN follows ON requests.requester = follows.userid
-		LEFT JOIN subscriptions ON requests.requester = subscriptions.userid
-		CROSS JOIN config
-		CROSS JOIN LATERAL (VALUES (
-			CASE
-				WHEN follows.userid IS NULL AND subscriptions.userid IS NULL THEN config.normaluserratelimit
-				WHEN follows.userid IS NOT NULL AND subscriptions.userid IS NULL THEN config.followerratelimit
-				WHEN subscriptions.userid IS NOT NULL THEN config.subscriberratelimit
-			END
-		)) AS ratelimit(reqcount);
-
-
-COMMIT;
--- a/public/main.js
+++ b/public/main.js
@ -2,14 +2,11 @@ var requestsDiv = document.getElementById("requests");
 var cronJobs = ['processBans'];
 var currentPage = 1;
 var totalPages = 1;
-var count = document.getElementById("count").value;
-var sortBy = document.getElementById("sortBy").value;
-var sortDir = "desc";

-function getRequests(offset,allRequests) {
+function getRequests(count,offset,allRequests) {
 	if (allRequests) var reqUrl = "/api/getAllRequests";
 	else var reqUrl = "/api/getRequests";
-	reqUrl += `?count=${count}&offset=${offset}&sort=${sortBy}&sortDirection=${sortDir}`;
+	reqUrl += `?count=${count}&offset=${offset}`;
 	fetch(reqUrl)
 		.then(response => response.json())
 		.then(requests => {
@ -41,7 +38,7 @@ function buildTable(requests) {
 		document.getElementById("page").innerHTML += `<option value=${i}>${i}</option>`;
 	}
 	document.getElementById("page").value = currentPage;
-	var requestsDivHTML = '<table><tr><th class="request-link">Song Title</th><th class="request-requester">Requester</th><th class="request-score">Score</th>';
+	var requestsDivHTML = '<table><tr><th class="request-link">Song</th><th class="request-requester">Requester</th><th class="request-score">Score</th>';
 	requestsDivHTML += '<th class="request-state">State</td>';
 	if (window.loggedIn) requestsDivHTML += '<th class="request-vote">Vote</td>';
 	if (window.isStreamer) requestsDivHTML += '<th class="request-update">Update</th>'
@ -68,14 +65,14 @@ function buildTable(requests) {
 }

 function updateTable() {
+	var count = document.getElementById("count").value;
 	var offset = (currentPage - 1) * count;
 	var allRequests = document.getElementById("allRequests").checked;
-	getRequests(offset,allRequests);
+	getRequests(count,offset,allRequests);
 }

 function applyUrlTransforms(url) {
 	console.log("Begin applyUrlTransforms:" + url);
-	url = url.trim();
 	if (url.match(/^https?:\/\/(www\.)?youtu(\.be|be\.com)\//)) { // Youtube
 		console.log("Youtube");
 		var videoid = "";
@ -236,7 +233,7 @@ function validateAndSubmitRequest() {
 			updateTable();
 			document.getElementById("addRequestUrl").value = "";
 			response.text().then((message) => {
-				closeAllModals();
+				closeAddRequestModal();
 				showMessage(message);
 			});
 		});
@ -378,16 +375,5 @@ for(state of validStates) {
 	var opt = document.createElement("option");
 	opt.text = state;
 	opt.value = state;
-	updateRequestStateSelect.add(opt);
-}
-
-function toggleSortDir() {
-	if (window.sortDir == "desc") {
-		document.getElementById("sortDir").innerText = "↑";
-		window.sortDir = "asc";
-	} else {
-		document.getElementById("sortDir").innerText = "↓";
-		window.sortDir = "desc";
-	}
-	updateTable();
+	updateRequestStateSelect.add(opt)
 }
--- a/public/style.css
+++ b/public/style.css
@ -111,20 +111,11 @@ div#nav-userpic {
 	text-align: right;
 }

-.tableSettings {
+#tableSettings {
  display: flex;
-  align-items: center;
  justify-content: space-between;
 }

-.tableSettings > span {
-  margin: auto;
-}
-
-#tableSettingsTop {
-  margin-bottom: 10px;
-}
-
 #modalBackground {
 	display: none;
 	position: fixed;
@ -137,7 +128,6 @@ div#nav-userpic {
 	height: 100%;
 	background-color: #444;
 	background-color: #444a;
-  margin: 5px;
 }

 .modal {
@ -211,7 +201,3 @@ div#nav-userpic {
  display: flex;
  justify-content: space-between;
 }
-
-#sortDir {
-  padding: 0;
-}
--- a/src/app.ts
+++ b/src/app.ts
@ -46,37 +46,16 @@ app.get("/api/getRequests", async (request, response) => {
 	await validateApiToken(request.session);
 	var requestCount = ( request.query.count ? parseInt(request.query.count as string, 10) : 5 );
 	var requestOffset = ( request.query.offset ? parseInt(request.query.offset as string, 10) : 0 );
-	var sortDirection = ( request.query.sortDirection == "asc" ? "ASC" : "DESC" );
-	var inverseSortDirection = ( sortDirection == "ASC" ? "DESC" : "ASC" );
-	switch (request.query.sort) {
-		case undefined: // Default sort by newest
-		case "timestamp":
-			var requestSort = `reqTimestamp ${sortDirection}`;
-			break;
-		case "score":
-			var requestSort = `score ${sortDirection}, reqTimestamp ${inverseSortDirection}`;
-			break;
-		case "title":
-			var requestSort = `title ${sortDirection}`
-			break;
-		case "requester":
-			var requestSort = `requester ${sortDirection}, title ${sortDirection}`
-			break;
-		default:
-			response.status(400);
-			response.send("Invalid sort");
-			return;
-	};
 	var requestsTotal = await requests.getRequestsTotal();
 	if (request.session.user) {
-		requests.getRequestsVoted(requestCount,requestOffset,requestSort,request.session.user.id)
+		requests.getRequestsVoted(requestCount,requestOffset,request.session.user.id)
 			.then((val: Array<any>) => response.send({
 					total: requestsTotal,
 					requests: val
 				}))
 			.catch((e: any) => errorHandler(request,response,e));
 	} else {
-		requests.getRequests(requestCount,requestOffset,requestSort)
+		requests.getRequests(requestCount,requestOffset)
 			.then((val: Array<any>) => response.send({
 					total: requestsTotal,
 					requests: val
@ -90,33 +69,16 @@ app.get("/api/getAllRequests", async (request, response) => {
 	await validateApiToken(request.session);
 	var requestCount = ( request.query.count ? parseInt(request.query.count as string, 10) : 5 );
 	var requestOffset = ( request.query.offset ? parseInt(request.query.offset as string, 10) : 0 );
-	var sortDirection = ( request.query.sortDirection == "asc" ? "ASC" : "DESC" );
-	switch (request.query.sort) {
-		case undefined:
-		case "score":
-			var requestSort = `score ${sortDirection}, reqTimestamp ASC`;
-			break;
-		case "timestamp":
-			var requestSort = `reqTimestamp ${sortDirection}`;
-			break;
-		case "alpha":
-			var requestSort = `title ${sortDirection}`
-			break;
-		default:
-			response.status(400);
-			response.send("Invalid sort");
-			return;
-	}
 	var requestsTotal = await requests.getAllRequestsTotal();
 	if (request.session.user) {
-		requests.getAllRequestsVoted(requestCount,requestOffset,requestSort,request.session.user.id)
+		requests.getAllRequestsVoted(requestCount,requestOffset,request.session.user.id)
 			.then((val: Array<any>) => response.send({
 					total: requestsTotal,
 					requests: val
 				}))
 			.catch((e: any) => errorHandler(request,response,e));
 	} else {
-		requests.getAllRequests(requestCount,requestOffset,requestSort)
+		requests.getAllRequests(requestCount,requestOffset)
 			.then((val: Array<any>) => response.send({
 					total: requestsTotal,
 					requests: val
--- a/src/cronjobs/processBans.ts
+++ b/src/cronjobs/processBans.ts
@ -9,8 +9,8 @@ export async function processBans(streamer: twitch.StreamerUserIdTokenPair) {
 		await dbconn.query("DELETE FROM bans");
 		var response = await twitch.streamerApiRequest(streamer,
 			`/moderation/banned?broadcaster_id=${streamer.userid}&first=100`);
-		log(LogLevel.DEBUG,"Ban API response:")
-		log(LogLevel.DEBUG,JSON.stringify(response,null,2));
+		//log(LogLevel.DEBUG,"Ban API response:")
+		//log(LogLevel.DEBUG,JSON.stringify(response,null,2));
 		while (true) {
 			var insertBanQuery = "INSERT INTO bans (userid) VALUES ";
 			var banRow = 0; // Used for $1, $2, etc. in parameterized query
@ -37,8 +37,8 @@ export async function processBans(streamer: twitch.StreamerUserIdTokenPair) {
 				var oldFirstUserid = response.data[0].user_id;
 				response = await twitch.streamerApiRequest(streamer,
 					`/moderation/banned?broadcaster_id=${streamer.userid}&after=${response.pagination.cursor}&first=100`);
-				log(LogLevel.DEBUG,"Ban API response:");
-				log(LogLevel.DEBUG,JSON.stringify(response,null,2));
+				//log(LogLevel.DEBUG,"Ban API response:");
+				//log(LogLevel.DEBUG,JSON.stringify(response,null,2));
 				// Work around broken api endpoint giving a cursor referring to the
 				// current page, causing an infinite loop
 				if (oldFirstUserid == response.data[0].user_id) break;
--- a/src/cronjobs/processSubscriptions.ts
+++ b/src/cronjobs/processSubscriptions.ts
@ -9,8 +9,8 @@ export async function processSubscriptions(streamer: twitch.StreamerUserIdTokenP
 		await dbconn.query("DELETE FROM subscriptions");
 		var response = await twitch.streamerApiRequest(streamer,
 			`/subscriptions?broadcaster_id=${streamer.userid}&first=100`);
-		log(LogLevel.DEBUG,"Subscriptions API response:")
-		log(LogLevel.DEBUG,JSON.stringify(response,null,2));
+		//log(LogLevel.DEBUG,"Subscriptions API response:")
+		//log(LogLevel.DEBUG,JSON.stringify(response,null,2));
 		while (true) {
 			var insertSubscriptionQuery = "INSERT INTO subscriptions (userid) VALUES ";
 			var subscriptionRow = 0; // Used for $1, $2, etc. in parameterized query
@ -22,7 +22,6 @@ export async function processSubscriptions(streamer: twitch.StreamerUserIdTokenP
 					subscriptionsArray.push(subscription.user_id as number);
 				}
 				insertSubscriptionQuery = insertSubscriptionQuery.slice(0,-2); // Cut last `, ` off of the end
-				insertSubscriptionQuery += " ON CONFLICT DO NOTHING"; // Deal with broken endpoint returning dupes
 				var subscriptionQueryConfig = {
 					text: insertSubscriptionQuery,
 					values: subscriptionsArray
@ -32,12 +31,11 @@ export async function processSubscriptions(streamer: twitch.StreamerUserIdTokenP
 				await dbconn.query(subscriptionQueryConfig);
 			}
 			if (response.pagination.cursor) {
-				var oldFirstUserid = response.data[0].user_id;
+				//var oldFirstUserid = response.data[0].user_id;
 				response = await twitch.streamerApiRequest(streamer,
 					`/subscriptions?broadcaster_id=${streamer.userid}&after=${response.pagination.cursor}&first=100`);
-				log(LogLevel.DEBUG,"Subscription API response:");
-				log(LogLevel.DEBUG,JSON.stringify(response,null,2));
-				if (response.data.length === 0 || oldFirstUserid === response.data[0].user_id) break;
+				//log(LogLevel.DEBUG,"Subscription API response:");
+				//log(LogLevel.DEBUG,JSON.stringify(response,null,2));
 			} else {
 				break;
 			}
@ -45,7 +43,6 @@ export async function processSubscriptions(streamer: twitch.StreamerUserIdTokenP
 		await dbconn.query("CALL update_scores()");
 		await dbconn.query('COMMIT');
 	} catch (e) {
-		log(LogLevel.ERROR,"cronjobs.processSubscriptions: Exception: " + e);
 		log(LogLevel.ERROR,"cronjobs.processSubscriptions: Exception thrown; rolling back");
 		await dbconn.query('ROLLBACK');
 		throw(e);
--- a/src/queries.ts
+++ b/src/queries.ts
@ -52,12 +52,39 @@ export const updateVotePoints = {
 	text: "CALL update_vote_points($1,$2,$3)"
 }

+// Request-related queries
+export const getRequests = {
+	name: "getRequests",
+	text: "SELECT * FROM requests_vw \
+		JOIN states ON requests_vw.state = states.state WHERE active \
+		ORDER BY score DESC, reqTimestamp ASC LIMIT $1 OFFSET $2"
+}
+
+export const getRequestsVoted = {
+	name: "getRequestsVoted",
+	text: "SELECT * FROM get_requests_voted($3) \
+		JOIN states ON get_requests_voted.state = states.state WHERE active \
+		ORDER BY score DESC, reqTimestamp ASC LIMIT $1 OFFSET $2"
+}
+
 export const getRequestsTotal = {
 	name: "getRequestsTotal",
 	text: "SELECT COUNT(*) FROM requests_vw \
 		JOIN states ON requests_vw.state = states.state WHERE active"
 }

+export const getAllRequests = {
+	name: "getAllRequests",
+	text: "SELECT * FROM requests_vw \
+		ORDER BY score DESC, reqTimestamp ASC LIMIT $1 OFFSET $2"
+}
+
+export const getAllRequestsVoted = {
+	name: "getAllRequestsVoted",
+	text: "SELECT * FROM get_requests_voted($3) \
+		ORDER BY score DESC, reqTimestamp ASC LIMIT $1 OFFSET $2"
+}
+
 export const getAllRequestsTotal = {
 	name: "getAllRequestsTotal",
 	text: "SELECT COUNT(*) FROM requests_vw"
@ -65,7 +92,7 @@ export const getAllRequestsTotal = {

 export const checkRequestExists = {
 	name: "checkRequestExists",
- 	text: "SELECT url,requester,state FROM requests_vw WHERE url = $1"
+ 	text: "SELECT url FROM requests WHERE url = $1"
 }

 export const addRequest = {
@ -130,8 +157,3 @@ export const updateCronJobLastSuccess = {
 	name: "updateCronJobLastSuccess",
 	text: "UPDATE cron SET lastSuccess = now() WHERE jobName = $1"
 }
-
-export const getRateLimitStatus = {
-	name: "getRateLimitStatus",
-	text: "SELECT * FROM ratelimit_vw WHERE userid = $1"
-}
--- a/src/requests.ts
+++ b/src/requests.ts
@ -4,24 +4,14 @@ import { log, LogLevel } from "./logging"
 import pg from "pg";
 import db from "./db";

-export async function getRequests(count: number, offset: number, sort: string) {
-	var query = {
-		text: "SELECT * FROM requests_vw \
-			JOIN states ON requests_vw.state = states.state WHERE active \
-			ORDER BY " + sort + " LIMIT $1 OFFSET $2",
-		values: [count,offset]
-	};
+export async function getRequests(count: number, offset: number) {
+	var query = Object.assign(queries.getRequests, { values: [count,offset] });
 	return db.query(query)
 	.then((result: pg.QueryResult) => result.rows);
 };

-export async function getRequestsVoted(count: number, offset: number, sort: string, user: number) {
-	var query = {
-		text: "SELECT * FROM get_requests_voted($3) \
-			JOIN states ON get_requests_voted.state = states.state WHERE active \
-			ORDER BY " + sort + " LIMIT $1 OFFSET $2",
-		values: [count,offset,user]
-	};
+export async function getRequestsVoted(count: number, offset: number, user: number) {
+	var query = Object.assign(queries.getRequestsVoted, { values: [count,offset,user] });
 	return db.query(query)
 	.then((result: pg.QueryResult) => result.rows);
 };
@ -31,22 +21,14 @@ export async function getRequestsTotal() {
 	.then((result: pg.QueryResult) => result.rows[0]["count"]);
 };

-export async function getAllRequests(count: number, offset: number, sort: string) {
-	var query = {
-		text: "SELECT * FROM requests_vw \
-			ORDER BY " + sort + " LIMIT $1 OFFSET $2",
-		values: [count,offset]
-	};
+export async function getAllRequests(count: number, offset: number) {
+	var query = Object.assign(queries.getAllRequests, { values: [count,offset] });
 	return db.query(query)
 	.then((result: pg.QueryResult) => result.rows);
 };

-export async function getAllRequestsVoted(count: number, offset: number, sort: string, user: number) {
-	var query = {
-		text: "SELECT * FROM get_requests_voted($3) \
-			ORDER BY " + sort + " LIMIT $1 OFFSET $2",
-		values: [count,offset,user]
-	};
+export async function getAllRequestsVoted(count: number, offset: number, user: number) {
+	var query = Object.assign(queries.getAllRequestsVoted, { values: [count,offset,user] });
 	return db.query(query)
 	.then((result: pg.QueryResult) => result.rows);
 };
@ -87,7 +69,6 @@ async function retrieveYoutubeMetadata(url: string) {
 }

 export async function addRequest(url: string, requester: string): Promise<[number,string]> {
-	// Check that URL is of an accepted format
 	var validUrl = false;
 	for (var regex of validUrlRegexes) {
 		if (regex.test(url)) {
@ -96,24 +77,10 @@ export async function addRequest(url: string, requester: string): Promise<[numbe
 		}
 	}
 	if (!validUrl) return [400, "Invalid song URL."];
-
-	// Check whether the URL has already been requested
-	var existsResult = await checkRequestExists(url)
-	if (existsResult) {
-		console.log(existsResult);
-		return [200,`Song already requested by ${existsResult.rows[0].requester}. State: ${existsResult.rows[0].state}`]
+	var result = await checkRequestExists(url)
+	if (result) {
+		return [200,`Song already requested by ${result.rows[0].requester}. State: ${result.rows[0].state}`]
 	}
-
-	// Check whether the user has hit their rate limit
-	var rateLimitQuery = Object.assign(queries.getRateLimitStatus, { values: [requester] });
-	var rateLimitResult = (await db.query(rateLimitQuery)).rows[0];
-	if (rateLimitResult.status) {
-		return [429,`You have reached your maximum of ${rateLimitResult.max} requests per day.
-			Please try again later.\n
-			Tip: Removing one of your requests from the past 24 hours by retracting your vote will allow you to replace it with another.`];
-	}
-
-	// Add the request
 	var query = Object.assign(queries.addRequest, { values: [url,requester] });
 	return db.query(query)
 		.then(async () => {
--- a/src/twitch.ts
+++ b/src/twitch.ts
@ -53,7 +53,6 @@ export async function apiRequest(tokens: TokenPair, endpoint: string): Promise <
 	return fetch("https://api.twitch.tv/helix" + endpoint, { headers: headers })
 		.then(async (res: FetchResponse) => {
 			if (res.status == 200) {
-				log(LogLevel.DEBUG,"twitch.apiRequest: Request returned 200 for " + endpoint);
 				return res.json();
 			} else {
 				log(LogLevel.WARNING,"twitch.apiRequest: Failed API request (pre-refresh):");
--- a/src/version.ts
+++ b/src/version.ts
@ -5,7 +5,7 @@ import pg from "pg";
 import db from "./db";

 var versionMajor = 0;
-var versionMinor = 8;
+var versionMinor = 6;
 var versionPatch = 0;

 export function getVersion() {
--- a/views/main.eta
+++ b/views/main.eta
@ -29,10 +29,11 @@
 			<%- } %>
 		</div>
 		<div id="main">
-			<div class="tableSettings" id="tableSettingsTop">
+			<div id="requests"></div><br>
+			<div id="tableSettings">
 				<span style="width:420px">
 					Count:
-					<select id="count" value="10" onchange="window.count = this.value;updateTable()">
+					<select id="count" value="10" onchange="updateTable()">
 						<option>5</option>
 						<option selected="selected">10</option>
 						<option>25</option>
@ -40,22 +41,6 @@
 						<option>100</option>
 					</select>
 				</span>
-				<span>
-					Sort by:
-					<select id="sortBy" onchange="window.sortBy = this.value;updateTable()">
-						<option value="title">Song Title</option>
-						<option value="requester">Requester</option>
-						<option value="score">Score</option>
-						<option value="timestamp" selected>Request Time</option>
-					</select>
-					<button id="sortDir" onclick="toggleSortDir()">↓</button>
-				</span>
-				<span style="width:420px">
-					<input type="checkbox" id="allRequests" onchange="updateTable()">View all requests</input>
-				</span>
-			</div>
-			<div id="requests"></div><br>
-			<div class="tableSettings">
 				<span>
 					<button id="pageBtnFirst" onclick="goToPage(1)">&lt;&lt;</button>
 					<button id="pageBtnPrev" onclick="goToPage(currentPage-1)">&lt;</button>
@ -66,6 +51,9 @@
 					<button id="pageBtnNext" onclick="goToPage(currentPage+1)">&gt;</button>
 					<button id="pageBtnLast" onclick="goToPage(totalPages)">&gt;&gt;</button>
 				</span>
+				<span style="width:420px">
+					<input type="checkbox" id="allRequests" onchange="updateTable()">View learned and rejected requests</input>
+				</span>
 			</div>
 		</div>
 	<div id="modalBackground">