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

Fix loading top history because of hidden message

Browse Source 
Support different languages of changelogs
This commit is contained in:
Eduard Kuzmenko 2022-04-16 00:48:39 +03:00
parent 3b8390afde
commit 0b3574ff9d
4 changed files with 73 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chat/topbar.ts
View File

@ -386,7 +386,7 @@ export default class ChatTopbar {
};
});
},
verify: () => !this.chat.selection.isSelecting && !!Object.keys(this.chat.bubbles.bubbles).length
verify: () => !this.chat.selection.isSelecting && !!this.chat.bubbles.getRenderedLength()
}, {
icon: 'select',
text: 'Chat.Menu.ClearSelection',

60
src/lib/appManagers/apiUpdatesManager.ts
View File

@ -22,9 +22,9 @@ import appPeersManager from "./appPeersManager";
import appStateManager from './appStateManager';
import serverTimeManager from '../mtproto/serverTimeManager';
import assumeType from '../../helpers/assumeType';
import noop from '../../helpers/noop';
import RichTextProcessor from '../richtextprocessor';
import App from '../../config/app';
import filterUnique from '../../helpers/array/filterUnique';
type UpdatesState = {
pendingPtsUpdates: (Update & {pts: number, pts_count: number})[],
@ -624,7 +624,7 @@ export class ApiUpdatesManager {
rootScope.dispatchEvent(update._, update as any);
}
public attach() {
public attach(langCode?: string) {
if(this.attached) return;
//return;
@ -688,29 +688,41 @@ export class ApiUpdatesManager {
// });
if(newVersion) {
this.updatesState.syncLoading.then(() => {
fetch('changelogs/' + newVersion.split(' ')[0] + '.md')
.then(res => (res.status === 200 && res.ok && res.text()) || Promise.reject())
.then(text => {
const pre = `**Telegram Web${App.suffix} was updated to version ${newVersion}**\n\n`;
this.updatesState.syncLoading.then(async() => {
const getChangelog = (lang: string) => {
fetch(`changelogs/${newVersion.split(' ')[0]}_${lang}.md`)
.then(res => (res.status === 200 && res.ok && res.text()) || Promise.reject())
.then(text => {
const pre = `**Telegram Web${App.suffix} was updated to version ${newVersion}**\n\n`;
text = pre + text;
const entities: MessageEntity[] = [];
const message = RichTextProcessor.parseMarkdown(text, entities);
const update: Update.updateServiceNotification = {
_: 'updateServiceNotification',
entities,
message,
type: 'local',
pFlags: {},
inbox_date: Date.now() / 1000 | 0,
media: undefined
};
text = pre + text;
const entities: MessageEntity[] = [];
const message = RichTextProcessor.parseMarkdown(text, entities);
const update: Update.updateServiceNotification = {
_: 'updateServiceNotification',
entities,
message,
type: 'local',
pFlags: {},
inbox_date: Date.now() / 1000 | 0,
media: undefined
};
this.processLocalUpdate(update);
})
.catch(noop);
this.processLocalUpdate(update);
});
};
const languages = filterUnique([langCode, 'en']);
for(const language of languages) {
try {
await getChangelog(language);
break;
} catch(err) {
}
}
});
}
});

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

@ -150,7 +150,7 @@ export class AppImManager {
}
constructor() {
apiUpdatesManager.attach();
apiUpdatesManager.attach(I18n.lastRequestedLangCode);
appNotificationsManager.start();
this.log = logger('IM', LogTypes.Log | LogTypes.Warn | LogTypes.Debug | LogTypes.Error);
@ -1164,7 +1164,7 @@ export class AppImManager {
const top = chatBubbles.scrollable.scrollTop;
const position = {
mids: getObjectKeysAndSort(chatBubbles.bubbles, 'desc'),
mids: getObjectKeysAndSort(chatBubbles.bubbles, 'desc').filter(mid => !chatBubbles.skippedMids.has(mid)),
top
};

53
src/scripts/generate_changelog.js
View File

@ -7,28 +7,43 @@
// @ts-check
const fs = require('fs');
const text = fs.readFileSync('./CHANGELOG.md').toString('utf-8');
const fileNames = fs.readdirSync('./');
const writeTo = `./public/changelogs/{VERSION}.md`;
const logsPath = './public/changelogs/';
fs.rmSync(logsPath, {force: true, recursive: true});
fs.mkdirSync(logsPath);
const separator = '### ';
const splitted = text.split(separator);
splitted.forEach(text => {
if(!text.trim()) return;
text = separator + text;
text = text.replace(/^\*/gm, '•');
const splitted = text.split('\n');
const processChangelog = (fileName) => {
const text = fs.readFileSync('./' + fileName).toString('utf-8');
for(let i = splitted.length - 1; i >= 0; --i) {
const line = splitted[i];
if(!line.trim()) {
splitted.splice(i, 1);
} else {
break;
const lang = (fileName.split('_')[1] || 'en').split('.')[0];
const writeTo = `${logsPath}${lang}_{VERSION}.md`;
const separator = '### ';
const splitted = text.split(separator);
splitted.forEach(text => {
if(!text.trim()) return;
text = separator + text;
text = text.replace(/^\*/gm, '•');
const splitted = text.split('\n');
for(let i = splitted.length - 1; i >= 0; --i) {
const line = splitted[i];
if(!line.trim()) {
splitted.splice(i, 1);
} else {
break;
}
}
}
const firstLine = splitted.shift();
const version = firstLine.split(' ')[1];
fs.writeFileSync(writeTo.replace('{VERSION}', version), splitted.join('\n') + '\n');
});
};
const firstLine = splitted.shift();
const version = firstLine.split(' ')[1];
fs.writeFileSync(writeTo.replace('{VERSION}', version), splitted.join('\n') + '\n');
fileNames.forEach(fileName => {
if(fileName.endsWith('.md') && fileName.startsWith('CHANGELOG')) {
processChangelog(fileName);
}
});