Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vcard): parse vcard module #1995

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix(vcard): parse vcard module #1995

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3c9985a
fix(vcard): parse vcard module
CyrilLacroix Feb 12, 2023
242dec2
fix(vcard): eslint
CyrilLacroix Jun 10, 2023
4762e0d
Merge branch 'main' into fix/vcard-module
CyrilLacroix Jun 10, 2023
d4d9791
Merge branch 'main' into fix/vcard-module
codebossdev Jun 25, 2023
ce19e87
Merge branch 'main' into fix/vcard-module
shirser121 Aug 7, 2023
d7b53cb
Merge branch 'main' into fix/vcard-module
alechkos Dec 12, 2023
d8efaf5
Merge branch 'main' into fix/vcard-module
alechkos Dec 22, 2023
4f072c6
Merge branch 'main' into fix/vcard-module
alechkos Jan 17, 2024
8846b50
Merge branch 'main' into fix/vcard-module
alechkos Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/util/Injected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ exports.ExposeStore = (moduleRaidStr) => {
window.Store.UserConstructor = window.mR.findModule((module) => (module.default && module.default.prototype && module.default.prototype.isServer && module.default.prototype.isUser) ? module.default : null)[0].default;
window.Store.Validators = window.mR.findModule('findLinks')[0];
window.Store.VCard = window.mR.findModule('vcardFromContactModel')[0];
window.Store.VCardParse = window.mR.findModule('WA_BIZ_NAME')[0];
window.Store.WidFactory = window.mR.findModule('createWid')[0];
window.Store.ProfilePic = window.mR.findModule('profilePicResync')[0];
window.Store.PresenceUtils = window.mR.findModule('sendPresenceAvailable')[0];
Expand Down Expand Up @@ -184,8 +185,8 @@ exports.LoadUtils = () => {
let quotedMessage = window.Store.Msg.get(options.quotedMessageId);

// TODO remove .canReply() once all clients are updated to >= v2.2241.6
const canReply = window.Store.ReplyUtils ?
window.Store.ReplyUtils.canReplyMsg(quotedMessage.unsafe()) :
const canReply = window.Store.ReplyUtils ?
window.Store.ReplyUtils.canReplyMsg(quotedMessage.unsafe()) :
quotedMessage.canReply();

if (canReply) {
Expand Down Expand Up @@ -266,11 +267,11 @@ exports.LoadUtils = () => {
} else if (options.parseVCards && typeof (content) === 'string' && content.startsWith('BEGIN:VCARD')) {
delete options.parseVCards;
try {
const parsed = window.Store.VCard.parseVcard(content);
const parsed = window.Store.VCardParse.parseVcard(content);
if (parsed) {
vcardOptions = {
type: 'vcard',
vcardFormattedName: window.Store.VCard.vcardGetNameFromParsed(parsed)
vcardFormattedName: window.Store.VCardParse.vcardGetNameFromParsed(parsed)
};
}
} catch (_) {
Expand All @@ -291,7 +292,7 @@ exports.LoadUtils = () => {
}
}
}

let buttonOptions = {};
if(options.buttons){
let caption;
Expand Down