Skip to content

Commit 4ccd1c1

Browse files
Sebastian-WebsterSebastian-Webster
authored
Merge pull request #487 from SquareTable/486-remove-allowscreenshots-field-from-posts
Remove the allowScreenShots field from SocialSquare
2 parents b45fabf + 0f40b77 commit 4ccd1c1

File tree

9 files changed

+40
-347
lines changed

9 files changed

+40
-347
lines changed

‎api/Conversations.js‎

Lines changed: 5 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ router.post("/create", (req,res)=> {
114114
dateCreated: datetime,
115115
lastMessage: "N/A",
116116
lastMessageDate: "N/A",
117-
allowScreenShots: true,
118117
lastMessageViewed: []
119118
});
120119
newConversation.save().then(result => {
@@ -276,7 +275,6 @@ router.post("/createDirectMessage", (req,res)=> {
276275
conversationNSFW: false,
277276
conversationNSFL: false,
278277
dateCreated: datetime,
279-
allowScreenShots: false,
280278
lastMessageViewed: []
281279
});
282280
newConversation.save().then(result => {
@@ -388,7 +386,7 @@ router.get("/getConvos", (req,res)=>{
388386
//afterUnreads
389387
const afterUnreads = (convoUnreadAmount, lastMessageDate) => {
390388
if (result[index].isDirectMessage == false) {
391-
var toPush = {conversationId: result[index]._id, members: result[index].members.length, isDirectMessage: result[index].isDirectMessage, conversationImageKey: result[index].conversationImageKey, conversationTitle: result[index].conversationTitle, conversationDescription: result[index].conversationDescription, conversationNSFW: result[index].conversationNSFW, conversationNSFL: result[index].conversationNSFL, lastMessageDate: lastMessageDate, dateCreated: result[index].dateCreated, allowScreenShots: result[index].allowScreenShots, unreadsMessages: convoUnreadAmount, isEncrypted: result[index].isEncrypted}
389+
var toPush = {conversationId: result[index]._id, members: result[index].members.length, isDirectMessage: result[index].isDirectMessage, conversationImageKey: result[index].conversationImageKey, conversationTitle: result[index].conversationTitle, conversationDescription: result[index].conversationDescription, conversationNSFW: result[index].conversationNSFW, conversationNSFL: result[index].conversationNSFL, lastMessageDate: lastMessageDate, dateCreated: result[index].dateCreated, unreadsMessages: convoUnreadAmount, isEncrypted: result[index].isEncrypted}
392390
allConversationsFound.push(toPush)
393391
itemsProcessed++;
394392
if (itemsProcessed == result.length) {
@@ -409,7 +407,7 @@ router.get("/getConvos", (req,res)=>{
409407
}
410408
User.find({_id: {$eq: idOfOther}}).then(data => {
411409
if (data.length) {
412-
var toPush = {conversationId: result[index]._id, members: result[index].members.length, isDirectMessage: result[index].isDirectMessage, conversationImageKey: data[0].profileImageKey, conversationTitle: data[0].name, conversationDescription: result[index].conversationDescription, conversationNSFW: result[index].conversationNSFW, conversationNSFL: result[index].conversationNSFL, lastMessageDate: result[index].lastMessageDate, dateCreated: result[index].dateCreated, allowScreenShots: result[index].allowScreenShots, unreadsMessages: convoUnreadAmount, isEncrypted: result[index].isEncrypted}
410+
var toPush = {conversationId: result[index]._id, members: result[index].members.length, isDirectMessage: result[index].isDirectMessage, conversationImageKey: data[0].profileImageKey, conversationTitle: data[0].name, conversationDescription: result[index].conversationDescription, conversationNSFW: result[index].conversationNSFW, conversationNSFL: result[index].conversationNSFL, lastMessageDate: result[index].lastMessageDate, dateCreated: result[index].dateCreated, unreadsMessages: convoUnreadAmount, isEncrypted: result[index].isEncrypted}
413411
allConversationsFound.push(toPush)
414412
itemsProcessed++;
415413
if (itemsProcessed == result.length) {
@@ -532,7 +530,7 @@ router.get("/singleDmWithName/:nameOfOther", (req,res)=>{
532530
}
533531
User.find({_id: {$eq: idOfOther}}).then(data => {
534532
if (data.length) {
535-
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: data[0].profileImageKey, conversationTitle: data[0].name, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated, allowScreenShots: result.allowScreenShots}
533+
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: data[0].profileImageKey, conversationTitle: data[0].name, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated}
536534
res.json({
537535
status: "SUCCESS",
538536
message: "Conversations found.",
@@ -611,7 +609,7 @@ router.get("/singleConvoWithId/:idOfConvo", (req,res)=>{
611609
})
612610
} else {
613611
if (result.isDirectMessage == false) {
614-
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: result.conversationImageKey, conversationTitle: result.conversationTitle, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated, allowScreenShots: result.allowScreenShots, isEncrypted: result.isEncrypted}
612+
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: result.conversationImageKey, conversationTitle: result.conversationTitle, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated, isEncrypted: result.isEncrypted}
615613
res.json({
616614
status: "SUCCESS",
617615
message: "Conversations found.",
@@ -632,7 +630,7 @@ router.get("/singleConvoWithId/:idOfConvo", (req,res)=>{
632630
message: "No user user found."
633631
})
634632
} else {
635-
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: data.profileImageKey, conversationTitle: data.name, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated, allowScreenShots: result.allowScreenShots, isEncrypted: result.isEncrypted}
633+
var toSend = {conversationId: result._id, members: result.members.length, isDirectMessage: result.isDirectMessage, conversationImageKey: data.profileImageKey, conversationTitle: data.name, conversationDescription: result.conversationDescription, conversationNSFW: result.conversationNSFW, conversationNSFL: result.conversationNSFL, lastMessage: result.lastMessage, lastMessageDate: result.lastMessageDate, dateCreated: result.dateCreated, isEncrypted: result.isEncrypted}
636634
res.json({
637635
status: "SUCCESS",
638636
message: "Conversations found.",
@@ -1016,61 +1014,6 @@ router.get("/checkForEncryption/:conversationid", (req,res)=>{
10161014
}
10171015
})
10181016

1019-
//search if encrypted and stuff
1020-
1021-
router.get("/checkForScreenshotsAllowed/:conversationid", (req,res)=>{
1022-
const idSent = req.tokenData;
1023-
const conversationId = req.params.conversationid
1024-
if (idSent == "" || conversationId == "") {
1025-
res.json({
1026-
status: "FAILED",
1027-
message: "Error with params passed"
1028-
})
1029-
} else {
1030-
User.find({_id: {$eq: idSent}}).then(userFoundResult => {
1031-
if (userFoundResult.length) {
1032-
Conversation.find({_id: {$eq: conversationId}}).then(convoFound => {
1033-
if (convoFound.length) {
1034-
if (convoFound[0].allowScreenShots == true) {
1035-
res.json({
1036-
status: "SUCCESS",
1037-
message: "ScreenShots allowed."
1038-
})
1039-
} else {
1040-
res.json({
1041-
status: "SUCCESS",
1042-
message: "ScreenShots not allowed."
1043-
})
1044-
}
1045-
} else {
1046-
res.json({
1047-
status: "FAILED",
1048-
message: "Error with conversation id passed"
1049-
})
1050-
}
1051-
}).catch(err => {
1052-
console.log(err)
1053-
res.json({
1054-
status: "FAILED",
1055-
message: "Error while finding conversation."
1056-
})
1057-
})
1058-
} else {
1059-
res.json({
1060-
status: "FAILED",
1061-
message: "Error with user id passed"
1062-
})
1063-
}
1064-
}).catch(err => {
1065-
console.log(err)
1066-
res.json({
1067-
status: "FAILED",
1068-
message: "Error while finding user."
1069-
})
1070-
})
1071-
}
1072-
})
1073-
10741017
//to send pub enc key
10751018

10761019
router.post('/sendpublicencryptionkey', (req,res) => {

0 commit comments

Comments
 (0)