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

Regression: Prevent message from being temp forever #26668

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Regression: Prevent message from being temp forever #26668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c15862
Prevent from being temp forever
ggazzo Aug 24, 2022
b5b1066
Merge branch 'develop' into regression/threads-temp
kodiakhq[bot] Aug 24, 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
5 changes: 4 additions & 1 deletion apps/meteor/app/models/client/models/ChatMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ class ChatMessageCollection extends Mongo.Collection<IMessage & { ignored?: bool
}

// TODO: check if we can dodge these missing typings from Meteor Collection Hooks
export const ChatMessage = new ChatMessageCollection() as unknown as Mongo.Collection<IMessage & { ignored?: boolean }> & {
export const ChatMessage = new ChatMessageCollection() as unknown as Mongo.Collection<
Omit<IMessage, '_id'> & { ignored?: boolean },
IMessage & { ignored?: boolean }
> & {
direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;

queries: unknown[];
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/app/threads/client/flextab/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type ThreadTemplateInstance = Blaze.TemplateInstance<{
mainMessage: IMessage;
}> & {
firstNode: HTMLElement;
Threads: Mongo.Collection<IMessage> & {
Threads: Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
queries: unknown[];
};
Expand Down Expand Up @@ -169,7 +169,7 @@ Template.thread.helpers({
});

Template.thread.onCreated(async function (this: ThreadTemplateInstance) {
this.Threads = new Mongo.Collection(null) as Mongo.Collection<IMessage> & {
this.Threads = new Mongo.Collection(null) as Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
queries: unknown[];
};
Expand Down Expand Up @@ -304,10 +304,10 @@ Template.thread.onRendered(function (this: ThreadTemplateInstance) {
},
).observe({
added: ({ _id, ...message }: IMessage) => {
this.Threads.upsert({ _id }, { $set: message });
this.Threads.upsert({ _id }, message);
},
changed: ({ _id, ...message }: IMessage) => {
this.Threads.update({ _id }, { $set: message });
this.Threads.update({ _id }, message);
},
removed: ({ _id }: IMessage) => this.Threads.remove(_id),
});
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/ui/client/lib/ChatMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class ChatMessages {
$input: JQuery<HTMLTextAreaElement> | undefined;

constructor(
public collection: Mongo.Collection<IMessage> & {
public collection: Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
queries: unknown[];
} = ChatMessage,
Expand Down