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

Patch 1 #51

Open
wants to merge 96 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
4209494
Comments added
eYuM-coder Sep 23, 2022
bf41018
Merge branch 'main' of https://github.com/Pogy-Bot/Pogy
eYuM-coder Sep 23, 2022
e795091
Added new command for Pogy
eYuM-coder Oct 4, 2022
d5ee927
Merge branch 'main' of https://github.com/Boeing-737-800/Pogy-1
eYuM-coder Oct 4, 2022
a37f1c9
Added Hack Command For Pogy (bugs fixed)
eYuM-coder Oct 4, 2022
9cbc416
Merge branch 'main' of https://github.com/Boeing-737-800/Pogy-1
eYuM-coder Oct 4, 2022
ca28247
Slash Command support
eYuM-coder Nov 10, 2022
e9bb3df
Slash Command Support for Pogy
eYuM-coder Nov 10, 2022
982dae5
Merge branch 'main' of https://github.com/Boeing-737-800/Pogy-1
eYuM-coder Nov 10, 2022
3fafc4b
Merge branch 'main' of https://github.com/Boeing-737-800/Pogy-1
eYuM-coder Nov 10, 2022
73c826b
Merge branch 'main' of https://github.com/Boeing-737-800/Pogy-1
eYuM-coder Nov 10, 2022
6c17c2a
Slash Commands For Pogy with Raw djs
eYuM-coder Nov 10, 2022
6305dd9
More slash commands for pogy (Plus new handler)
eYuM-coder Nov 17, 2022
d096515
Resolved merge conflicts
eYuM-coder Nov 17, 2022
2b8bede
Delete mute.js
eYuM-coder Nov 18, 2022
0817ab9
Delete unmute.js
eYuM-coder Nov 18, 2022
27b3635
New command for pogy
eYuM-coder Nov 18, 2022
efc8ec2
Why..
eYuM-coder Nov 18, 2022
749f04b
Quick fix in warnings.js
eYuM-coder Nov 28, 2022
5da539a
Warn command converted to slash command
eYuM-coder Nov 28, 2022
e0f2418
Another command
eYuM-coder Nov 28, 2022
0624100
New category :D
eYuM-coder Feb 15, 2023
98b246d
Create balance.js
eYuM-coder Feb 15, 2023
7c1ff75
Create beg.js
eYuM-coder Feb 15, 2023
f6fa81b
Deleted this.
eYuM-coder Feb 15, 2023
83098c4
Create e
eYuM-coder Feb 15, 2023
f649917
New category :D
eYuM-coder Feb 15, 2023
06f17e3
Delete e
eYuM-coder Feb 15, 2023
9ae63fa
Added profile.js
eYuM-coder Feb 15, 2023
83813a9
Update utils.js
eYuM-coder Feb 15, 2023
bc198ca
Finished information category
eYuM-coder Mar 6, 2023
fe4d39c
finished moderation category
eYuM-coder Mar 6, 2023
b8b7ec2
Create autoresponselist.js
eYuM-coder Mar 6, 2023
e1de5e8
finished config category
eYuM-coder Mar 6, 2023
effd7e0
Create quote.js
eYuM-coder Mar 6, 2023
b435373
finishing this later
eYuM-coder Mar 6, 2023
7fe5c22
Create addbadge.js
eYuM-coder Mar 6, 2023
bc560bf
unfinished
eYuM-coder Mar 6, 2023
fb8a6d0
Create vote.js
eYuM-coder Mar 6, 2023
9e3259a
Unfinished (still have a lot to convert here)
eYuM-coder Mar 6, 2023
21bf2d5
Merge branch 'Pogy-Bot:main' into main
eYuM-coder Mar 9, 2023
4c9061d
Changed url to hcaptcha api
eYuM-coder Mar 9, 2023
af83ab2
Update clear.js
eYuM-coder Mar 10, 2023
6fe459b
added say slash command!
hotsu0p Dec 24, 2023
fff4773
yea ig
hotsu0p Dec 24, 2023
8e516b1
added users
hotsu0p Dec 24, 2023
861ac97
added fule
hotsu0p Dec 24, 2023
269d22a
✨commands page
hotsu0p Dec 31, 2023
eb632e5
removed somethings
hotsu0p Dec 31, 2023
21a2247
few things
hotsu0p Dec 24, 2023
967766f
Addded new page and yea
hotsu0p Dec 31, 2023
6f9a28a
minor update
Jan 3, 2024
4d77daa
Create config.json
eYuM-coder Jan 3, 2024
7b25825
Merge pull request #1 from eYuM-coder/eYuM-coder-patch-1
eYuM-coder Jan 3, 2024
9ceab9f
update
Jan 3, 2024
61dfde2
a
Jan 3, 2024
49d12f4
Slash Commands Update
Jan 3, 2024
bf65133
added and removed stuff
hotsu0p Jan 4, 2024
4f64c28
update language files for better grammar
Jan 4, 2024
f34e1f9
minor website update
Jan 4, 2024
05e99e7
a
Jan 4, 2024
5a1b632
Slash command update
Jan 4, 2024
911643c
few commits. added change log page
hotsu0p Jan 5, 2024
d95d83f
more updates
Jan 5, 2024
304dfc2
updated readme and gitignore
hotsu0p Jan 5, 2024
753def0
THIS ISNT FINISHED
hotsu0p Jan 7, 2024
73c5286
added small little things
hotsu0p Jan 7, 2024
0735d62
:sparkles: new stuff?
hotsu0p Jan 7, 2024
fb52050
Finnal command for now
hotsu0p Jan 7, 2024
f94329f
This is more commands
hotsu0p Jan 8, 2024
b98e84c
updated command
hotsu0p Jan 9, 2024
3b7a0a9
Merge branch 'main' of https://github.com/eYuM-coder/MEE8 into eYuM-c…
hotsu0p Jan 9, 2024
0f64192
Renamed stuff from MEE8 to Pogy
hotsu0p Jan 9, 2024
18a6000
Merge pull request #2 from hotsu0p/eYuM-coder-main
hotsu0p Jan 9, 2024
1fb43df
Update LICENSE
hotsu0p Jan 9, 2024
1a8fd83
push these commits
Jan 10, 2024
f321f4f
a
Jan 10, 2024
78c8c86
i added retard things and fixed retart erros . last commit of the day…
hotsu0p Jan 10, 2024
f533087
Merge pull request #3 from hotsu0p/eYuM-coder-main
hotsu0p Jan 10, 2024
cabaddb
updated level up message to embed
hotsu0p Jan 10, 2024
9aa1397
✨ Added stuff
hotsu0p Jan 10, 2024
4659eed
Update README.md
hotsu0p Jan 10, 2024
e3aa62b
update
Jan 10, 2024
182d92b
a
Jan 10, 2024
421136d
a
Jan 10, 2024
4e75e36
a
Jan 10, 2024
59e3560
Update replit.nix
eYuM-coder Jan 10, 2024
9d73637
Merge pull request #2 from eYuM-coder/eYuM-coder-patch-3
eYuM-coder Jan 10, 2024
c02190e
Delete .replit
eYuM-coder Jan 10, 2024
fb6c320
Delete replit.nix
eYuM-coder Jan 10, 2024
ebb6e31
a
Jan 10, 2024
417ed9f
a
Jan 10, 2024
edb9f25
So Vercel doesn't give up on exist
Jan 10, 2024
45bc8fa
Merge branch commit '5a92507' of https://github.com/hotsu0p/Pogy into…
Jan 11, 2024
06cdd83
a
Jan 11, 2024
01ce4a3
a
hotsu0p Jan 11, 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
14 changes: 0 additions & 14 deletions .env.template

This file was deleted.

11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,13 @@ src/assets/logs/Pogy.log
config.json
node_modules
.env
package-lock.json
src/data/users.json
<<<<<<< HEAD
.replit
replit.nix
=======
src/commands/utility/rank.js
src/data/users.json
package-lock.json
config.json
>>>>>>> 4659eedb4c034860a3cc261d48c558abe80b6671
2 changes: 0 additions & 2 deletions .replit

This file was deleted.

220 changes: 19 additions & 201 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,201 +1,19 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2021 peterhanania

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Copyright (c) 2024 Hotsuop

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 3 additions & 1 deletion Pogy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const { Client, Collection } = require("discord.js");
const Util = require("./src/structures/Util");
const config = require("./config.json");
const fs = require("node:fs");
const path = require("node:path");
const { status } = config;

module.exports = class PogyClient extends Client {
@@ -30,9 +32,9 @@ module.exports = class PogyClient extends Client {
],
},
});

this.validate(options);
this.botCommands = new Collection();
this.slashCommands = new Collection();
this.botEvents = new Collection();
this.aliases = new Collection();
this.utils = require("./src/utils/utils.js");
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -45,6 +45,8 @@
</p>

## Community Updates
[Pogy + More dashboard pages and commands by Hotsuop](https://github.com/hotsu0p/Pogy)

[Pogy + Slash commands by eYuM](https://github.com/Pogy-Bot/Pogy/tree/eyum-contributions)

## About
@@ -204,13 +206,17 @@ You can launch the bot with `npm start`

## License

Released under the [Apache License](http://www.apache.org/licenses/LICENSE-2.0) license.
Released under the [MIT License] license.

## Support
[Click here for the support server](https://v2.pogy.xyz/support)

## Donate

You can donate Pogy and make it stronger than ever [by clicking here](https://paypal.me/pogybot)!

## Credits
[Old Credits](https://github.com/peterhanania/pogy#credits)
- Peter Hanania [DJS Rewrite] - [github.com/peterhanania](github.com/peterhanania)
- JANO [DJS Rewrite] - [github.com/wlegit](github.com/wlegit)
- Peter Hanania [DJS Rewrite] - [github.com/peterhanania](https://github.com/peterhanania)
- JANO [DJS Rewrite] - [github.com/wlegit](https://github.com/wlegit)
- Hotsuop [Added commands & Commands] - [https://github.com/hotsu0p](https://github.com/hotsu0p)
35 changes: 35 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"clientId": "1135714988493910136",
"developers": ["1067137336674107453"],
"status": "!help | website here",
"discord": "https://discord.gg/",
"dashboard": "true",
"server": "",
"prefix": "!",
"webhooks": {
"logs": "https://discord.com/api/webhooks/1191872792031932416/H2PmMiAF4ANN9XbGukEXQqHPBPFwIdCCiKGte3YCZeE0QO_My-8cbkvcw0Zw1_JNWn3T",
"maintenance_logs": "https://discord.com/api/webhooks/1191873962796392500/rB7t4OXNc4YAoRQBlBCPdtV1hRmr0wOmBVJb-4Q8b1oTyZpausXqACLDWsSFRXSNGi3B",
"ratelimit_logs": "https://discord.com/api/webhooks/1191874767704297593/AcMwK-t1kzEk6RFU-SmkQ7uIwf9dfHPu8JbuPJCkdQHAi17f7vZUB_iSc0XvnCQ1tN9r",
"blacklist": "https://discord.com/api/webhooks/1191875214368329809/5hkt3OXKkQuElqJEIQ6Tq-rxBDNz1MkGUKs7xTVkzJcAg53WvuO2jjQWcvLGSRKHYra6",
"report": "https://discord.com/api/webhooks/1191875430219776062/Kd_wqFD2I911e5fRew21E1_bNoFZAO29eJ6tdVSs0e0OnJMyK5EU-oeLpXJ50pYVhZPC",
"contact": "https://discord.com/api/webhooks/1191875563737067581/3Uib7OOD_y1MwVDlOUVu7B6DayFySZ5UAOUIhSxlBMNjWdSIdygWR-_Gs6-KdpzgvYoy",
"bugs": "https://discord.com/api/webhooks/1191875015319228456/q0Y8MCmtC6WCUzu3-Nk9ltc3By4oGSFnl8j-x4A8rtoVw4kjRyRHYLfH_oReFNOAp41n",
"premium": "https://discord.com/api/webhooks/1191874623776768142/7NW5AV84rIz4yC92aaZYYl0frdVQmJfNqzvRY3QglzBL_AkakjhhHf6KR-NTdhb-Jz7h",
"suggestions": "https://discord.com/api/webhooks/1191875689067061308/Aqt67syItFzuYR7XZqaRUMZlqumTfHz6Tyjg1P_hkYACgckq0JqvBRAWNJqu5uc9cPg2",
"votes": "https://discord.com/api/webhooks/1191875845271343144/vQ2TheQMXCT2aqR_hkoZKZZnrPRCQt640tI7zHYSJb3HDpyGZJKsOn44e9F42pgrHZ6B",
"errors": "https://discord.com/api/webhooks/1191876024607199403/t3MW9tGu4zliCbPSUY-ItHJVejPaNWjDD13afUnMbqSMrZtsOiMt4AoSY4bTH27dyM4v",
"auth": "https://discord.com/api/webhooks/1191876187421675701/1RiQKyKvR4Ise6d6J8suAf4piFSY0HkgDjVrr4x--chvnYFh0fYjwUPlzAhjhHFmOLOR",
"joinsPublic": "https://discord.com/api/webhooks/1191876306393108551/2tdtejyuGdfgZyA22wDsK-vG_bCcY6WBOReriE4DTCb5fAHbNLprwUs3r4DOOiWSn5jo",
"joinsPrivate": "https://discord.com/api/webhooks/1191876306393108551/2tdtejyuGdfgZyA22wDsK-vG_bCcY6WBOReriE4DTCb5fAHbNLprwUs3r4DOOiWSn5jo",
"leavesPublic": "https://discord.com/api/webhooks/1191876447091052655/7G1samQc5pPXnKy72MWX6ZFBc0dctsSsrlPFpP8pNx-ciXFmy81MZUxNqH4VBK09mrtm",
"leavesPrivate": "https://discord.com/api/webhooks/1191876447091052655/7G1samQc5pPXnKy72MWX6ZFBc0dctsSsrlPFpP8pNx-ciXFmy81MZUxNqH4VBK09mrtm"
},
"maintenance": "false",
"maintenance_threshold": "5",
"invite_link": "https://discord.com/api/oauth2/authorize?client_id=1135714988493910136&permissions=70368744177663&scope=bot+applications.commands",
"seo": {
"enabled": "false",
"title": "Bot Name",
"description": "Bot description"
}
}
34 changes: 0 additions & 34 deletions config.json.template

This file was deleted.

Loading