generic-skin 2.3.3 → 2.3.7

package/frameworks/FNRFramework.js

@@ -1,9 +1,9 @@
 const FNR = {
-	execFn: function(callback) {
+	execFn: (callback) => {
 		document.addEventListener('forumReady', callback, false);
 	},
 	forum: {
-		getColors: function() {
+		getColors: () => {
 			return Object.values(forumColours)
 				.map((item) => {
 					return {
@@ -12,7 +12,7 @@ const FNR = {
 					}
 				});
 		},
-		getLatest: function(filterArray, limit) {
+		getTopics: (array, limit) => {
 			return new Promise((resolve, reject) => {
 				const addContent = (elmt) => {
 					const titleElmnt = $(elmt).find('.topictitle');
@@ -40,7 +40,7 @@ const FNR = {
 				const getPage = (url) => {
 					$.get(url, (data) => {
 						$(data).find('.ipbform').find('tbody').find('tr').each(function() {							
-							if (finalArray.length < limit && filterArray.indexOf(parseInt($(this).find('.row2 + .row2:not(.centered) a').attr('href').split('/f')[1].split('-')[0])) === -1) {
+							if (finalArray.length < limit && array.indexOf(parseInt($(this).find('.row2 + .row2:not(.centered) a').attr('href').split('/f')[1].split('-')[0])) === -1) {
 								addContent(this);
 							}
 						});
@@ -58,15 +58,15 @@ const FNR = {
 				getPage('/latest?change_version=invision');
 			});
 		},
-		getMembers: function(option) {
+		getMembers: (option) => {
 			return new Promise((resolve, reject) => {
 				let members = [];
 
 				const getUserData = (user, color) => {
 					return {
-						user: $(user).find('.avatar-mini a span strong').text(),
-						id: $(user).find('.avatar-mini a').attr('href').split('?')[0],
-						img: $(user).find('.avatar-mini a img').attr('src'),
+						user: $(user).find('.membername span').text().trim(),
+						id: $(user).find('.popupmenu .popupmenu-item a').attr('href').split('?')[0],
+						img: $(user).find('.mini-avatar img').attr('src'),
 						color: color
 					};
 				};
@@ -74,13 +74,13 @@ const FNR = {
 				const getUsersPage = (page) => {
 					let users = [];
 
-					$(page).find('#memberlist tbody tr').each(function() {
-						const group = FNR.utility.getGroup($(this).find('.avatar-mini a span').attr('style').split('color:')[1]);
+					$(page).find('.member-list .member').each(function() {
+						const group = FNR.utility.getGroup($(this).find('.membername span').attr('style').split('color:')[1]);
 
 						if (option) {
 							users.push(getUserData(this, group));
 						} else {
-							if (group !== 'unknown' && group !== 'narracion') {
+							if (group !== 'unknown' && group !== forumConfig.skinOptions.adminGroup) {
 								users.push(getUserData(this, group));
 							}
 						}
@@ -110,7 +110,7 @@ const FNR = {
 				getPage('/memberlist?change_version=invision');
 			});
 		},
-		getGroups: function(cache) {
+		getGroups: (cache) => {
 			const getData = () => {
 				return new Promise((resolve, reject) => {
 					$.get('/groups?change_version=invision', (data) => {
@@ -122,7 +122,7 @@ const FNR = {
 								name: $(this).find('a').text().trim(),
 								color: $(this).find('a').css('color'),
 								url: Vue.filter('url-to-normal')($(this).find('a').attr('href')),
-								count: parseInt($(this).find('div > span').text())
+								count: parseInt($(this).find('div > span').text()) - 1
 							});
 						});
 
@@ -150,7 +150,7 @@ const FNR = {
 
 			return readGroupsCache();
 		},
-		getAffiliates: function() {
+		getAffiliates: () => {
 			return new Promise((resolve, reject) => {
 				const tops = forumConfig.affiliatesMax;
 
@@ -177,111 +177,207 @@ const FNR = {
 			});
 		},
 	},
-	content: {
-		post: {
-			getPost: function(url) {
-				return new Promise((resolve, reject) => {
-					$.get(Vue.filter('url-to-invision')(url), (data) => {
-						const post = $(data).find("#p" + url.split("#")[1]);
-
-						resolve({
-							author: {
-								text: post.find(".author a").text(),
-								color: post.find(".author a span").css("color"),
-								url: Vue.filter('url-to-normal')(post.find(".author a").attr("href")),
-							},
-							content: post.find(".post-entry > div").html(),
-							date: post.find(".author").html().split("</a>")[1],
-						});
+	content: {			
+		isAutosave: () => {
+			if (document.post === undefined) return false;
+			else return _userdata.user_id !== -1 && document.post.mode.value === 'reply' && document.post.t !== undefined
+		},
+		getPost: (url) => {
+			return new Promise((resolve, reject) => {
+				$.get(Vue.filter('url-to-invision')(url), (data) => {
+					const post = $(data).find("#p" + url.split("#")[1]);
+
+					resolve({
+						author: {
+							text: post.find(".author a").text(),
+							color: post.find(".author a span").css("color"),
+							url: Vue.filter('url-to-normal')(post.find(".author a").attr("href")),
+						},
+						content: post.find(".post-entry > div").html(),
+						date: post.find(".author").html().split("</a>")[1],
 					});
 				});
-			},
-			getLast: function(url) {
-				return new Promise((resolve, reject) => {
-					$.get(Vue.filter('url-to-invision')(url), (data) => {
-						const url = $(data).find('.pagination.topic-options').children().last().prev().attr('href') || false;
-						const self = data;
-
-						const processData = (data) => {
-							const getLast = (page) => {
-								return $(page).find('.post').parent().children().last().prev();
-							};
-
-							const check = getLast(data).find('.author a').text() !== '';
-
-							return {
-								author: {
-									text: (check) ? getLast(data).find('.author a').text() : 'Invitado',
-									color: (check) ? getLast(data).find('.author a span').css('color') : '#bdbdbd',
-									url: (check) ? getLast(data).find('.author a').attr('href').replace('?change_version=invision', '') : '#'
-								},
-								locate: {
-									text: $(data).find('#navstrip').find('li').last().text(),
-									url: $(data).find('#navstrip').find('li').last().find('a').attr('href').replace('?change_version=invision', '')
-								},
-								url: getLast(data).find('.postbody-head h3 a').attr('href').replace('?change_version=invision', ''),
-								content: getLast(data).find('.post-entry > div').html(),
-								date: (check) ? getLast(data).find('.author').html().split('</a>')[1].trim() : getLast(data).find('.author').html().split('Invitado')[1].trim()
-							};
-						};
+			});
+		},
+		genPost: (id, content) => {
+			return new Promise((resolve, reject) => {
+				let save = document.createElement('iframe');
 
-						if (url) {
-							$.get(url, (data) => {
-								resolve(processData(data));
-							});
-						} else {
-							resolve(processData(self));
-						}
-					});
+				save.id = 'forum-save';
+				save.src = '/post?t=' + id + '&mode=reply&change_version=invision';
+				save.width = 0;
+				save.height = 0;
+				save.onload = () => {
+					saveDOM.onload = () => {
+						$('#forum-save').remove();
+
+						console.clear();
+
+						resolve(true);
+					};
+
+					$('#forum-save').contents().find('.subtitle:contains("Mensaje")').next().find('textarea').val(content);
+					$('#forum-save').contents().find('.formbuttonrow.center input[value="Enviar"]').click();
+				};
+
+				document.querySelector('body > header').prepend(save);
+
+				const saveDOM = document.getElementById('forum-save');
+			});
+		},		
+		genTopic: (id, name, content) => {
+			return new Promise((resolve, reject) => {
+				let save = document.createElement('iframe');
+
+				save.id = 'forum-save';
+				save.src = '/post?f=' + id + '&mode=newtopic&change_version=invision';
+				save.width = 0;
+				save.height = 0;
+				save.onload = () => {
+					saveDOM.onload = () => {
+						$('#forum-save').remove();
+
+						console.clear();
+
+						resolve(true);
+					};
+
+					$('#forum-save').contents().find('dl dt:contains("Título del tema")').parent().find('input').val(name);
+					$('#forum-save').contents().find('.subtitle:contains("Mensaje")').next().find('textarea').val(content);
+					$('#forum-save').contents().find('.formbuttonrow.center input[value="Enviar"]').click();
+				};
+
+				document.querySelector('body > header').prepend(save);
+
+				const saveDOM = document.getElementById('forum-save');
+			});
+		}
+	},
+	user: {
+		getUrl: (name) => {
+			let character =
+ 				name !== undefined ? encodeURIComponent(name)
+				.replace(/[!'()]/g, escape)
+				.replace(/\*/g, "%2A") :
+				_userdata.user_id;
+
+				return "/profile?mode=viewprofile&u=" + character;
+		},
+		getLevel: () => {
+			return new Promise((resolve, reject) => {
+				switch (_userdata.user_level) {
+                	case 2:
+                    	resolve('mod');
+                	case 1:
+                    	resolve('admin');
+                	case 0:
+                    	return -1 == _userdata.user_id ? resolve('guest') : resolve('user');
+            	}
+			});
+		},
+		getGroup: () => {
+			return new Promise((resolve, reject) => {
+				FNR.user.getLevel().then((status) => {
+					if (status === 'guest') {
+						resolve('unknown');
+					} else {
+						FNR.user.getProfile(_userdata.user_id, .25).then((data) => {
+							resolve(data['colour']);
+						});
+					}
 				});
-			}
+			});
 		},
-		topic: {
-			genTopic: function(id, name, content) {
+		getProfile: (name, time) => {
+			const character = name != undefined ? FNR.user.getUrl(name) : FNR.user.getUrl();
+			const cache = time || 5;
+
+			const processData = (content) => {
+				if (content.find('a').length) return Vue.filter('url-to-normal')(content.find('a').attr('href'));
+				else if (content.find('table').length) return content.find('table').html();
+				else if (content.find('img').length) return content.find('img').attr('src');
+				else if (content.find('textarea').length) return content.find('textarea').val();
+				else if (content.find('span').length) return content.find('span').text().trim();
+				else if (content.text().trim() === '-') return '';
+				else return content.text();
+			};
+
+			const getData = () => {
 				return new Promise((resolve, reject) => {
-					let save = document.createElement('iframe');
+					$.get(character + '&change_version=invision', (data) => {
+						let user = {};
 
-					save.id = 'forum-save';
-					save.src = '/post?f=' + id + '&mode=newtopic&change_version=invision';
-					save.width = 0;
-					save.height = 0;
-					save.onload = () => {
-						saveDOM.onload = () => {
-							$('#forum-save').remove();
+						user['name'] = $(data).find('.maintitle h1 span').text();
+						user['lastvisit'] = $(data).find('dt:contains("Última visita")').parent().find('dd').text();
+						user['colour'] = FNR.utility.getGroup($(data).find('.maintitle h1 span').css('color').replace('rgb(', 'rgb_').replace(/, /g, '_').replace(')', ''));
+						user['avatar'] = $(data).find('.real_avatar img').attr('src');
 
-							console.clear();
+						user['links'] = {
+							profile: '/u' + character.split('&u=')[1],
+							mp: '/privmsg?mode=post&u=' + character.split('&u=')[1],
+						};
 
-							resolve(true);
+						user['messages'] = {
+							public: parseInt($(data).find('span:contains("Mensajes")').parent().parent().find('dd > div').text()) || 0,
+							private: parseInt($(data).find('dt:contains("Mensajes privados")').parent().find('dd').text()) || 0
 						};
 
-						$('#forum-save').contents().find('dl dt:contains("Título del tema")').parent().find('input').val(name);
-						$('#forum-save').contents().find('.subtitle:contains("Mensaje")').next().find('textarea').val(content);
-						$('#forum-save').contents().find('.formbuttonrow.center input[value="Enviar"]').click();
-					};
+						user['fields'] = {};
 
-					document.querySelector('body > header').prepend(save);
+						$(data).find('dl[id^="field_id"]').each(function() {
+							if ($(this).find('dt span').text() !== '') {
+								if ($(this).find('dt span').text() === 'Mensajes') return;
 
-					const saveDOM = document.getElementById('forum-save');
+								user.fields[FNR.utility.genSlug($(this).find('dt span').text())] = {
+									name: $(this).find('dt span').text(),
+									content: processData($(this).find('dd .field_uneditable'))
+								}
+							}
+						});
+
+						$(data).find('.ipbform2 > dl').each(function() {
+							if ($(this).find('dt span').length && $(this).find('dt span').text() !== '') {
+								if ($(this).find('dt span').text() === 'Mensajes') return;
+
+								user.fields[FNR.utility.genSlug($(this).find('dt span').text())] = {
+									name: $(this).find('dt span').text(),
+									content: processData($(this).find('dd'))
+								}
+							}
+						});
+
+						user.fields['rango'] = {
+							name: 'Rango',
+							content: $(data).find('dt:contains("Rango:")').parent().find('dd').text()
+						}
+
+						resolve(user);
+					});
 				});
-			},			
-			isAutosave: function() {
-				if (document.post === undefined) return false;
-				else return _userdata.user_id !== -1 && document.post.mode.value === 'reply' && document.post.t !== undefined
-			}
-		}
-	},
-	user: {
-		getLevel: function() {
-			switch (_userdata.user_level) {
-                case 2:
-                    return 'mod';
-                case 1:
-                    return 'admin';
-                case 0:
-                    return -1 == _userdata.user_id ? 'guest' : 'user';
-            }
+			};
+
+			const readUserCache = (dat) => {
+				const id = "userInfo" + dat;
+
+				return new Promise((resolve, reject) => {
+					FNR.cache.useData(id, cache).then(
+						(result) => {
+							resolve(result);
+						},
+						(err) => {
+							getData().then((data) => {
+								FNR.cache.setData(id, data);
+
+								resolve(data);
+							});
+						}
+					);
+				});
+			};
+
+			return readUserCache(name);
 		},
-		changeAccount: function(out, username, password) {
+		changeAccount: (out, username, password) => {
 			return new Promise((resolve, reject) => {
 				let save = document.createElement('iframe');
 
@@ -311,16 +407,7 @@ const FNR = {
 			});
 		},
 		profile: {
-			getUrl: function(name) {
-				let character =
- 					name !== undefined ? encodeURIComponent(name)
-					.replace(/[!'()]/g, escape)
-					.replace(/\*/g, "%2A") :
-					_userdata.user_id;
-
-				return "/profile?mode=viewprofile&u=" + character;
-			},
-			getData: function(array) {
+			getData: (array) => {
 				return new Promise((resolve, reject) => {
 					$.get('/profile?change_version=invision&mode=editprofile', (data) => {
 						const fields = data;
@@ -385,7 +472,7 @@ const FNR = {
 					});
 				});
 			},
-			setData: function(array) {
+			setData: (array) => {
 				return new Promise((resolve, reject) => {
 					const resolveSetter = () => {
 						$('#forum-save').remove();
@@ -449,96 +536,7 @@ const FNR = {
 					const saveDOM = document.getElementById('forum-save');
 				});
 			},
-			getAll: function(name, time) {
-				const character = name != undefined ? FNR.user.profile.getUrl(name) : FNR.user.profile.getUrl();
-				const cache = time || 5;
-
-				const processData = (content) => {
-					if (content.find('a').length) return Vue.filter('url-to-normal')(content.find('a').attr('href'));
-					else if (content.find('table').length) return content.find('table').html();
-					else if (content.find('img').length) return content.find('img').attr('src');
-					else if (content.find('textarea').length) return content.find('textarea').val();
-					else if (content.find('span').length) return content.find('span').text().trim();
-					else if (content.text().trim() === '-') return '';
-					else return content.text();
-				};
-
-				const getData = () => {
-					return new Promise((resolve, reject) => {
-						$.get(character + '&change_version=invision', (data) => {
-							let user = {};
-
-							user['name'] = $(data).find('.maintitle h1 span').text();
-							user['lastvisit'] = $(data).find('dt:contains("Última visita")').parent().find('dd').text();
-							user['colour'] = FNR.utility.getGroup($(data).find('.maintitle h1 span').css('color').replace('rgb(', 'rgb_').replace(/, /g, '_').replace(')', ''));
-							user['avatar'] = $(data).find('.real_avatar img').attr('src');
-
-							user['links'] = {
-								profile: '/u' + character.split('&u=')[1],
-								mp: '/privmsg?mode=post&u=' + character.split('&u=')[1],
-							};
-
-							user['messages'] = {
-								public: parseInt($(data).find('span:contains("Mensajes")').parent().parent().find('dd > div').text()) || 0,
-								private: parseInt($(data).find('dt:contains("Mensajes privados")').parent().find('dd').text()) || 0
-							};
-
-							user['fields'] = {};
-
-							$(data).find('dl[id^="field_id"]').each(function() {
-								if ($(this).find('dt span').text() !== '') {
-									if ($(this).find('dt span').text() === 'Mensajes') return;
-
-									user.fields[FNR.utility.genSlug($(this).find('dt span').text())] = {
-										name: $(this).find('dt span').text(),
-										content: processData($(this).find('dd .field_uneditable'))
-									}
-								}
-							});
-
-							$(data).find('.ipbform2 > dl').each(function() {
-								if ($(this).find('dt span').length && $(this).find('dt span').text() !== '') {
-									if ($(this).find('dt span').text() === 'Mensajes') return;
-
-									user.fields[FNR.utility.genSlug($(this).find('dt span').text())] = {
-										name: $(this).find('dt span').text(),
-										content: processData($(this).find('dd'))
-									}
-								}
-							});
-
-							user.fields['rango'] = {
-								name: 'Rango',
-								content: $(data).find('dt:contains("Rango:")').parent().find('dd').text()
-							}
-
-							resolve(user);
-						});
-					});
-				};
-
-				const readUserCache = (dat) => {
-					const id = "userInfo" + dat;
-
-					return new Promise((resolve, reject) => {
-						FNR.cache.useData(id, cache).then(
-							(result) => {
-								resolve(result);
-							},
-							(err) => {
-								getData().then((data) => {
-									FNR.cache.setData(id, data);
-
-									resolve(data);
-								});
-							}
-						);
-					});
-				};
-
-				return readUserCache(name);
-			},
-			getDrafts: function() {
+			getDrafts: () => {
 				return new Promise((resolve, reject) => {
 					$.get('/search?search_id=draftsearch&change_version=invision', (data) => {
 						if (parseFloat($(data).find('.maintitle > h3').text()) !== 0) {
@@ -570,7 +568,11 @@ const FNR = {
 		}
 	},
 	cache: {
-		setData: function(id, data, time) {
+		getData: (id) => {
+			if (localStorage.getItem(forumData.prefix + '_' + id) === null) return false;
+			else return JSON.parse(localStorage.getItem(forumData.prefix + '_' + id)).content;
+		},
+		setData: (id, data, time) => {
 			let cur_date = time === -1 ? 'undefined' : new Date().getTime();
 
 			localStorage.setItem(
@@ -581,15 +583,11 @@ const FNR = {
 				})
 			);
 		},
-		getData: function(id) {
-			if (localStorage.getItem(forumData.prefix + '_' + id) === null) return false;
-			else return JSON.parse(localStorage.getItem(forumData.prefix + '_' + id)).content;
-		},
-		delData: function(id) {
+		delData: (id) => {
 			if (localStorage.getItem(forumData.prefix + '_' + id) === null) return false;
 			else return localStorage.removeItem(forumData.prefix + '_' + id);
 		},
-		useData: function(id, time) {
+		useData: (id, time) => {
 			return new Promise((resolve, reject) => {
 				let item = localStorage.getItem(forumData.prefix + '_' + id),
 					cur_date = new Date(),
@@ -604,7 +602,7 @@ const FNR = {
 		},
 	},
 	utility: {
-		genSlug: function(text, alt) {
+		genSlug: (text, alt) => {
 			const slug = (Q) => {
 				const R = '\xE0\xE1\xE4\xE2\xE8\xE9\xEB\xEA\xEC\xED\xEF\xEE\xF2\xF3\xF6\xF4\xF9\xFA\xFC\xFB\xF1\xE7\xB7/_,:;';
 				Q = Q.trim().toLowerCase();
@@ -616,10 +614,10 @@ const FNR = {
 
 			return slug(text).replace(/-/g, replace);
 		},
-		genArray: function(string) {
+		genArray: (string) => {
 			return JSON.parse(string.replace(/`/g, '"'));
 		},
-		genValidation: function(array) {
+		genValidation: (array) => {
 			let final = '';
 
 			[].forEach.call(array, (item) => {
@@ -640,7 +638,7 @@ const FNR = {
 
 			return final;
 		},
-		getGroup: function(color) {
+		getGroup: (color) => {
 			const returnHexVer = (code) => {
 				let status = 'unknown';
 
@@ -669,7 +667,7 @@ const FNR = {
 		}
 	},
 	html: {
-		genModal: function(title, content, buttons) {
+		genModal: (title, content, buttons) => {
 			if (title === '' || title === undefined || title === null) return;
 			if (content === '' || content === undefined || content === null) return;
 
@@ -706,7 +704,7 @@ const FNR = {
 
 			document.getElementById('forum-modal').innerHTML = final;
 		},
-		genPrompt: function(title, content, placeholder, text) {
+		genPrompt: (title, content, placeholder, text) => {
 			if (title === '' || title === undefined || title === null) return;
 			if (content === '' || content === undefined || content === null) return;
 
@@ -741,7 +739,7 @@ const FNR = {
 				};
 			});
 		},
-		genNotification: function(title, content, icon, url) {			
+		genNotification: (title, content, icon, url) => {			
 			if (title === '' || title === undefined || title === null) return;
 			if (content === '' || content === undefined || content === null) return;
 			if (content.length > 50) return;
@@ -799,7 +797,7 @@ const FNR = {
 		}
 	},
 	behaviour: {	
-		genWiki: function() {
+		genWiki: () => {
 			if (document.querySelector('.wiki-cascade')) {
 				[].forEach.call(document.getElementsByClassName('wiki-cascade'), (item) => {
 					item.onclick = () => {
@@ -843,7 +841,7 @@ const FNR = {
 				};
 			}
 		},
-		genDropeable: function() {
+		genDropeable: () => {
 			if (document.querySelector('.is-dropeable')) {
 				[].forEach.call(document.getElementsByClassName('is-dropeable'), (item) => {
 					item.onclick = () => {