Use Discord Credentials when available

[KarthikRaju391]

This is related to issue #105

• Added Development setup for discord section in the documentation
• Updated UserMenu.tsx to use discord credentials when available
• Updated the next.config.js file to allow discord avatars to be used in the Image tag

[fozziethebeat]

We shouldn't check these in. Can you remove them.

[fozziethebeat]

If you want to keep them locally, you can put this in .env.local

[KarthikRaju391]

Oh I forgot I included it, I will remove and push the changes

[bitplane]

It'll still end up in the git history if you don't rebase to remove the patch.

Warning: git rebase can be dangerous and messy. Back up your branch locally first with git branch some-backup-branch-name so you can get back to it if you mess things up.

Now run git rebase -i main. You can change the order of the commits so the removal commit comes after the first commit on this branch, then change the word pick (select this commit) to be squash (combine this commit with the previous one). This will cause the addition of the secret and the removal to get merged into one patch, magically removing it from the history.

Once you're sure it looks good (git log, git show, git diff main), push it back up with git push -f. You'll need to force push because histories will have diverged.

It'll still exist here on Github though. Not sure about the process for censoring that.

[KarthikRaju391]

If I do git push -f will that create a new pull request? @bitplane

[bitplane]

@KarthikRaju391
No, it'll just push the rewritten history of your branch. It might mean that some review comments can't link to code that's changed anymore, I'm not sure. There's 3 repos going on, each with a history of commits:

1. your local repo and the branch where you're working (on your machine it's just called discord-credentials)
2. Your branch in your github fork KarthikRaju391/Open-Assistant:discord-credentials, which you call origin/discord-credentials locally
3. This repo's main branch, which is LAION-AI/Open-Assistant:main usually called upstream/main if you added the upstream remote.

Here's what's going on in my instructions

• git rebase -i will rewrite the history of 1 (discord-credentials)
• git push -f will overwrite 2 with the contents of 1
• This pull request is a GitHub thing that requests we pull code from 2 into 3, it's based on the name of 2 not its history

We could do an alternative method: When merging your changes into main, we choose the "squash commits when merging" approach, which will remove all your commits and replace them with a single squashed commit. But that kinda sucks because your commits will be gone, so you as far as GitHub is concerned you won't be credited as one of the project's authors. So the rebase + force push is the best option

[yk]

is this a different workflow from the "Bot Setup" above? could the two be merged or do they refer to separate applications?

[KarthikRaju391]

This is for the website part to enable discord authentication

[yk]

shouldn't it then be in the README of the website, instead of the one for the discord-bot?

[KarthikRaju391]

When we were discussing it in the issue, I was told to put it in discord-bot so, I put it there. I'll just change it

[yk]

good from my side 👍 thank you

[KarthikRaju391]

Thank you so much for helping me throughout @yk and @fozziethebeat
Will be looking forward to contributing more!

[fozziethebeat]

Two small changes but I approve of this. I'll merge once I see that the pre-commit checks all pass.

[fozziethebeat]

Can you remove this line change? That'll simplify the review process

[fozziethebeat]

Can you delete this file? It's not needed at the root directory.

[KarthikRaju391]

The package-lock.json file should be deleted? @fozziethebeat

[fozziethebeat]

Thank you for working on this and working through the git changes.

[KarthikRaju391]

@fozziethebeat, it was great working on this! Certainly wouldn't be able to do it without your help.