Skip to content

Commit

Permalink
Merge branch 'staging' of https://github.com/flybywiresim/discord-bot …
Browse files Browse the repository at this point in the history 
…into fork/patch-2

# Conflicts:
#	.github/CHANGELOG.md
  • Loading branch information
@benw202
benw202 committed May 26, 2024
2 parents 814d481 + e4a0e5e commit a68173f
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 71 deletions.
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Update <small>_ May 2024</small>

- feat: devlanguage command more aliases (26/05/2024)
- chore: remove efb and adirs commands (26/05/2024)
- fix: remove synaptic command (07/05/2024)
- refactor: Improve screenshot command for QoL (07/05/2024)

Expand Down
32 changes: 0 additions & 32 deletions .github/command-docs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

| Command | Description | Alias |
|:-------------------------|:--------------------------------------------------------------------------------------------------|:-------------------------------------------------------|
| .adirs | Display help with ADIRS alignment | --- |
| .afloor | Provides a link to the Alpha Floor Tool-Tip | --- |
| .airframe | Provides a link to the updated Simbrief airframe | --- |
| .assistance | Explains to the user why assistance options should be disabled | .assi <br> .as |
Expand All @@ -19,7 +18,6 @@
| .cpdlc | Provide info and docs link for Hoppie ACARS | .pdc <br> .hoppie <br> .acars |
| .ctrle | Displays help regarding CTRL+E engine start | .ctrl+e <br> .ctrl-e <br> .enginestart |
| .direct | Provides a link to the Direct documentation (also referred to as DIR TO) | .dirto <br> .directto |
| .efb | Inquire about the state of the EFB | --- |
| .experimental | Explains the current state of the experimental build | .exp |
| .fixinfo | Provide information about the fix info feature | --- |
| .flextemp | Provides a link to the a32nx flex temp guide | .flex |
Expand Down Expand Up @@ -103,7 +101,6 @@
| .botissue | Provides details on where to create a FBW Discord Bot Issue or Feature Request | .bot-issue <br> .botfeature <br> .bot-feature <br> .botfeat |
| .devlanguages | Provides a list of development languages used in the A32NX | .devlanguage <br> .devlang <br> .dl |
| .dfd | Provides link to Digital Flight Dynamics discord server | --- |
| .docsearch | Provides a link to the FlyByWire documentation, either a general link, or a link for a specific search <br> Search terms can be terminated by a line break or one of the symbols . - > \ / | .documentation <br> .docs <br> .doc |
| .donate | Provides a link to the open collective | --- |
| .goldenrules | Provides an image describing the golden rules an Airbus pilot should follow | .golden <br> .gr |
| .fsltl | Provides link to the FS Live Traffic Liveries Discord server | .fslivetrafficliveries |
Expand All @@ -128,23 +125,8 @@

| Command | Description | Alias |
|:--------------|:-------------------------------------------------------------------------------------|:---------------------------------------------------------------|
| .avatar | Shows the selected user's avatar | .av |
| .birthday | Handles adding & removing user birthdays | --- |
| .count | counts in the count thread | --- |
| .events | Show a list of upcoming VATSIM events. | .event <br> .ev <br> .vatsimevents <br> .vatevents <br> .vatev |
| .help | Sends a list of available commands to the user | --- |
| .liveflights | Get the current live flights for FlyByWire Simulations | .flights <br> .flight |
| .membercount | Lists the guild's current amount of members | --- |
| .metar | Provides the METAR report of the requested airport | --- |
| .ping | Send back a message | --- |
| .pr | Provide a link to any given FBW PRs | --- |
| .roleinfo | Lists the guild's current amount of members | --- |
| .simbriefdata | Lists a number of attributes from the last generated SimBrief flightplan of a user | --- |
| .station | Provides station information | --- |
| .taf | Provides the TAF report of the requested airport | --- |
| .vatsim | Show statistics and details of online VATSIM controllers, observers, ATIS and pilots | .vatsimdata <br/> .vatdata |
| .wa | Queries the Wolfram Alpha API | .calc <br> .ask |
| .zulu | Get the current time at a given UTC-offset timezone | --- |

### Memes

Expand Down Expand Up @@ -181,19 +163,5 @@

| Command | Description | Alias |
|:----------------------|:--------------------------------------------------------------------------------------------------------|:-------------------------------------------|
| .ban | --- | --- |
| .cacheupdate | Update the cache of the bot with the information from discord for different aspects | .cache-update |
| .deletewarn | Deletes a users warning | .delwarn <br/> .deletewarning |
| .faq | Sends the FAQ | --- |
| .roleassignment | Sends the role assignment messages | --- |
| .rules | Sends the rules | --- |
| .slowmode | Sets slow mode for a channel and is capable of automatically disabling it after a timeout. | --- |
| .sticky | Manage sticky messages which are posted in Forum Posts when a new post is created | --- |
| .temporarycommandedit | Manage temporary commands, which are simple output commands to highlight temporary situations to users. | .tempcommandedit <br> .tcedit <br> .tcmod |
| .timeout | --- | --- |
| .unban | --- | --- |
| .untimeout | --- | .removetimeout |
| .warn | Warns a user | --- |
| .warnings | Lists a users warnings | .listwarn <br/> .listwarnings <br/> .warns |
| .welcome | Sends the welcome | --- |
| .whois | Provides an embedded message with information about the mentioned user | --- |
Binary file removed assets/images/a32nx/adirs.png
View file
Binary file not shown.
Binary file removed assets/images/a32nx/efb.gif
View file
Binary file not shown.
Binary file removed assets/images/a32nx/efb_downscaled.gif
View file
Binary file not shown.
21 changes: 0 additions & 21 deletions src/commands/aircraft/adirs.ts
View file

This file was deleted.

14 changes: 0 additions & 14 deletions src/commands/aircraft/efb.ts
View file

This file was deleted.

2 changes: 2 additions & 0 deletions src/commands/general/migratedCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const migratedCommandEmbed = makeEmbed({

export const migratedCommand: MessageCommandDefinition = {
name: [
'adirs',
'ask',
'av',
'avatar',
Expand All @@ -25,6 +26,7 @@ export const migratedCommand: MessageCommandDefinition = {
'documentation',
'doc',
'docs',
'efb',
'ev',
'event',
'events',
Expand Down
4 changes: 0 additions & 4 deletions src/commands/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ import Logger from '../lib/logger';
import { typeCommand } from '../lib/typeCommand';
import { bruheg } from './memes/bruheg';
import { boratorium } from './memes/boratorium';
import { efb } from './aircraft/efb';
import { deadzones } from './support/deadzones';
import { screens } from './aircraft/screens';
import { when } from './general/when';
import { trythis } from './support/trythis';
import { experimental } from './aircraft/experimental';
import { versions } from './aircraft/versions';
import { installer } from './general/installer';
import { adirs } from './aircraft/adirs';
import { logs } from './support/logs';
import { autopilot } from './aircraft/autopilot';
import { checklist } from './aircraft/checklist';
Expand Down Expand Up @@ -177,15 +175,13 @@ const commands: BaseCommandDefinition[] = [
typeCommand,
bruheg,
boratorium,
efb,
deadzones,
screens,
when,
trythis,
experimental,
versions,
installer,
adirs,
logs,
autopilot,
checklist,
Expand Down

0 comments on commit a68173f

Please sign in to comment.