adolforeyna/EMI-Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add bible API

Browse Source
This commit is contained in:
aeroreyna
2023-01-12 12:19:29 -05:00
parent fddce94cfb
commit dadf070ac5
5 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbTools/profile.js
View File

@@ -128,6 +128,7 @@ userDB = (DB) => {
let regEx = new RegExp(queryStr, 'i');
let query = {
isGroup: false,
isChat: false,
$or: [
{"profile.firstName": {
$regex: regEx
@@ -140,7 +141,7 @@ userDB = (DB) => {
}},
]
};
let r = await DB.profileCols.find(queryStr ? query : {isGroup: false})
let r = await DB.profileCols.find(queryStr ? query : {isGroup: false, isChat: false})
.sort({ lastUpdate: -1 }).limit(20)
.toArray().catch((err) => {
console.log(err);
@@ -166,7 +167,7 @@ userDB = (DB) => {
return false;
});
let index = 0;
while(r[index].isGroup) index += 1;
while(r[index].isGroup || r[index].isChat) index += 1;
if (r[index]) userProfileCache[r[index].id] = r[index];
return r[index];
}
@@ -273,6 +274,7 @@ userDB = (DB) => {
let query = {
isGroup: true,
isCourse: {$ne: true},
isChat: {$ne: true},
};
if(excludePrivate) query.isPrivate = false;
let r = await DB.profileCols.find(query).sort({ lastUpdate: -1 }).limit(10)
@@ -289,13 +291,14 @@ userDB = (DB) => {
for(id in profile.following){
let oId = DB.ObjectID(id);
let checkProfile = await DB.getProfileCache(oId)
if(checkProfile && checkProfile.isGroup){
if(checkProfile && checkProfile.isGroup && !checkProfile.isChat){
ids.push(oId)
}
}
let query = {
isGroup: true,
isCourse: {$ne: true},
isChat: {$ne: true},
_id: {
$in: ids
}
@@ -312,6 +315,7 @@ userDB = (DB) => {
let regEx = new RegExp(queryStr, 'i');
let query = queryStr ? {
isGroup: true,
isChat: {$ne: true},
isCourse: coursesB,
$or: [
{"profile.firstName": {
@@ -327,7 +331,7 @@ userDB = (DB) => {
$regex: regEx
}}
]
} : {isGroup: true, isCourse: coursesB};
} : {isGroup: true, isChat: {$ne: true}, isCourse: coursesB};
let r = await DB.profileCols.find(query)
.sort({ lastUpdate: -1 }).limit(20)
.toArray().catch((err) => {
@@ -353,7 +357,7 @@ userDB = (DB) => {
DB.getGroup = async (groupid) => {
const _id = DB.ObjectID(groupid);
//if(userProfileCache[groupid]) return userProfileCache[groupid];
let r = await DB.profileCols.findOne({_id, isGroup: true}).catch((err) => {
let r = await DB.profileCols.findOne({_id, isGroup: true, isChat: {$ne: true},}).catch((err) => {
console.log(err);
return false;
});
@@ -425,7 +429,7 @@ userDB = (DB) => {
//Courses
DB.getCourses = async () => {
let r = await DB.profileCols.find({isGroup: true, isCourse: true})
let r = await DB.profileCols.find({isGroup: true, isCourse: true, isChat: {$ne: true}})
.sort({ lastUpdate: -1 }).limit(20)
.toArray().catch((err) => {
console.log(err);