r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix parsing local uri params

Browse Source
This commit is contained in:
morethanwords 2021-08-10 20:07:04 +03:00
parent 552611ce6c
commit 34ee755eee
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib/appManagers/appImManager.ts
View File

@ -228,7 +228,7 @@ export class AppImManager {
stateStorage.setToCache('chatPositions', c || {}); stateStorage.setToCache('chatPositions', c || {});
}); });
this.addAnchorListener<void>({ this.addAnchorListener<{}>({
name: 'showMaskedAlert', name: 'showMaskedAlert',
callback: (params, element) => { callback: (params, element) => {
const href = element.href; const href = element.href;
@ -249,14 +249,13 @@ export class AppImManager {
}, },
}] }]
}).show(); }).show();
}, }
noParams: true
}); });
this.addAnchorListener<{command: string, bot: string}>({ this.addAnchorListener<{uriParams: {command: string, bot: string}}>({
name: 'execBotCommand', name: 'execBotCommand',
callback: (params) => { callback: ({uriParams}) => {
const {command, bot} = params; const {command, bot} = uriParams;
/* const promise = bot ? this.openUsername(bot).then(() => this.chat.peerId) : Promise.resolve(this.chat.peerId); /* const promise = bot ? this.openUsername(bot).then(() => this.chat.peerId) : Promise.resolve(this.chat.peerId);
promise.then(peerId => { promise.then(peerId => {
@ -266,34 +265,36 @@ export class AppImManager {
appMessagesManager.sendText(this.chat.peerId, '/' + command + (bot ? '@' + bot : '')); appMessagesManager.sendText(this.chat.peerId, '/' + command + (bot ? '@' + bot : ''));
//console.log(command, bot); //console.log(command, bot);
} },
parseUriParams: true
}); });
this.addAnchorListener<{hashtag: string}>({ this.addAnchorListener<{uriParams: {hashtag: string}}>({
name: 'searchByHashtag', name: 'searchByHashtag',
callback: (params) => { callback: ({uriParams}) => {
const {hashtag} = params; const {hashtag} = uriParams;
if(!hashtag) { if(!hashtag) {
return; return;
} }
this.chat.initSearch('#' + hashtag + ' '); this.chat.initSearch('#' + hashtag + ' ');
} },
parseUriParams: true
}); });
this.addAnchorListener<['addstickers', string]>({ this.addAnchorListener<{pathnameParams: ['addstickers', string]}>({
name: 'addstickers', name: 'addstickers',
callback: (params) => { callback: ({pathnameParams}) => {
new PopupStickers({id: params[1]}).show(); new PopupStickers({id: pathnameParams[1]}).show();
}, },
parsePathname: true parsePathname: true
}); });
this.addAnchorListener<['joinchat', string]>({ this.addAnchorListener<{pathnameParams: ['joinchat', string]}>({
name: 'joinchat', name: 'joinchat',
callback: (params) => { callback: ({pathnameParams}) => {
apiManager.invokeApi('messages.checkChatInvite', { apiManager.invokeApi('messages.checkChatInvite', {
hash: params[1] hash: pathnameParams[1]
}).then(chatInvite => { }).then(chatInvite => {
if((chatInvite as ChatInvite.chatInvitePeek).chat) { if((chatInvite as ChatInvite.chatInvitePeek).chat) {
appChatsManager.saveApiChat((chatInvite as ChatInvite.chatInvitePeek).chat, true); appChatsManager.saveApiChat((chatInvite as ChatInvite.chatInvitePeek).chat, true);
@ -307,7 +308,7 @@ export class AppImManager {
return; return;
} }
new PopupJoinChatInvite(params[1], chatInvite).show(); new PopupJoinChatInvite(pathnameParams[1], chatInvite).show();
}, (err) => { }, (err) => {
if(err.type === 'INVITE_HASH_EXPIRED') { if(err.type === 'INVITE_HASH_EXPIRED') {
toast(i18n('InviteExpired')); toast(i18n('InviteExpired'));
@ -351,10 +352,9 @@ export class AppImManager {
}); });
} }
private addAnchorListener<Params extends any>(options: { private addAnchorListener<Params extends {pathnameParams?: any, uriParams?: any}>(options: {
name: 'showMaskedAlert' | 'execBotCommand' | 'searchByHashtag' | 'addstickers' | 'joinchat' | 'im', name: 'showMaskedAlert' | 'execBotCommand' | 'searchByHashtag' | 'addstickers' | 'joinchat' | 'im',
callback: (params: Params, element: HTMLAnchorElement) => boolean | void, callback: (params: Params, element: HTMLAnchorElement) => boolean | void,
noParams?: boolean,
parsePathname?: boolean, parsePathname?: boolean,
parseUriParams?: boolean, parseUriParams?: boolean,
}) { }) {
@ -365,19 +365,10 @@ export class AppImManager {
let pathnameParams: any[]; let pathnameParams: any[];
let uriParams: any; let uriParams: any;
if(!options.noParams) {
if(options.parsePathname) pathnameParams = new URL(element.href).pathname.split('/').slice(1); if(options.parsePathname) pathnameParams = new URL(element.href).pathname.split('/').slice(1);
if(options.parseUriParams) uriParams = this.parseUriParams(href); if(options.parseUriParams) uriParams = this.parseUriParams(href);
}
let out: any; const res = options.callback({pathnameParams, uriParams} as Params, element);
if(pathnameParams && uriParams) {
out = {pathnameParams, uriParams};
} else {
out = pathnameParams || uriParams;
}
const res = options.callback(out, element);
return res === undefined ? res : false; return res === undefined ? res : false;
}; };
} }