Skip to content

Commit

Permalink
Merge pull request #2542 from SMe12435/master
Browse files Browse the repository at this point in the history
added Newsletter Support : createNewsletter
orkestral authored Dec 7, 2023
2 parents 5127521 + 53941f6 commit b5b7d5a
Showing 10 changed files with 836 additions and 398 deletions.
5 changes: 4 additions & 1 deletion src/controllers/browser.ts
Original file line number Diff line number Diff line change
@@ -502,7 +502,10 @@ export async function initBrowser(
} else {
const browser = await puppeteer.launch({
executablePath,
headless: options.headless === true || options.headless === false ? options.headless : 'new',
headless:
options.headless === true || options.headless === false
? options.headless
: 'new',
args: ['--no-sandbox', '--disable-setuid-sandbox']
});

4 changes: 4 additions & 0 deletions src/lib/wapi/api.js
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ import {
baseSendMessage,
getAllContacts,
createGroup,
createNewsletter,
addParticipant,
setGroupDescription,
getHost,
@@ -106,4 +107,7 @@ if (typeof window.WAPI === 'undefined') {
window.WAPI.serializeProfilePicThumb = serializeProfilePicThumb;
window.WAPI.serializeRawObj = serializeRawObj;
window.WAPI.serializeMeObj = serializeMeObj;

//Newsletter
window.WAPI.createNewsletter = createNewsletter;
}
15 changes: 15 additions & 0 deletions src/lib/wapi/functions/create-newsletter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export async function createNewsletter(name, description, image) {
try {
let options = {
name: name,
description: description,
picture: image
};
const resp = await window.Store.createNewsletterQuery.createNewsletterQuery(
options
);
return resp;
} catch {
return false;
}
}
1 change: 1 addition & 0 deletions src/lib/wapi/functions/index.js
Original file line number Diff line number Diff line change
@@ -127,3 +127,4 @@ export { pollCreation } from './poll-creation';
/////
export { baseSendMessage } from './send-message-scope';
export { setGroupImage } from './set-group-image';
export { createNewsletter } from './create-newsletter';
8 changes: 4 additions & 4 deletions src/lib/wapi/functions/process-files.js
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ export async function processFiles(chat, blobs) {
Debug.VERSION === '0.4.613'
? blobs
: blobs.map((blob) => {
return {
file: blob
};
}),
return {
file: blob
};
}),
chat,
chat
);
2 changes: 0 additions & 2 deletions src/lib/wapi/functions/send-file.js
Original file line number Diff line number Diff line change
@@ -155,7 +155,6 @@ export async function sendFile(
await WAPI.deleteMessages(chatid, [
newMsgId._serialized
]);

} else {
let obj = WAPI.scope(
newMsgId,
@@ -191,7 +190,6 @@ export async function sendFile(
window.Store.addAndSendMsgToChat(chat, message)
)
)[1];

} catch (e) {
return WAPI.scope(
chat.id,
8 changes: 4 additions & 4 deletions src/lib/wapi/help/process-files.js
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ export async function processFiles(chat, blobs) {
Debug.VERSION === '0.4.613'
? blobs
: blobs.map((blob) => {
return {
file: blob
};
}),
return {
file: blob
};
}),
chat,
chat
);
10 changes: 9 additions & 1 deletion src/lib/wapi/store/store-objects.js
Original file line number Diff line number Diff line change
@@ -480,6 +480,14 @@ export const storeObjects = [
{
id: 'sendRevokeMsgs',
conditions: (module) => (module.sendRevokeMsgs ? module.sendRevokeMsgs : null),
}
},
{
id:"createNewsletterQuery",
conditions: (module) => (module.createNewsletterQuery ? module : null)
},
{
id:"userJidToUserWid",
conditions: (module) => (module.newsletterJidToWid ? module : null)
},

];
4 changes: 4 additions & 0 deletions src/lib/wapi/wapi.js
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ import {
getBlockList,
clearChatMessages,
createGroup,
createNewsletter,
deleteConversation,
deleteMessages,
demoteParticipant,
@@ -275,6 +276,9 @@ if (typeof window.WAPI === 'undefined') {
window.WAPI.setGroupTitle = setGroupTitle;
window.WAPI.setGroupSettings = setGroupSettings;

//Newsletter functions
window.WAPI.createNewsletter = createNewsletter;

// Chatting functions
window.WAPI.sendChatstate = sendChatstate;
window.WAPI.sendMessageWithThumb = sendMessageWithThumb;
1,177 changes: 791 additions & 386 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit b5b7d5a

Please sign in to comment.