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.

Sign up for GitHub

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

Release/4.0 #16

Merged
merged 11 commits into from
Oct 7, 2021
Merged

Release/4.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
692b8c1
Delete gradle-publish.yml
SeveralCircles Oct 1, 2021
342b7db
yeet
SeveralCircles Oct 1, 2021
f2832cd
added javadoc
SeveralCircles Oct 1, 2021
d9c9f2e
Added Flames API
SeveralCircles Oct 4, 2021
66914cb
Merge pull request #11 from SeveralCircles/feature/flames-api
SeveralCircles Oct 4, 2021
1b84719
This branch has outlived it's own welcome but oh well
SeveralCircles Oct 6, 2021
b3d2dd0
Merge pull request #13 from SeveralCircles/feature/flames_data_2
SeveralCircles Oct 6, 2021
1595884
Added consent to the exception so I don't have to keep typing it.
SeveralCircles Oct 6, 2021
a75c0e7
Added historical data feature because I forget to create a new branch…
SeveralCircles Oct 6, 2021
1d7f3ce
Start of the end of the today feature development
SeveralCircles Oct 7, 2021
8e18a86
Merge pull request #15 from SeveralCircles/feature/today
SeveralCircles Oct 7, 2021
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
37 changes: 0 additions & 37 deletions .github/workflows/gradle-publish.yml
View file
Open in desktop

This file was deleted.

Binary file modified .gradle/6.5.1/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/6.5.1/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/6.5.1/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/6.5.1/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions .gradle/buildOutputCleanup/cache.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Jun 26 13:28:02 EDT 2021
gradle.version=6.5.1
#Fri Oct 01 13:57:37 EDT 2021
gradle.version=7.2
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/checksums/checksums.lock
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/checksums/md5-checksums.bin
View file
Open in desktop
Binary file not shown.
Binary file modified .gradle/checksums/sha1-checksums.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/artifacts/Flames_main_jar.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/copyright/Flames.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Flames/global.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Flames Global Data File
#Thu Oct 07 16:13:52 EDT 2021
globalScore=1210
participants=0
10 changes: 10 additions & 0 deletions Flames/user/202098742013198336/funfacts.fl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#Fun Facts for An Unknown Flames User
#Thu Oct 07 16:13:52 EDT 2021
highScore=0
sadDay=2021-10-06T01\:03\:00.055038Z
lowestEmotion=0.0
frenchToastScore=0
happyDay=2021-10-06T01\:03\:00.055038Z
highestEmotion=0.0
lowScore=0
bestRank=UNRANKED
9 changes: 9 additions & 0 deletions Flames/user/202098742013198336/stats.fl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#User Stats for An Unknown Flames User
#Thu Oct 07 16:13:52 EDT 2021
RES=1
LUCK=1
level=1
CAR=1
POW=1
exp=0
RISE=1
9 changes: 9 additions & 0 deletions Flames/user/202098742013198336/user.fl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#User Data for An Unknown Flames User
#Thu Oct 07 16:13:52 EDT 2021
score=1210
emotion=0.0
lastSeen=2021-10-07T20\:13\:52.829698800Z
discordId=202098742013198336
streak=1
consent=1
version=2.0
15 changes: 8 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
//file:noinspection GroovyUnusedAssignment
//file:noinspection GroovyUnusedAssignment
plugins {
id'application'
id'com.github.johnrengelman.shadow' version '5.2.0'
//noinspection GroovyAssignabilityCheck
id 'org.springframework.boot' version '2.5.5'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
}

mainClassName = 'com.severalcircles.flames.system.Flames'

version '3.3.1-b'
version '4.0'
def jdaVersion = '4.3.0_277'

sourceCompatibility = targetCompatibility = 1.8
Expand All @@ -23,14 +27,11 @@ repositories {
dependencies {
implementation("net.dv8tion:JDA:$jdaVersion")
implementation platform('com.google.cloud:libraries-bom:22.0.0')
// implementation 'com.bugsnag:bugsnag-spring:3.6.2'
// testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
// testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
// testCompile 'junit:junit:4.12'
// implementation 'com.discord4j:discord4j-core:3.2.0-RC2'
implementation platform('com.google.cloud:libraries-bom:20.8.0')
implementation 'com.google.cloud:google-cloud-language'
implementation 'com.bugsnag:bugsnag:3.6.2'
// implementation 'com.mashape.unirest:unirest-java:1.3.11'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation 'org.springframework.boot:spring-boot-starter-test'

}
Binary file modified build/classes/java/main/com/severalcircles/flames/data/global/GlobalData.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/com/severalcircles/flames/data/user/FlamesUser.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/com/severalcircles/flames/data/user/UserStats.class
View file
Open in desktop
Binary file not shown.
Binary file modified build/classes/java/main/com/severalcircles/flames/features/Analysis.class
View file
Open in desktop
Binary file not shown.
98 changes: 98 additions & 0 deletions doc/allclasses-frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="es">
<head>
<!-- Generated by javadoc (10) on Thu Sep 30 21:28:54 EDT 2021 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2021-09-30">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="com/severalcircles/flames/features/Analysis.html" title="class in com.severalcircles.flames.features" target="classFrame">Analysis</a></li>
<li><a href="com/severalcircles/flames/command/connections/ArtistCommand.html" title="class in com.severalcircles.flames.command.connections" target="classFrame">ArtistCommand</a></li>
<li><a href="com/severalcircles/flames/buttonaction/ButtonAction.html" title="interface in com.severalcircles.flames.buttonaction" target="classFrame"><span class="interfaceName">ButtonAction</span></a></li>
<li><a href="com/severalcircles/flames/events/discord/ButtonEvent.html" title="class in com.severalcircles.flames.events.discord" target="classFrame">ButtonEvent</a></li>
<li><a href="org/json/CDL.html" title="class in org.json" target="classFrame">CDL</a></li>
<li><a href="com/severalcircles/flames/events/discord/CommandEvent.html" title="class in com.severalcircles.flames.events.discord" target="classFrame">CommandEvent</a></li>
<li><a href="com/severalcircles/flames/features/safety/Consent.html" title="class in com.severalcircles.flames.features.safety" target="classFrame">Consent</a></li>
<li><a href="com/severalcircles/flames/buttonaction/ConsentButtonAction.html" title="class in com.severalcircles.flames.buttonaction" target="classFrame">ConsentButtonAction</a></li>
<li><a href="org/json/Cookie.html" title="class in org.json" target="classFrame">Cookie</a></li>
<li><a href="org/json/CookieList.html" title="class in org.json" target="classFrame">CookieList</a></li>
<li><a href="com/severalcircles/flames/system/updater/DataChange.html" title="enum in com.severalcircles.flames.system.updater" target="classFrame">DataChange</a></li>
<li><a href="com/severalcircles/flames/command/DebugCommand.html" title="class in com.severalcircles.flames.command" target="classFrame">DebugCommand</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/deleteuserdata/DeleteUserDataButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data.deleteuserdata" target="classFrame">DeleteUserDataButtonAction</a></li>
<li><a href="com/severalcircles/flames/features/safety/EmotionMessages.html" title="class in com.severalcircles.flames.features.safety" target="classFrame">EmotionMessages</a></li>
<li><a href="com/severalcircles/flames/features/external/ExternalConnectionFailedException.html" title="class in com.severalcircles.flames.features.external" target="classFrame">ExternalConnectionFailedException</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/deleteuserdata/FixUserDataButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data.deleteuserdata" target="classFrame">FixUserDataButtonAction</a></li>
<li><a href="com/severalcircles/flames/system/Flames.html" title="class in com.severalcircles.flames.system" target="classFrame">Flames</a></li>
<li><a href="com/severalcircles/flames/features/external/severalcircles/FlamesAssets.html" title="class in com.severalcircles.flames.features.external.severalcircles" target="classFrame">FlamesAssets</a></li>
<li><a href="com/severalcircles/flames/command/FlamesCommand.html" title="interface in com.severalcircles.flames.command" target="classFrame"><span class="interfaceName">FlamesCommand</span></a></li>
<li><a href="com/severalcircles/flames/data/base/FlamesDataManager.html" title="class in com.severalcircles.flames.data.base" target="classFrame">FlamesData</a></li>
<li><a href="com/severalcircles/flames/events/discord/FlamesDiscordEvent.html" title="interface in com.severalcircles.flames.events.discord" target="classFrame"><span class="interfaceName">FlamesDiscordEvent</span></a></li>
<li><a href="com/severalcircles/flames/events/FlamesDiscordEvent.html" title="interface in com.severalcircles.flames.events" target="classFrame"><span class="interfaceName">FlamesDiscordEvent</span></a></li>
<li><a href="com/severalcircles/flames/events/flames/FlamesEvent.html" title="interface in com.severalcircles.flames.events.flames" target="classFrame"><span class="interfaceName">FlamesEvent</span></a></li>
<li><a href="com/severalcircles/flames/features/FlamesPrettyDate.html" title="class in com.severalcircles.flames.features" target="classFrame">FlamesPrettyDate</a></li>
<li><a href="com/severalcircles/flames/system/updater/FlamesUpdater.html" title="class in com.severalcircles.flames.system.updater" target="classFrame">FlamesUpdater</a></li>
<li><a href="com/severalcircles/flames/data/user/FlamesUser.html" title="class in com.severalcircles.flames.data.user" target="classFrame">FlamesUser</a></li>
<li><a href="com/severalcircles/flames/data/base/FlushRunnable.html" title="class in com.severalcircles.flames.data.base" target="classFrame">FlushRunnable</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data" target="classFrame">FunFactsButtonAction</a></li>
<li><a href="com/severalcircles/flames/data/global/GlobalData.html" title="class in com.severalcircles.flames.data.global" target="classFrame">GlobalData</a></li>
<li><a href="com/severalcircles/flames/command/data/GlobalDataCommand.html" title="class in com.severalcircles.flames.command.data" target="classFrame">GlobalDataCommand</a></li>
<li><a href="com/severalcircles/flames/command/HelpCommand.html" title="class in com.severalcircles.flames.command" target="classFrame">HelpCommand</a></li>
<li><a href="com/severalcircles/flames/command/data/HiCommand.html" title="class in com.severalcircles.flames.command.data" target="classFrame">HiCommand</a></li>
<li><a href="org/json/HTTP.html" title="class in org.json" target="classFrame">HTTP</a></li>
<li><a href="org/json/HTTPTokener.html" title="class in org.json" target="classFrame">HTTPTokener</a></li>
<li><a href="org/json/JSONArray.html" title="class in org.json" target="classFrame">JSONArray</a></li>
<li><a href="org/json/JSONException.html" title="class in org.json" target="classFrame">JSONException</a></li>
<li><a href="org/json/JSONML.html" title="class in org.json" target="classFrame">JSONML</a></li>
<li><a href="org/json/JSONObject.html" title="class in org.json" target="classFrame">JSONObject</a></li>
<li><a href="org/json/JSONPointer.html" title="class in org.json" target="classFrame">JSONPointer</a></li>
<li><a href="org/json/JSONPointer.Builder.html" title="class in org.json" target="classFrame">JSONPointer.Builder</a></li>
<li><a href="org/json/JSONPointerException.html" title="class in org.json" target="classFrame">JSONPointerException</a></li>
<li><a href="org/json/JSONPropertyIgnore.html" title="annotation in org.json" target="classFrame">JSONPropertyIgnore</a></li>
<li><a href="org/json/JSONPropertyName.html" title="annotation in org.json" target="classFrame">JSONPropertyName</a></li>
<li><a href="org/json/JSONString.html" title="interface in org.json" target="classFrame"><span class="interfaceName">JSONString</span></a></li>
<li><a href="org/json/JSONStringer.html" title="class in org.json" target="classFrame">JSONStringer</a></li>
<li><a href="org/json/JSONTokener.html" title="class in org.json" target="classFrame">JSONTokener</a></li>
<li><a href="org/json/JSONWriter.html" title="class in org.json" target="classFrame">JSONWriter</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/ManageUserDataButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data" target="classFrame">ManageUserDataButtonAction</a></li>
<li><a href="com/severalcircles/flames/events/discord/MemberAddEvent.html" title="class in com.severalcircles.flames.events.discord" target="classFrame">MemberAddEvent</a></li>
<li><a href="com/severalcircles/flames/events/discord/MessageEvent.html" title="class in com.severalcircles.flames.events.discord" target="classFrame">MessageEvent</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/MyDataButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data" target="classFrame">MyDataButtonAction</a></li>
<li><a href="com/severalcircles/flames/command/data/MyDataCommand.html" title="class in com.severalcircles.flames.command.data" target="classFrame">MyDataCommand</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/deleteuserdata/NoDontButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data.deleteuserdata" target="classFrame">NoDontButtonAction</a></li>
<li><a href="com/severalcircles/flames/features/NowEnteringGuild.html" title="class in com.severalcircles.flames.features" target="classFrame">NowEnteringGuild</a></li>
<li><a href="com/severalcircles/flames/features/external/ParameterStringBuilder.html" title="class in com.severalcircles.flames.features.external" target="classFrame">ParameterStringBuilder</a></li>
<li><a href="org/json/Property.html" title="class in org.json" target="classFrame">Property</a></li>
<li><a href="com/severalcircles/flames/features/rank/Rank.html" title="enum in com.severalcircles.flames.features.rank" target="classFrame">Rank</a></li>
<li><a href="com/severalcircles/flames/features/rank/Ranking.html" title="class in com.severalcircles.flames.features.rank" target="classFrame">Ranking</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/deleteuserdata/ReallyDeleteButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data.deleteuserdata" target="classFrame">ReallyDeleteButtonAction</a></li>
<li><a href="com/severalcircles/flames/features/external/spotify/ReconnectRunnable.html" title="class in com.severalcircles.flames.features.external.spotify" target="classFrame">ReconnectRunnable</a></li>
<li><a href="com/severalcircles/flames/features/external/spotify/SpotifyArtist.html" title="class in com.severalcircles.flames.features.external.spotify" target="classFrame">SpotifyArtist</a></li>
<li><a href="com/severalcircles/flames/features/external/spotify/SpotifyConnection.html" title="class in com.severalcircles.flames.features.external.spotify" target="classFrame">SpotifyConnection</a></li>
<li><a href="com/severalcircles/flames/buttonaction/data/StatsButtonAction.html" title="class in com.severalcircles.flames.buttonaction.data" target="classFrame">StatsButtonAction</a></li>
<li><a href="com/severalcircles/flames/command/TestCommand.html" title="class in com.severalcircles.flames.command" target="classFrame">TestCommand</a></li>
<li><a href="com/severalcircles/flames/data/user/UserFunFacts.html" title="class in com.severalcircles.flames.data.user" target="classFrame">UserFunFacts</a></li>
<li><a href="com/severalcircles/flames/data/user/UserStats.html" title="class in com.severalcircles.flames.data.user" target="classFrame">UserStats</a></li>
<li><a href="com/severalcircles/flames/system/WhatTheFuckException.html" title="class in com.severalcircles.flames.system" target="classFrame">WhatTheFuckException</a></li>
<li><a href="org/json/XML.html" title="class in org.json" target="classFrame">XML</a></li>
<li><a href="org/json/XMLParserConfiguration.html" title="class in org.json" target="classFrame">XMLParserConfiguration</a></li>
<li><a href="org/json/XMLTokener.html" title="class in org.json" target="classFrame">XMLTokener</a></li>
<li><a href="org/json/XMLXsiTypeConverter.html" title="interface in org.json" target="classFrame"><span class="interfaceName">XMLXsiTypeConverter</span></a></li>
</ul>
</div>
</body>
</html>
Loading