main #47

Open
amymucko wants to merge 2 commits from amymucko/discord-bot:main into main
First-time contributor

Some minor changes to language

Some minor changes to language
Cleaned up the language a lil
Update doc/User.md
All checks were successful
/ check_lfs (pull_request) Successful in 7s
/ lint_fmt (pull_request) Successful in 29s
/ lint_clippy (pull_request) Successful in 1m24s
/ build (pull_request) Successful in 1m41s
d98c4d195c
Spacing?
silver left a comment
Owner

Mostly good

Mostly good
@ -11,3 +11,2 @@
1. In a Discord server with the Skynet Bot enter ``/wolves link YOUR_WOLVES_CONTACT_EMAIL``
1. In a Discord server with the Skynet Bot enter ``/wolves link YOUR_WOLVES_CONTACT_EMAIL``
<img src="../media/setup_user_01.png" alt="link process start" width="50%" height="50%">
* Your ``YOUR_WOLVES_CONTACT_EMAIL`` is the email in the Contact Email here: <https://ulwolves.ie/memberships/profile>
Owner

Its literally called (preferred) Contact Email on Wolves so this makes it more confusing

Its literally called (preferred) ``Contact Email`` on Wolves so this makes it more confusing
Author
First-time contributor

"is your Contact Email for ULWolves, found here"?

"is your Contact Email for ULWolves, found here"?
Owner

That works

That works
silver marked this conversation as resolved
@ -2,3 +2,1 @@
The Skynet bot is designed to make it easy to verify that you are a member of a Club/Society.
The bot will be able to give you member roles for any partnered servers.
It also provides secondary manifests such as granting access to minecraft servers managed by teh Computer Society.
The Skynet bot is designed to connect your ULWolves and committee roles to your discord.
Owner
  1. For more than just Committee.
  2. Does not make much grammatical sense
    • Connects Wolves and Discord account
1. For more than just Committee. 2. Does not make much grammatical sense * Connects Wolves and Discord account
Author
First-time contributor

"is designed to connect your ULWolves account and/or any committee roles you have to your discord." ?

"is designed to connect your ULWolves account and/or any committee roles you have to your discord." ?
Owner
- and/or any committee roles you have

The roles is a follow on part

```diff - and/or any committee roles you have ``` The roles is a follow on part
Author
First-time contributor

what do you mean by that?

what do you mean by that?
Owner

its a two part process

the main thing is linking Wolves and Discord
managing roles just is using that data

If ye put in and/or any committee roles you have then ye will confuse teh fuck out of anyone who isnt a committee member trying to use it.
Unless ye add and/or any committee and member roles on select discords roles you have which would make it more clear, but unwieldy.

its a two part process the main thing is linking Wolves and Discord managing roles just is using that data If ye put in ``and/or any committee roles you have`` then ye will confuse teh fuck out of anyone who isnt a committee member trying to use it. Unless ye add ``and/or any committee and member roles on select discords roles you have`` which would make it more clear, but unwieldy.
Author
First-time contributor

aight so maybe keep it in two sentences?
"The Skynet Bot is designed to verify your membership of a club/society and connect your ULWolves Account to your Discord.
It will also link any committee role(s) you have."

aight so maybe keep it in two sentences? "The Skynet Bot is designed to verify your membership of a club/society and connect your ULWolves Account to your Discord. It will also link any committee role(s) you have."
Owner

How about something like this?

The Skynet Bot is designed to connect your ULWolves Account to your Discord.  
This:
1. Verifys you are on a committee for the Committee server
2. Gives you the ``member`` roles for any partnered servers.
3. Granting access to Minecraft servers managed by teh Computer Society.
How about something like this? ```markdown The Skynet Bot is designed to connect your ULWolves Account to your Discord. This: 1. Verifys you are on a committee for the Committee server 2. Gives you the ``member`` roles for any partnered servers. 3. Granting access to Minecraft servers managed by teh Computer Society. ```
Author
First-time contributor

thats good I think

thats good I think
Owner

any partnered servers. dosent sit quite right with me though, so feel free to change it to somethign ye think works best.

``any partnered servers.`` dosent sit quite right with me though, so feel free to change it to somethign ye think works best.
Author
First-time contributor

"for any server of which whose club/society you are a member"

"for any server of which whose club/society you are a member"
Owner

sounds good

sounds good
@ -8,4 +8,3 @@
**You will only need to do this once**.
### Setup
1. In a Discord server with the Skynet Bot enter ``/wolves link YOUR_WOLVES_CONTACT_EMAIL``
Owner

I know it seems strange, but this space needs to go back, removing it will feck up the formatting

I know it seems strange, but this space needs to go back, removing it will feck up the formatting
Owner

Not clear from just above, but the end of this line needs two spaces

Not clear from just above, but the end of this line needs two spaces
silver marked this conversation as resolved
All checks were successful
/ check_lfs (pull_request) Successful in 7s
/ lint_fmt (pull_request) Successful in 29s
/ lint_clippy (pull_request) Successful in 1m24s
/ build (pull_request) Successful in 1m41s
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:amymucko-main
git switch amymucko-main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff amymucko-main
git switch amymucko-main
git rebase main
git switch main
git merge --ff-only amymucko-main
git switch amymucko-main
git rebase main
git switch main
git merge --no-ff amymucko-main
git switch main
git merge --squash amymucko-main
git switch main
git merge --ff-only amymucko-main
git switch main
git merge amymucko-main
git push origin main
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Skynet/discord-bot#47
No description provided.