Skip to content

Chore: Migrate methods/getThreadName to typescript #3707

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

Merged
AlexAlexandre merged 6 commits into from
Feb 22, 2022
Merged

Chore: Migrate methods/getThreadName to typescript #3707

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f4985b
chore: change getThreadName to typescript
AlexAlexandre Feb 9, 2022
5582c00
Merge branch 'develop' into chore/getThreadName-to-ts
AlexAlexandre Feb 14, 2022
cd94b2f
Merge branch 'develop' into chore/getThreadName-to-ts
AlexAlexandre Feb 21, 2022
7423564
chore: change types after merge develop into current
AlexAlexandre Feb 21, 2022
7e2121c
Merge branch 'develop' into chore/getThreadName-to-ts
AlexAlexandre Feb 22, 2022
71e2c98
chore: minor tweak
AlexAlexandre Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/definitions/IThread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export interface IThread {
autoTranslate?: boolean;
translations?: any;
e2e?: string;
subscription: { id: string };
}

export type TThreadModel = IThread & Model;
17 changes: 9 additions & 8 deletions app/lib/methods/getThreadName.js → app/lib/methods/getThreadName.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,36 @@ import { getThreadById } from '../database/services/Thread';
import log from '../../utils/log';
import { Encryption } from '../encryption';
import getSingleMessage from './getSingleMessage';
import { IThread, TThreadModel } from '../../definitions';

const buildThreadName = thread => thread.msg || thread?.attachments?.[0]?.title;
const buildThreadName = (thread: IThread) => thread.msg || thread?.attachments?.[0]?.title;

const getThreadName = async (rid, tmid, messageId) => {
let tmsg;
const getThreadName = async (rid: string, tmid: string, messageId: string): Promise<string | undefined> => {
let tmsg: string | undefined;
try {
const db = database.active;
const threadCollection = db.get('threads');
const messageRecord = await getMessageById(messageId);
const threadRecord = await getThreadById(tmid);
if (threadRecord) {
tmsg = buildThreadName(threadRecord);
await db.action(async () => {
await messageRecord?.update(m => {
await db.write(async () => {
await messageRecord?.update((m: { tmsg: string | undefined }) => {
m.tmsg = tmsg;
});
});
} else {
let thread = await getSingleMessage(tmid);
thread = await Encryption.decryptMessage(thread);
tmsg = buildThreadName(thread);
await db.action(async () => {
await db.write(async () => {
await db.batch(
threadCollection?.prepareCreate(t => {
threadCollection?.prepareCreate((t: TThreadModel) => {
t._raw = sanitizedRaw({ id: thread._id }, threadCollection.schema);
t.subscription.id = rid;
Object.assign(t, thread);
}),
messageRecord?.prepareUpdate(m => {
messageRecord?.prepareUpdate((m: { tmsg: string | undefined }) => {
m.tmsg = tmsg;
})
);
Expand Down