Skip to content

Commit 2b13040

Browse files
author
xyzjesper
committed
Small giveaway changes for the next Updates.
1 parent 532299f commit 2b13040

File tree

67 files changed

+1188
-1316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1188
-1316
lines changed

‎LICENSE.md‎

Lines changed: 121 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,121 @@
1-
# PolyForm Noncommercial License 1.0.0
2-
3-
<https://polyformproject.org/licenses/noncommercial/1.0.0>
4-
5-
## Acceptance
6-
7-
In order to get any license under these terms, you must agree
8-
to them as both strict obligations and conditions to all
9-
your licenses.
10-
11-
## Copyright License
12-
13-
The licensor grants you a copyright license for the
14-
software to do everything you might do with the software
15-
that would otherwise infringe the licensor's copyright
16-
in it for any permitted purpose. However, you may
17-
only distribute the software according to [Distribution
18-
License](#distribution-license) and make changes or new works
19-
based on the software according to [Changes and New Works
20-
License](#changes-and-new-works-license).
21-
22-
## Distribution License
23-
24-
The licensor grants you an additional copyright license
25-
to distribute copies of the software. Your license
26-
to distribute covers distributing the software with
27-
changes and new works permitted by [Changes and New Works
28-
License](#changes-and-new-works-license).
29-
30-
## Notices
31-
32-
You must ensure that anyone who gets a copy of any part of
33-
the software from you also gets a copy of these terms or the
34-
URL for them above, as well as copies of any plain-text lines
35-
beginning with `Required Notice:` that the licensor provided
36-
with the software. For example:
37-
38-
> Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
39-
40-
## Changes and New Works License
41-
42-
The licensor grants you an additional copyright license to
43-
make changes and new works based on the software for any
44-
permitted purpose.
45-
46-
## Patent License
47-
48-
The licensor grants you a patent license for the software that
49-
covers patent claims the licensor can license, or becomes able
50-
to license, that you would infringe by using the software.
51-
52-
## Noncommercial Purposes
53-
54-
Any noncommercial purpose is a permitted purpose.
55-
56-
## Personal Uses
57-
58-
Personal use for research, experiment, and testing for
59-
the benefit of public knowledge, personal study, private
60-
entertainment, hobby projects, amateur pursuits, or religious
61-
observance, without any anticipated commercial application,
62-
is use for a permitted purpose.
63-
64-
## Noncommercial Organizations
65-
66-
Use by any charitable organization, educational institution,
67-
public research organization, public safety or health
68-
organization, environmental protection organization,
69-
or government institution is use for a permitted purpose
70-
regardless of the source of funding or obligations resulting
71-
from the funding.
72-
73-
## Fair Use
74-
75-
You may have "fair use" rights for the software under the
76-
law. These terms do not limit them.
77-
78-
## No Other Rights
79-
80-
These terms do not allow you to sublicense or transfer any of
81-
your licenses to anyone else, or prevent the licensor from
82-
granting licenses to anyone else. These terms do not imply
83-
any other licenses.
84-
85-
## Patent Defense
86-
87-
If you make any written claim that the software infringes or
88-
contributes to infringement of any patent, your patent license
89-
for the software granted under these terms ends immediately. If
90-
your company makes such a claim, your patent license ends
91-
immediately for work on behalf of your company.
92-
93-
## Violations
94-
95-
The first time you are notified in writing that you have
96-
violated any of these terms, or done anything with the software
97-
not covered by your licenses, your licenses can nonetheless
98-
continue if you come into full compliance with these terms,
99-
and take practical steps to correct past violations, within
100-
32 days of receiving notice. Otherwise, all your licenses
101-
end immediately.
102-
103-
## No Liability
104-
105-
***As far as the law allows, the software comes as is, without
106-
any warranty or condition, and the licensor will not be liable
107-
to you for any damages arising out of these terms or the use
108-
or nature of the software, under any kind of legal claim.***
109-
110-
## Definitions
111-
112-
The **licensor** is the individual or entity offering these
113-
terms, and the **software** is the software the licensor makes
114-
available under these terms.
115-
116-
**You** refers to the individual or entity agreeing to these
117-
terms.
118-
119-
**Your company** is any legal entity, sole proprietorship,
120-
or other kind of organization that you work for, plus all
121-
organizations that have control over, are under the control of,
122-
or are under common control with that organization. **Control**
123-
means ownership of substantially all the assets of an entity,
124-
or the power to direct its management and policies by vote,
125-
contract, or otherwise. Control can be direct or indirect.
126-
127-
**Your licenses** are all the licenses granted to you for the
128-
software under these terms.
129-
130-
**Use** means anything you do with the software requiring one
131-
of your licenses.
1+
Creative Commons Legal Code
2+
3+
CC0 1.0 Universal
4+
5+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
6+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
7+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
8+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
9+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
10+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
11+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
12+
HEREUNDER.
13+
14+
Statement of Purpose
15+
16+
The laws of most jurisdictions throughout the world automatically confer
17+
exclusive Copyright and Related Rights (defined below) upon the creator
18+
and subsequent owner(s) (each and all, an "owner") of an original work of
19+
authorship and/or a database (each, a "Work").
20+
21+
Certain owners wish to permanently relinquish those rights to a Work for
22+
the purpose of contributing to a commons of creative, cultural and
23+
scientific works ("Commons") that the public can reliably and without fear
24+
of later claims of infringement build upon, modify, incorporate in other
25+
works, reuse and redistribute as freely as possible in any form whatsoever
26+
and for any purposes, including without limitation commercial purposes.
27+
These owners may contribute to the Commons to promote the ideal of a free
28+
culture and the further production of creative, cultural and scientific
29+
works, or to gain reputation or greater distribution for their Work in
30+
part through the use and efforts of others.
31+
32+
For these and/or other purposes and motivations, and without any
33+
expectation of additional consideration or compensation, the person
34+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
35+
is an owner of Copyright and Related Rights in the Work, voluntarily
36+
elects to apply CC0 to the Work and publicly distribute the Work under its
37+
terms, with knowledge of his or her Copyright and Related Rights in the
38+
Work and the meaning and intended legal effect of CC0 on those rights.
39+
40+
1. Copyright and Related Rights. A Work made available under CC0 may be
41+
protected by copyright and related or neighboring rights ("Copyright and
42+
Related Rights"). Copyright and Related Rights include, but are not
43+
limited to, the following:
44+
45+
i. the right to reproduce, adapt, distribute, perform, display,
46+
communicate, and translate a Work;
47+
ii. moral rights retained by the original author(s) and/or performer(s);
48+
iii. publicity and privacy rights pertaining to a person's image or
49+
likeness depicted in a Work;
50+
iv. rights protecting against unfair competition in regards to a Work,
51+
subject to the limitations in paragraph 4(a), below;
52+
v. rights protecting the extraction, dissemination, use and reuse of data
53+
in a Work;
54+
vi. database rights (such as those arising under Directive 96/9/EC of the
55+
European Parliament and of the Council of 11 March 1996 on the legal
56+
protection of databases, and under any national implementation
57+
thereof, including any amended or successor version of such
58+
directive); and
59+
vii. other similar, equivalent or corresponding rights throughout the
60+
world based on applicable law or treaty, and any national
61+
implementations thereof.
62+
63+
2. Waiver. To the greatest extent permitted by, but not in contravention
64+
of, applicable law, Affirmer hereby overtly, fully, permanently,
65+
irrevocably and unconditionally waives, abandons, and surrenders all of
66+
Affirmer's Copyright and Related Rights and associated claims and causes
67+
of action, whether now known or unknown (including existing as well as
68+
future claims and causes of action), in the Work (i) in all territories
69+
worldwide, (ii) for the maximum duration provided by applicable law or
70+
treaty (including future time extensions), (iii) in any current or future
71+
medium and for any number of copies, and (iv) for any purpose whatsoever,
72+
including without limitation commercial, advertising or promotional
73+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
74+
member of the public at large and to the detriment of Affirmer's heirs and
75+
successors, fully intending that such Waiver shall not be subject to
76+
revocation, rescission, cancellation, termination, or any other legal or
77+
equitable action to disrupt the quiet enjoyment of the Work by the public
78+
as contemplated by Affirmer's express Statement of Purpose.
79+
80+
3. Public License Fallback. Should any part of the Waiver for any reason
81+
be judged legally invalid or ineffective under applicable law, then the
82+
Waiver shall be preserved to the maximum extent permitted taking into
83+
account Affirmer's express Statement of Purpose. In addition, to the
84+
extent the Waiver is so judged Affirmer hereby grants to each affected
85+
person a royalty-free, non transferable, non sublicensable, non exclusive,
86+
irrevocable and unconditional license to exercise Affirmer's Copyright and
87+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
88+
maximum duration provided by applicable law or treaty (including future
89+
time extensions), (iii) in any current or future medium and for any number
90+
of copies, and (iv) for any purpose whatsoever, including without
91+
limitation commercial, advertising or promotional purposes (the
92+
"License"). The License shall be deemed effective as of the date CC0 was
93+
applied by Affirmer to the Work. Should any part of the License for any
94+
reason be judged legally invalid or ineffective under applicable law, such
95+
partial invalidity or ineffectiveness shall not invalidate the remainder
96+
of the License, and in such case Affirmer hereby affirms that he or she
97+
will not (i) exercise any of his or her remaining Copyright and Related
98+
Rights in the Work or (ii) assert any associated claims and causes of
99+
action with respect to the Work, in either case contrary to Affirmer's
100+
express Statement of Purpose.
101+
102+
4. Limitations and Disclaimers.
103+
104+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
105+
surrendered, licensed or otherwise affected by this document.
106+
b. Affirmer offers the Work as-is and makes no representations or
107+
warranties of any kind concerning the Work, express, implied,
108+
statutory or otherwise, including without limitation warranties of
109+
title, merchantability, fitness for a particular purpose, non
110+
infringement, or the absence of latent or other defects, accuracy, or
111+
the present or absence of errors, whether or not discoverable, all to
112+
the greatest extent permissible under applicable law.
113+
c. Affirmer disclaims responsibility for clearing rights of other persons
114+
that may apply to the Work or any use thereof, including without
115+
limitation any person's Copyright and Related Rights in the Work.
116+
Further, Affirmer disclaims responsibility for obtaining any necessary
117+
consents, permissions or other rights required for any use of the
118+
Work.
119+
d. Affirmer understands and acknowledges that Creative Commons is not a
120+
party to this document and has no duty or obligation with respect to
121+
this CC0 or use of the Work.

‎src/helper/utilityHelper.ts‎

Lines changed: 84 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
ChatInputCommandInteraction,
99
ComponentType,
1010
ContainerBuilder,
11-
FileBuilder,
11+
FileBuilder, InteractionType,
1212
Message,
1313
MessageFlags,
1414
ModalBuilder,
@@ -28,23 +28,90 @@ export function getInteractionData(interaction: ButtonInteraction | ModalSubmitI
2828
return interaction.customId.split(":")[split];
2929
}
3030

31-
export async function sendDefaultMessage(message: string, interaction: ChatInputCommandInteraction | ButtonInteraction | ModalSubmitInteraction | AnySelectMenuInteraction, componentsV2: boolean) {
32-
if (componentsV2) {
33-
await interaction.reply({
34-
components: [
35-
new ContainerBuilder()
36-
.addTextDisplayComponents(
37-
new TextDisplayBuilder()
38-
.setContent(message)
39-
)
40-
],
41-
flags: MessageFlags.Ephemeral | MessageFlags.IsComponentsV2
42-
})
31+
export async function sendDefaultMessage(message: string, interaction: ChatInputCommandInteraction | ButtonInteraction | ModalSubmitInteraction | AnySelectMenuInteraction, componentsV2: boolean, type?: "update" | "reply" | "deferReply") {
32+
if (type == "deferReply") {
33+
34+
if (!interaction.deferred) {
35+
await interaction.deferReply({
36+
flags: MessageFlags.Ephemeral,
37+
})
38+
}
39+
40+
if (componentsV2) {
41+
await interaction.editReply({
42+
components: [
43+
new ContainerBuilder()
44+
.addTextDisplayComponents(
45+
new TextDisplayBuilder()
46+
.setContent(message)
47+
)
48+
],
49+
flags: MessageFlags.IsComponentsV2
50+
})
51+
} else {
52+
await interaction.editReply({
53+
content: message,
54+
})
55+
}
56+
} else if (type == "update") {
57+
if (interaction.type == InteractionType.ModalSubmit) {
58+
return
59+
}
60+
interaction = interaction as ButtonInteraction | AnySelectMenuInteraction
61+
62+
if (componentsV2) {
63+
await interaction.update({
64+
components: [
65+
new ContainerBuilder()
66+
.addTextDisplayComponents(
67+
new TextDisplayBuilder()
68+
.setContent(message)
69+
)
70+
],
71+
flags: MessageFlags.IsComponentsV2
72+
})
73+
} else {
74+
75+
await interaction.update({
76+
content: message,
77+
})
78+
}
79+
} else if (type == "reply") {
80+
if (componentsV2) {
81+
await interaction.reply({
82+
components: [
83+
new ContainerBuilder()
84+
.addTextDisplayComponents(
85+
new TextDisplayBuilder()
86+
.setContent(message)
87+
)
88+
],
89+
flags: MessageFlags.Ephemeral | MessageFlags.IsComponentsV2
90+
})
91+
} else {
92+
await interaction.reply({
93+
content: message,
94+
flags: MessageFlags.Ephemeral,
95+
})
96+
}
4397
} else {
44-
await interaction.reply({
45-
content: message,
46-
flags: MessageFlags.Ephemeral,
47-
})
98+
if (componentsV2) {
99+
await interaction.reply({
100+
components: [
101+
new ContainerBuilder()
102+
.addTextDisplayComponents(
103+
new TextDisplayBuilder()
104+
.setContent(message)
105+
)
106+
],
107+
flags: MessageFlags.Ephemeral | MessageFlags.IsComponentsV2
108+
})
109+
} else {
110+
await interaction.reply({
111+
content: message,
112+
flags: MessageFlags.Ephemeral,
113+
})
114+
}
48115
}
49116
}
50117

‎src/modules/bot/events/bot-ready.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default {
6868
checkTwitch(client);
6969
spotify(client);
7070
Scheduler.schedulePolls(client);
71-
}, 30000);
71+
}, 300000);
7272

7373
// API && Version
7474
await api(client);

0 commit comments

Comments
 (0)