Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2095440
started working on schedule
WesleyPodolsky May 17, 2024
e9ee428
schedule in progress
WesleyPodolsky May 23, 2024
b935eb3
add gradle stuff to .gitignore
WesleyPodolsky May 24, 2024
87118ba
keep doing the addEvent
WesleyPodolsky May 24, 2024
bef84ab
time and name work, get the days working
WesleyPodolsky May 25, 2024
f1da979
need to troubleshoot add syso for things that happen
May 30, 2024
a1de5c5
the times are still broken it is giving a succes at finding then
May 31, 2024
cdd2251
line 180 add it so if it is the same day it sets the day to the next
Jun 1, 2024
ffe0c1f
work on removeEvent
Jun 10, 2024
75c9ca6
Fix the commas with the remove event the other part is fine
Jun 11, 2024
e6f7c9b
make the start event and how to get users in the channel
Jun 12, 2024
3101679
do the timezone conversion for the start event
Jun 12, 2024
e45220e
use the new method for startevent
Jun 13, 2024
438d3a2
fix2
Jun 19, 2024
8b7ac77
work on people so roles work
Jun 20, 2024
ee7a272
fix people so when someone doesnt have a nicjname it still works
anneliesepimienta Jun 20, 2024
755451c
line 506 test roles to match the name by how close it is
Jun 24, 2024
07a1a1a
like 541 convert are we removing to people
Jun 25, 2024
ac29003
made make the timezones work and people adding tags doesnt work
Jun 26, 2024
13dd2c5
do are tags being set not tested
Jun 27, 2024
38b8540
do !timezones tags should work
Jun 27, 2024
4e6879e
ln 194 make tags work to add them use the user list to add the users at
Jun 28, 2024
6048af6
635: tags by role shoudl work test with everyone un comment
AaritJayaswal Jul 15, 2024
b473b9d
make the edit event with tags work also tags ruin the tmr date set
Jul 16, 2024
24ffb98
make the remove person work with edit event add is working
Jul 17, 2024
9f56640
DO start event
Jul 18, 2024
dd1afa6
work on start even also add setting for when remoder happen
Jul 19, 2024
308c62d
finish start event
AaritJayaswal Jul 20, 2024
2da123f
try to see if api is possible for timestamp getter
Jul 25, 2024
8aafae1
on check time update all the if statements so they use d and d2
AaritJayaswal Aug 15, 2024
a88fc68
check if remider before event works and icons send images or events with
Aug 16, 2024
8d707ee
fix the start event and reminders its sending start event and the remind
Aug 17, 2024
20f2def
add api support
Aug 22, 2024
da80bfa
do the api
Aug 23, 2024
e97ecc7
fix error where get image results is null
Aug 29, 2024
84ce312
still broken
AaritJayaswal Aug 30, 2024
3a8d79d
test the check file type
Sep 5, 2024
68519b0
did the embeds for schedule, add edit event edit image feature
Sep 6, 2024
51052dd
add a edit image to editevent
Sep 12, 2024
87ef915
make sure everthing works and start testing
AaritJayaswal Sep 13, 2024
6641766
do the testing
Sep 28, 2024
c7d0d54
worked on the testing the help imbed test is not working and its making
Oct 4, 2024
20bd4fd
do more testing for tags
Oct 5, 2024
58b76a0
work on should edit events
Oct 10, 2024
7ce0419
can mock option of server in test
Oct 11, 2024
f9ba74d
do tags testing
Oct 17, 2024
08301f4
do tags testing, the roless are not working
Oct 19, 2024
bf3486d
keep testing tags
Oct 24, 2024
2c8e70e
make a class that extends Embed Builder and add getTitle for testing
Oct 25, 2024
55104f9
test the settings
Oct 31, 2024
6597cf3
DOOOONENEONEONE
Nov 1, 2024
c3ba554
changed .gitignore to include xml files
Nov 1, 2024
a0d290e
added log4j2.xml
Nov 1, 2024
abef4e7
removed the log4j
Whale92130 Nov 7, 2024
36530cc
changed to syso from log4j
Nov 14, 2024
7704f8a
its working
Dec 12, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
/target/
.idea
.settings
*.xml
!pom.xml
src/main/java/org.jointheleague.Launcher.java
.classpath
.project
.travis.yml
run.sh
appspec.yml
/.gradle/
.gradle/
build/
Binary file added .gradle/7.3.3/checksums/checksums.lock
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file added .gradle/7.3.3/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/7.3.3/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/7.3.3/fileHashes/fileHashes.lock
Binary file not shown.
Binary file added .gradle/7.3.3/fileHashes/resourceHashesCache.bin
Binary file not shown.
Empty file added .gradle/7.3.3/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Thu May 16 18:40:18 PDT 2024
gradle.version=7.3.3
Binary file added .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file added .gradle/file-system.probe
Binary file not shown.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
2 changes: 2 additions & 0 deletions bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/main/
/test/
30 changes: 23 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,40 +1,56 @@

plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}

repositories {
repositories {
mavenCentral()
}
mavenCentral()
}

dependencies {
implementation 'org.javacord:javacord:3.8.0'
implementation 'net.aksingh:owm-japis:2.5.3.0'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'javax.json:javax.json-api:1.1'
implementation 'org.mockito:mockito-core:3.4.0'
testImplementation 'org.mockito:mockito-core:5.0.0'
implementation 'org.springframework.boot:spring-boot-starter-webflux:2.4.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'

implementation 'org.apache.logging.log4j:log4j-api:2.24.1'
implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
}

group = 'org.jointheleague'
version = '2.0'
description = 'discordbot'
sourceCompatibility = '1.8'

sourceCompatibility = '11'

test {
useJUnitPlatform()
}

run {
//environment 'CHANNEL_NAME', 'general'
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

mainClassName = 'org.jointheleague.Launcher'

shadowJar {
archiveBaseName.set("discordbot")
archiveVersion.set(version)
archiveClassifier.set("") // No classifier
mergeServiceFiles() // Merges service files, if necessary
manifest {
attributes(
'Main-Class': mainClassName // Ensures the manifest has the right entry
)
}
}
Binary file added build/distributions/discordbot-2.0.tar
Binary file not shown.
Binary file added build/distributions/discordbot-2.0.zip
Binary file not shown.
Binary file added build/libs/discordbot-2.0.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<title>Test results - CurrentTimeTest</title>
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
<script src="../js/report.js" type="text/javascript"></script>
</head>
<body>
<div id="content">
<h1>CurrentTimeTest</h1>
<div class="breadcrumbs">
<a href="../index.html">all</a> &gt;
<a href="../packages/org.jointheleague.features.examples.first_features.html">org.jointheleague.features.examples.first_features</a> &gt; CurrentTimeTest</div>
<div id="summary">
<table>
<tr>
<td>
<div class="summaryGroup">
<table>
<tr>
<td>
<div class="infoBox" id="tests">
<div class="counter">5</div>
<p>tests</p>
</div>
</td>
<td>
<div class="infoBox" id="failures">
<div class="counter">0</div>
<p>failures</p>
</div>
</td>
<td>
<div class="infoBox" id="ignored">
<div class="counter">0</div>
<p>ignored</p>
</div>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">1.710s</div>
<p>duration</p>
</div>
</td>
</tr>
</table>
</div>
</td>
<td>
<div class="infoBox success" id="successRate">
<div class="percent">100%</div>
<p>successful</p>
</div>
</td>
</tr>
</table>
</div>
<div id="tabs">
<ul class="tabLinks">
<li>
<a href="#tab0">Tests</a>
</li>
</ul>
<div id="tab0" class="tab">
<h2>Tests</h2>
<table>
<thead>
<tr>
<th>Test</th>
<th>Duration</th>
<th>Result</th>
</tr>
</thead>
<tr>
<td class="success">itShouldHandleMessagesWithCommand()</td>
<td class="success">0.012s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveACommand()</td>
<td class="success">1.664s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveAHelpEmbed()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveTheCommandAsTheTitleOfTheHelpEmbed()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldNotHandleMessagesWithoutCommand()</td>
<td class="success">0.030s</td>
<td class="success">passed</td>
</tr>
</table>
</div>
</div>
<div id="footer">
<p>
<div>
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label>
</div>Generated by
<a href="http://www.gradle.org">Gradle 7.3.3</a> at May 16, 2024, 7:18:39 PM</p>
</div>
</div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<title>Test results - RandomNumberTest</title>
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
<script src="../js/report.js" type="text/javascript"></script>
</head>
<body>
<div id="content">
<h1>RandomNumberTest</h1>
<div class="breadcrumbs">
<a href="../index.html">all</a> &gt;
<a href="../packages/org.jointheleague.features.examples.first_features.html">org.jointheleague.features.examples.first_features</a> &gt; RandomNumberTest</div>
<div id="summary">
<table>
<tr>
<td>
<div class="summaryGroup">
<table>
<tr>
<td>
<div class="infoBox" id="tests">
<div class="counter">5</div>
<p>tests</p>
</div>
</td>
<td>
<div class="infoBox" id="failures">
<div class="counter">0</div>
<p>failures</p>
</div>
</td>
<td>
<div class="infoBox" id="ignored">
<div class="counter">0</div>
<p>ignored</p>
</div>
</td>
<td>
<div class="infoBox" id="duration">
<div class="counter">0.044s</div>
<p>duration</p>
</div>
</td>
</tr>
</table>
</div>
</td>
<td>
<div class="infoBox success" id="successRate">
<div class="percent">100%</div>
<p>successful</p>
</div>
</td>
</tr>
</table>
</div>
<div id="tabs">
<ul class="tabLinks">
<li>
<a href="#tab0">Tests</a>
</li>
</ul>
<div id="tab0" class="tab">
<h2>Tests</h2>
<table>
<thead>
<tr>
<th>Test</th>
<th>Duration</th>
<th>Result</th>
</tr>
</thead>
<tr>
<td class="success">itShouldHandleMessagesWithCommand()</td>
<td class="success">0.027s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveACommand()</td>
<td class="success">0.003s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveAHelpEmbed()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldHaveTheCommandAsTheTitleOfTheHelpEmbed()</td>
<td class="success">0.002s</td>
<td class="success">passed</td>
</tr>
<tr>
<td class="success">itShouldNotHandleMessagesWithoutCommand()</td>
<td class="success">0.010s</td>
<td class="success">passed</td>
</tr>
</table>
</div>
</div>
<div id="footer">
<p>
<div>
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
</label>
</div>Generated by
<a href="http://www.gradle.org">Gradle 7.3.3</a> at May 16, 2024, 7:18:39 PM</p>
</div>
</div>
</body>
</html>
Loading