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

fix: custom emoji update issues #32991

Merged
merged 18 commits into from
Nov 14, 2024
+200 −74
Merged

fix: custom emoji update issues #32991

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
73ca45c
fix: update custom emoji issues
abhinavkrin Aug 6, 2024
97a37d6
added changeset
abhinavkrin Aug 6, 2024
8e74bd7
added improvements
abhinavkrin Aug 22, 2024
22ae182
added improvements
abhinavkrin Aug 22, 2024
f3e270f
removed setEtagByName
abhinavkrin Aug 22, 2024
e6e4551
Update apps/meteor/app/api/server/v1/emoji-custom.ts
KevLehman Aug 22, 2024
8347c29
Update apps/meteor/app/api/server/v1/emoji-custom.ts
KevLehman Aug 22, 2024
1ba098b
type fix
abhinavkrin Aug 23, 2024
8023434
ts
KevLehman Aug 23, 2024
b6a9b09
ts
KevLehman Aug 23, 2024
96c147c
revert unrelated fixes
abhinavkrin Sep 13, 2024
3b31379
modified changeset
abhinavkrin Oct 25, 2024
c8ca402
minor changes
abhinavkrin Nov 1, 2024
697224f
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
tassoevan Nov 12, 2024
20763ac
Concatenate aliases
tassoevan Nov 12, 2024
2d8f570
Remove outdated cache busting parameter
tassoevan Nov 12, 2024
89d80e9
Merge branch 'develop' into fix/custom-emoji-update-issues-1
kodiakhq[bot] Nov 13, 2024
65d0ba2
Merge branch 'develop' into fix/custom-emoji-update-issues-1
kodiakhq[bot] Nov 14, 2024
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
minor changes 
Signed-off-by: Abhinav Kumar <[email protected]>
@abhinavkrin
abhinavkrin committed Nov 1, 2024
commit c8ca4026aeb464454c1e14d5082e076f27a731d3
20 changes: 10 additions & 10 deletions apps/meteor/app/api/server/lib/getUploadFormData.ts
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ type UploadResult<K> = {
fields: K;
};

type OptionalUploadResult<K> =
type UploadResultWithOptionalFile<K> =
| UploadResult<K>
| ({
[P in keyof Omit<UploadResult<K>, 'fields'>]: undefined;
@@ -35,9 +35,9 @@ export async function getUploadFormData<
field?: T;
validate?: V;
sizeLimit?: number;
optional: true;
fileOptional: true;
},
): Promise<OptionalUploadResult<K>>;
): Promise<UploadResultWithOptionalFile<K>>;

export async function getUploadFormData<
T extends string,
@@ -49,7 +49,7 @@ export async function getUploadFormData<
field?: T;
validate?: V;
sizeLimit?: number;
optional?: false | undefined;
fileOptional?: false | undefined;
},
): Promise<UploadResult<K>>;

@@ -63,9 +63,9 @@ export async function getUploadFormData<
field?: T;
validate?: V;
sizeLimit?: number;
optional?: boolean;
fileOptional?: boolean;
} = {},
): Promise<OptionalUploadResult<K>> {
): Promise<UploadResultWithOptionalFile<K>> {
const limits = {
files: 1,
...(options.sizeLimit && options.sizeLimit > -1 && { fileSize: options.sizeLimit }),
@@ -74,9 +74,9 @@ export async function getUploadFormData<
const bb = busboy({ headers: request.headers, defParamCharset: 'utf8', limits });
const fields = Object.create(null) as K;

let uploadedFile: OptionalUploadResult<K> | undefined;
let uploadedFile: UploadResultWithOptionalFile<K> | undefined;

let returnResult = (_value: OptionalUploadResult<K>) => {
let returnResult = (_value: UploadResultWithOptionalFile<K>) => {
// noop
};
let returnError = (_error?: Error | string | null | undefined) => {
@@ -100,7 +100,7 @@ export async function getUploadFormData<
if (!uploadedFile) {
return returnError(new MeteorError('No file or fields were uploaded'));
}
if (!('file' in uploadedFile) && !options.optional) {
if (!('file' in uploadedFile) && !options.fileOptional) {
return returnError(new MeteorError('No file uploaded'));
}
if (options.validate !== undefined && !options.validate(fields)) {
@@ -170,7 +170,7 @@ export async function getUploadFormData<

request.pipe(bb);

return new Promise<OptionalUploadResult<K>>((resolve, reject) => {
return new Promise<UploadResultWithOptionalFile<K>>((resolve, reject) => {
returnResult = resolve;
returnError = reject;
});
2 changes: 1 addition & 1 deletion apps/meteor/app/api/server/v1/emoji-custom.ts
View file
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ API.v1.addRoute(
{
request: this.request,
},
{ field: 'emoji', sizeLimit: settings.get('FileUpload_MaxFileSize'), optional: true },
{ field: 'emoji', sizeLimit: settings.get('FileUpload_MaxFileSize'), fileOptional: true },
);

const { fields, fileBuffer, mimetype } = emoji;

Unchanged files with check annotations Beta

View file
packages/apps-engine/src/definition/api/ApiEndpoint.ts
* @param reponse
*/
protected json(response: IApiResponseJSON): IApiResponse {
if (!response.headers || !response.headers['content-type']) {

Check warning on line 33 in packages/apps-engine/src/definition/api/ApiEndpoint.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
response.headers = response.headers || {};
response.headers['content-type'] = 'application/json';
}
View file
packages/apps-engine/src/server/accessors/ModifyCreator.ts
const { roles } = data;
if (roles && roles.length) {

Check warning on line 111 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
const hasRole = roles.map((role) => role.toLocaleLowerCase()).some((role) => role === 'admin' || role === 'owner' || role === 'moderator');
if (hasRole) {
const result = builder.getMessage();
delete result.id;
if (!result.sender || !result.sender.id) {

Check warning on line 152 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
const appUser = await this.bridges.getUserBridge().doGetAppUser(this.appId);
if (!appUser) {
const result = builder.getMessage();
delete result.id;
if (!result.token && (!result.visitor || !result.visitor.token)) {

Check warning on line 177 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid visitor sending the message');
}
}
if (result.type !== RoomType.LIVE_CHAT) {
if (!result.creator || !result.creator.id) {

Check warning on line 195 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid creator assigned to the room.');
}
}
if (result.type !== RoomType.DIRECT_MESSAGE) {
if (result.type !== RoomType.LIVE_CHAT) {
if (!result.slugifiedName || !result.slugifiedName.trim()) {

Check warning on line 202 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid slugifiedName assigned to the room.');
}
}
if (!result.displayName || !result.displayName.trim()) {

Check warning on line 207 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid displayName assigned to the room.');
}
}
const room = builder.getRoom();
delete room.id;
if (!room.creator || !room.creator.id) {

Check warning on line 219 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid creator assigned to the discussion.');
}
if (!room.slugifiedName || !room.slugifiedName.trim()) {

Check warning on line 223 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid slugifiedName assigned to the discussion.');
}
if (!room.displayName || !room.displayName.trim()) {

Check warning on line 227 in packages/apps-engine/src/server/accessors/ModifyCreator.ts

GitHub Actions / 🔎 Code Check / Code Lint 

Prefer using an optional chain expression instead, as it's more concise and easier to read
throw new Error('Invalid displayName assigned to the discussion.');
}