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.

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

[ Bug ] Removed emojis from the app #40

Merged
merged 9 commits into from
Jan 31, 2024
Merged
6 changes: 3 additions & 3 deletions README.md
Copy link
Collaborator

@Nabhag8848 Nabhag8848 Jan 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • oops, i believe you removed from documentation which is not needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I add the emojis in the documentation?

Copy link
Collaborator

@Nabhag8848 Nabhag8848 Jan 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, revert changes of docs.

Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Where RocketChat and Notion work together seamlessly to fuel your team's success

```

👋 Need some help with /notion?
Need some help with /notion?

• use `/notion connect` to connect your workspace
• use `/notion disconnect` to disconnect workspace
Expand All @@ -117,7 +117,7 @@ Where RocketChat and Notion work together seamlessly to fuel your team's success

```

## Glimpse :
## Glimpse :

[Video Demo Day](https://www.youtube.com/watch?v=G1fZBqy5jp8)

Expand All @@ -136,7 +136,7 @@ Don't forget to give the project a star! Thanks again!
4. Push to the Branch (`git push origin feat/AmazingFeature`)
5. Open a Pull Request

## 📚 Resources
## Resources

Here are some links to examples and documentation:

Expand Down
4 changes: 2 additions & 2 deletions enum/OAuth2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export enum OAuth2Locator {
export enum OAuth2Content {
success = "https://github-production-user-asset-6210df.s3.amazonaws.com/65061890/243671111-9964efff-3b23-4223-aadd-5f4be441037c.svg",
failed = "https://open.rocket.chat/assets/logo.png",
NOT_CONNECTED_MESSAGE = `👋 You are not connected to **Workspace**!`,
NOT_CONNECTED_MESSAGE_WITH_INFO = `👋 Connect to workspace to access \`pages\` & \`database\``,
NOT_CONNECTED_MESSAGE = `You are not connected to **Workspace**!`,
NOT_CONNECTED_MESSAGE_WITH_INFO = `Connect to workspace to access \`pages\` & \`database\``,
CONNECT_TO_WORKSPACE = "Connect to Workspace",
CREDENTIALS_MISSING_USER = `🚫 Something Went Wrong, Please Contact the Admin!`,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove 🚫

CREDENTIALS_MISSING_ADMIN = `Please Configure the App and Ensure the \`SiteUrl\` is correct in the Server Settings.
Expand Down
20 changes: 10 additions & 10 deletions enum/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ export enum Messages {
• use \`/notion share\` to share pages

`,
HELPER_TEXT = `:wave: Need some help with \`/notion\`?`,
HELPER_TEXT = `Need some help with \`/notion\`?`,
}

export enum OnInstallContent {
PREVIEW_TITLE = "[**📖 Notion App**](https://github.com/RocketChat/Apps.Notion/)",
PREVIEW_DESCRIPTION = "**🙌 Installed and Rollin' on your Server!**",
PREVIEW_CONTEXT = "[**🤝 Support's Page**](https://github.com/RocketChat/Apps.Notion/issues)",
PREVIEW_TITLE = "[**Notion App**](https://github.com/RocketChat/Apps.Notion/)",
PREVIEW_DESCRIPTION = "**Installed and Rollin' on your Server!**",
PREVIEW_CONTEXT = "[**Support's Page**](https://github.com/RocketChat/Apps.Notion/issues)",
PREVIEW_IMAGE = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Notion-logo.svg",
WELCOMING_MESSAGE = `🔧 Setting up the Notion App is a breeze! Create a [**Notion Public Integration**](https://developers.notion.com/docs/authorization#how-to-make-an-integration-public) and Just head over to the App Settings, Provide your credentials.
🎉 You're all set to experience the seamless integration of Notion and RocketChat.
Need some help getting started? Just type \`/notion help\` to access our comprehensive command list.
💌 We love hearing from you! If you have any suggestions, questions, or just want to share your thoughts, simply tap on the **Support's Page** in Preview.
🌟 Let's streamline your productivity and collaboration together. Enjoy the journey!
WELCOMING_MESSAGE = `Setting up the Notion App is a breeze! Create a [**Notion Public Integration**](https://developers.notion.com/docs/authorization#how-to-make-an-integration-public) and Just head over to the App Settings, Provide your credentials.
You're all set to experience the seamless integration of Notion and RocketChat.
Need some help getting started? Just type \`/notion help\` to access our comprehensive command list.
We love hearing from you! If you have any suggestions, questions, or just want to share your thoughts, simply tap on the **Support's Page** in Preview.
Let's streamline your productivity and collaboration together. Enjoy the journey!

Thanks for choosing \`Notion App\`
`,
WELCOME_TEXT = `Welcome to **Notion App** in RocketChat! 🙌`,
WELCOME_TEXT = `Welcome to **Notion App** in RocketChat! `,
}
6 changes: 3 additions & 3 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"CredentialsSettings": "Authorization Settings",
"NotionCommandParams": "connect | disconnect | workspace | create | schema | comment",
"NotionCommandDescription": "Create Notion pages and database from Rocket.Chat",
"CommentOnPagesLabel": "💬 Comment on Page",
"SendToPageLabel": "📝 Send to Page",
"SendToNewPageLabel": "📢 Send to New Page"
"CommentOnPagesLabel": "Comment on Page",
"SendToPageLabel": "Send to Page",
"SendToNewPageLabel": "Send to New Page"
}
4 changes: 2 additions & 2 deletions src/authorization/OAuth2Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class OAuth2Client implements IOAuth2Client {
return;
}

const message = `Hey **${sender.username}**!👋 Connect your Notion Workspace`;
const message = `Hey **${sender.username}**! Connect your Notion Workspace`;
const blocks = await getConnectBlock(
this.app,
message,
Expand Down Expand Up @@ -66,7 +66,7 @@ export class OAuth2Client implements IOAuth2Client {

if (tokenInfo) {
await oAuthStorage.disconnectUserFromCurrentWorkspace(userId);
const message = `👋 You are disconnected from the Workspace **${tokenInfo.workspace_name}**`;
const message = `You are disconnected from the Workspace **${tokenInfo.workspace_name}**`;
await sendNotification(read, modify, sender, room, { message });
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/endpoints/webhook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class WebHookEndpoint extends ApiEndpoint {
const successTemplate = getAuthPageTemplate(
"Connected to Workspace",
OAuth2Content.success,
`👋 Connected to ${response.workspace_name}❗`,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add 👋 as it is AuthPageTemplate as we discussed earlier.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oki

`Connected to ${response.workspace_name}❗`,
"YOU CAN NOW CLOSE THIS WINDOW"
);

Expand Down
14 changes: 7 additions & 7 deletions src/handlers/ExecuteViewSubmitHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export class ExecuteViewSubmitHandler {
} else {
const name: string = response.name;
const link: string = response.link;
message = `Your Database [**${name}**](${link}) is created successfully in **${workspace_name}**.`;
message = `Your Database [**${name}**](${link}) is created successfully in **${workspace_name}**.`;

await sendNotificationWithAttachments(
this.read,
Expand Down Expand Up @@ -387,7 +387,7 @@ export class ExecuteViewSubmitHandler {
message = `🚫 Something went wrong while creating page in **${workspace_name}**.`;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove 🚫. there are several others in same file remove all of them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will try to remove it from wherever it is required. I don't know why but my vs code search does not show any data when I search for "🚫"

} else {
const { name, link, title, pageId } = createdPage;
message = `Your Page [**${title}**](${link}) is created successfully as a subpage in **${name}**.`;
message = `Your Page [**${title}**](${link}) is created successfully as a subpage in **${name}**.`;

const preserveMessage = await modalInteraction.getInputElementState(
ActionButton.SEND_TO_NEW_PAGE_MESSAGE_ACTION
Expand Down Expand Up @@ -430,7 +430,7 @@ export class ExecuteViewSubmitHandler {
)) as ICredential;

const messageLink = `${siteUrl}/${urlPath}/${displayName}?msg=${id}`;
const preserveText = `📝 Created New Page [**${title}**](${link}) and Preserved Following [Message](${messageLink}) `;
const preserveText = `Created New Page [**${title}**](${link}) and Preserved Following [Message](${messageLink}) `;

await sendMessage(
this.read,
Expand Down Expand Up @@ -501,7 +501,7 @@ export class ExecuteViewSubmitHandler {
];
const { fields, url, pageId } = createdRecord;

message = `Created [**${title}**](${url}) in [**${databasename}**](${databaselink})`;
message = `Created [**${title}**](${url}) in [**${databasename}**](${databaselink})`;

const messageId = await sendMessageWithAttachments(
this.read,
Expand Down Expand Up @@ -554,7 +554,7 @@ export class ExecuteViewSubmitHandler {
)) as ICredential;

const messageLink = `${siteUrl}/${urlPath}/${displayName}?msg=${id}`;
const preserveText = `📝 Created [**${title}**](${url}) Page and Preserved Following [Message](${messageLink}) `;
const preserveText = `Created [**${title}**](${url}) Page and Preserved Following [Message](${messageLink}) `;

await sendMessage(
this.read,
Expand Down Expand Up @@ -814,7 +814,7 @@ export class ExecuteViewSubmitHandler {

const { name, parent, url } = pageInfo;

const message = `Sharing [**${name}**](${url}) from **${workspace_name}**`;
const message = `Sharing [**${name}**](${url}) from **${workspace_name}**`;

await sendMessage(this.read, this.modify, user, room, {
message,
Expand Down Expand Up @@ -913,7 +913,7 @@ export class ExecuteViewSubmitHandler {
)) as ICredential;

const messageLink = `${siteUrl}/${urlPath}/${displayName}?msg=${id}`;
const preserveText = `📝 Preserved Following [Message](${messageLink}) in [**${name}**](${url}) `;
const preserveText = `Preserved Following [Message](${messageLink}) in [**${name}**](${url}) `;

await sendMessage(
this.read,
Expand Down
4 changes: 2 additions & 2 deletions src/helper/getConnectLayout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export function getConnectPreview(
: undefined;
const thumb = workspace_icon_url ? { url: workspace_icon_url } : undefined;
const title = [
`**📚 [**${workspace_name}**](${Notion.WEBSITE_URL})**`,
"**👋 Connected to Workspace**",
`** [**${workspace_name}**](${Notion.WEBSITE_URL})**`,
"**Connected to Workspace**",
];
const description = [""];
const avatarElement = elementBuilder.addImage({
Expand Down
29 changes: 16 additions & 13 deletions src/lib/NotionSDK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export class NotionSDK implements INotionSDK {

const result: Array<IPage> = [];
results.forEach(async (item) => {
const pageObject = await this.getPageObjectFromResults(item);
const pageObject = await this.getPageObjectFromResults(item, false);
if (pageObject) {
result.push(pageObject);
}
Expand All @@ -132,7 +132,7 @@ export class NotionSDK implements INotionSDK {
}
}

private async getPageObjectFromResults(item): Promise<IPage | null> {
private async getPageObjectFromResults(item, emoji): Promise<IPage | null> {
const typesWithTitleProperty = [
NotionObjectTypes.WORKSPACE.toString(),
NotionObjectTypes.PAGE_ID.toString(),
Expand All @@ -145,7 +145,7 @@ export class NotionSDK implements INotionSDK {
const pageName: string =
properties.title.title[0]?.text?.content ||
NotionObjectTypes.UNTITLED;
return this.returnPage(pageName, pageId);
return this.returnPage(pageName, pageId, emoji);
}

// title property either be at first or last position
Expand All @@ -161,7 +161,7 @@ export class NotionSDK implements INotionSDK {
const name: string =
properties[firstColumn].title[0]?.text?.content ||
NotionObjectTypes.UNTITLED;
return this.returnPage(name, pageId);
return this.returnPage(name, pageId, emoji);
}

//title at last position and has subpage
Expand All @@ -172,15 +172,15 @@ export class NotionSDK implements INotionSDK {
const name: string =
properties[lastColumn].title[0]?.text?.content ||
NotionObjectTypes.UNTITLED;
return this.returnPage(name, pageId);
return this.returnPage(name, pageId, emoji);
}

return null;
}

private returnPage(name: string, page_id: string): IPage {
private returnPage(name: string, page_id: string, emoji: boolean): IPage {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we make emoji parameter default value as false to avoid passing when we don't need emojis.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oki

return {
name: `📄 ${name}`,
name: `${emoji ? "📄" : ""} ${name}`,
parent: {
type: NotionObjectTypes.PAGE_ID,
page_id,
Expand Down Expand Up @@ -520,15 +520,16 @@ export class NotionSDK implements INotionSDK {
const objectType: string = item?.[NotionObjectTypes.OBJECT];
if (objectType.includes(NotionObjectTypes.PAGE)) {
const pageObject = await this.getPageObjectFromResults(
item
item,
true
);

if (pageObject) {
result.push(pageObject);
}
} else {
const databaseObject =
await this.getDatabaseObjectFromResults(item);
await this.getDatabaseObjectFromResults(item, true);

result.push(databaseObject);
}
Expand All @@ -540,7 +541,7 @@ export class NotionSDK implements INotionSDK {
}
}

private async getDatabaseObjectFromResults(item): Promise<IDatabase> {
private async getDatabaseObjectFromResults(item, emoji:boolean): Promise<IDatabase> {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: Emoji default value as false and make necessary changes whereever you are calling this function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oki

const databaseNameTitleObject = item?.[NotionObjectTypes.TITLE];
const name: string = databaseNameTitleObject.length
? databaseNameTitleObject[0]?.plain_text
Expand All @@ -549,7 +550,7 @@ export class NotionSDK implements INotionSDK {

return {
info: {
name: `📚 ${name}`,
name: `${emoji ? "📚":""} ${name}`,
link: item?.url,
},
parent: {
Expand Down Expand Up @@ -989,7 +990,8 @@ export class NotionSDK implements INotionSDK {

const pageInfo = response.data;
const page = (await this.getPageObjectFromResults(
pageInfo
pageInfo,
false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Previously we made a emoji param default value false so that we don't need to pass it when its false, remove from every calls where it is false. there are at several other places.
Suggested change
false

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oki making the changes

)) as IPage;
const url: string = pageInfo?.url;

Expand Down Expand Up @@ -1089,7 +1091,8 @@ export class NotionSDK implements INotionSDK {
results.forEach(async (item) => {
const objectType: string = item?.[NotionObjectTypes.OBJECT];
const databaseObject = await this.getDatabaseObjectFromResults(
item
item,
false
);

result.push(databaseObject);
Expand Down